Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Some style cleanup.

Browse Source
This commit is contained in:
Jim Evins
2013-12-21 23:47:59 -05:00
parent 5c74625a97
commit f1de981804
16 changed files with 951 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/View.cpp
+8 -3
View File
@@ -20,12 +20,17 @@
#include "View.h"
#include <QGraphicsScene>
#include <QGraphicsItemGroup>
#include <QMouseEvent>
#include <QGraphicsLineItem>
#include <QGraphicsDropShadowEffect>
#include <cmath>
#include <iostream>
#include "LabelModel.h"
#include "LabelModelObject.h"
#include "libglabels/Markup.h"
#include "libglabels/FrameRect.h"
#include "libglabels/FrameRound.h"
@@ -164,11 +169,11 @@ namespace glabels
{
double x_scale = (72.0/physicalDpiX()) * ( width() - ZOOM_TO_FIT_PAD ) / mModel->w();
double y_scale = (72.0/physicalDpiY()) * ( height() - ZOOM_TO_FIT_PAD ) / mModel->h();
double newZoom = min( x_scale, y_scale );
double newZoom = std::min( x_scale, y_scale );
// Limits
newZoom = min( newZoom, zoomLevels[0] );
newZoom = max( newZoom, zoomLevels[nZoomLevels-1] );
newZoom = std::min( newZoom, zoomLevels[0] );
newZoom = std::max( newZoom, zoomLevels[nZoomLevels-1] );
setZoomReal( newZoom, true );
}