Merge branch 'develop' of https://github.com/pixmeo/osirix into develop

idvr · Feb 12, 2014 · d49008b · d49008b
2 parents d34b7fb + 8fce1db
commit d49008b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/AYDicomPrint/AYDicomPrintWindowController.mm b/AYDicomPrint/AYDicomPrintWindowController.mm
@@ -386,6 +386,8 @@ - (ViewerController *) _currentViewer
 - (void) _createPrintjob: (id) object
 {
     NSRect windowFrameToRestore = NSMakeRect(0, 0, 0, 0);
+    BOOL scaleFitToRestore = m_CurrentViewer.imageView.isScaledFit;
+
 	if( [[NSUserDefaults standardUserDefaults] boolForKey: @"SquareWindowForPrinting"])
 	{
         int AlwaysScaleToFit = [[NSUserDefaults standardUserDefaults] integerForKey: @"AlwaysScaleToFit"];
@@ -398,6 +400,7 @@ - (void) _createPrintjob: (id) object
 		else newFrame.size.width = newFrame.size.height;
 
 		[AppController resizeWindowWithAnimation: m_CurrentViewer.window newSize: newFrame];
+        if( scaleFitToRestore) [m_CurrentViewer.imageView scaleToFit];
 
         [[NSUserDefaults standardUserDefaults] setInteger: AlwaysScaleToFit forKey: @"AlwaysScaleToFit"];
 	}
@@ -535,6 +538,8 @@ - (void) _createPrintjob: (id) object
 
                         [AppController resizeWindowWithAnimation: m_CurrentViewer.window newSize: windowFrameToRestore];
 
+                        if( scaleFitToRestore) [m_CurrentViewer.imageView scaleToFit];
+
                         [[NSUserDefaults standardUserDefaults] setInteger: AlwaysScaleToFit forKey: @"AlwaysScaleToFit"];
                     }
 

diff --git a/ViewerController.m b/ViewerController.m
@@ -17777,6 +17777,8 @@ -(IBAction) endPrint:(id) sender
     if( [sender tag])   //User clicks OK Button
     {
         NSRect windowFrameToRestore = NSMakeRect(0, 0, 0, 0);
+        BOOL scaleFitToRestore = imageView.isScaledFit;
+
         if( [[NSUserDefaults standardUserDefaults] boolForKey: @"SquareWindowForPrinting"])
         {
             int AlwaysScaleToFit = [[NSUserDefaults standardUserDefaults] integerForKey: @"AlwaysScaleToFit"];
@@ -17789,6 +17791,7 @@ -(IBAction) endPrint:(id) sender
             else newFrame.size.width = newFrame.size.height;
 
             [AppController resizeWindowWithAnimation: [self window] newSize: newFrame];
+            if( scaleFitToRestore) [imageView scaleToFit];
 
             [[NSUserDefaults standardUserDefaults] setInteger: AlwaysScaleToFit forKey: @"AlwaysScaleToFit"];
         }
@@ -18072,6 +18075,8 @@ -(IBAction) endPrint:(id) sender
 
             [AppController resizeWindowWithAnimation: [self window] newSize: windowFrameToRestore];
 
+            if( scaleFitToRestore) [imageView scaleToFit];
+
             [[NSUserDefaults standardUserDefaults] setInteger: AlwaysScaleToFit forKey: @"AlwaysScaleToFit"];
         }
 		// Start the actuall print operation if there is something to print at all.