From d3171b2c3120e8d0e7e67dddae7791346a0a49c4 Mon Sep 17 00:00:00 2001
From: hooper114 <hooper114>
Date: Tue, 28 Apr 2009 07:22:46 +0000
Subject: [PATCH] Preview scales to show whole image.

---
 backend_qt4/qzint.cpp      |  4 ++--
 frontend_qt4/mainWindow.ui | 13 +++++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/backend_qt4/qzint.cpp b/backend_qt4/qzint.cpp
index bb9a620a..a8263992 100644
--- a/backend_qt4/qzint.cpp
+++ b/backend_qt4/qzint.cpp
@@ -228,7 +228,7 @@ void QZint::render(QPainter & painter, const QRectF & paintRect, AspectRatioMode
 	qreal gheight=m_zintSymbol->height;
 	if (m_zintSymbol->symbology == BARCODE_MAXICODE)
 	{
-		gheight*=(maxi_width+1);
+		gheight*=(maxi_width);
 		gwidth*=(maxi_width+1);
 	}
 
@@ -246,7 +246,7 @@ void QZint::render(QPainter & painter, const QRectF & paintRect, AspectRatioMode
 			break;
 
 		case KeepAspectRatio:
-			if (paintRect.width()-gwidth<paintRect.height()-gheight)
+			if (paintRect.width()/gwidth<paintRect.height()/gheight)
 			{
 				ysf=xsf=(qreal)paintRect.width()/gwidth;
 				ytr+=(qreal)(paintRect.height()-gheight*ysf)/2;
diff --git a/frontend_qt4/mainWindow.ui b/frontend_qt4/mainWindow.ui
index 5e920e37..cec444e8 100644
--- a/frontend_qt4/mainWindow.ui
+++ b/frontend_qt4/mainWindow.ui
@@ -223,10 +223,6 @@ p, li { white-space: pre-wrap; }
        </item>
       </layout>
      </widget>
-     <zorder>txtComposite</zorder>
-     <zorder>lblComposite</zorder>
-     <zorder>layoutWidget</zorder>
-     <zorder>grpMaxiCode</zorder>
     </widget>
     <widget class="QGroupBox" name="grpMaxiCode" >
      <property name="geometry" >
@@ -287,6 +283,9 @@ p, li { white-space: pre-wrap; }
       </item>
      </widget>
      <widget class="QLabel" name="lblMaxiPrimary" >
+      <property name="enabled" >
+       <bool>false</bool>
+      </property>
       <property name="geometry" >
        <rect>
         <x>9</x>
@@ -300,6 +299,9 @@ p, li { white-space: pre-wrap; }
       </property>
      </widget>
      <widget class="QLineEdit" name="txtMaxiPrimary" >
+      <property name="enabled" >
+       <bool>false</bool>
+      </property>
       <property name="geometry" >
        <rect>
         <x>107</x>
@@ -308,6 +310,9 @@ p, li { white-space: pre-wrap; }
         <height>22</height>
        </rect>
       </property>
+      <property name="text" >
+       <string>Primary Data Here!</string>
+      </property>
      </widget>
     </widget>
    </widget>