Blog: LDView - Packaged for Linux: ldview-1-no-force-zoomtofit.patch

LDLib/LDSnapshotTaker.cpp

@@ -276 +276 @@
                                 stripTrailingPathSeparators(saveDir);
                         }
                 }
+        // Special case for the -ca and -cg options to convert them to proper
+        // argument names
                 for (i = 0; i < count; i++)
                 {
                         char *arg = unhandledArgs->stringAtIndex(i);
@@ -295 +297 @@
                         {
                                 sprintf(newArg, "-%s=%s", CAMERA_GLOBE_KEY, arg + 3);
                                 TCUserDefaults::addCommandLineArg(newArg);
-                                zoomToFit = true;
                         }
                 }
                 for (i = 0; i < count && (saveSnapshots || !retValue); i++)
@@ -405 +406 @@
         return retValue;
 }
 
-bool LDSnapshotTaker::shouldZoomToFit(bool zoomToFit)
+bool LDSnapshotTaker::shouldZoomToFit()
 {
-        char *cameraGlobe = TCUserDefaults::stringForKey(CAMERA_GLOBE_KEY, NULL,
-                false);
-        bool retValue = false;
-
-        if (zoomToFit)
-        {
-                retValue = true;
-        }
-        else if (cameraGlobe)
-        {
-                float globeRadius;
-
-                if (sscanf(cameraGlobe, "%*f,%*f,%f", &globeRadius) == 1)
-                {
-                        retValue = true;
-                }
-        }
-        delete cameraGlobe;
-        return retValue;
+    int zoomToFit = TCUserDefaults::longForKey(SAVE_ZOOM_TO_FIT_KEY, -1, false);
+    if (zoomToFit < 0 ) {
+        // default to not ZoomToFit unless we have a reason to do otherwise
+        zoomToFit = 0;
+        // User didn't explicitly specify, default to something sensible based
+        // on the other arguments the user did pass.
+        // -cg should default to ZoomToFit to be compatible with L3P
+        char *cameraGlobe = TCUserDefaults::stringForKey(CAMERA_GLOBE_KEY, NULL,
+            false);
+        if (cameraGlobe) {
+            zoomToFit = 1;
+            delete cameraGlobe;
+        }
+        // But if the center of the model has been specified, ZoomToFit would conflict with it
+        char *modelCenter = TCUserDefaults::stringForKey(MODEL_CENTER_KEY, NULL, false);
+        if (modelCenter) {
+            zoomToFit = 0;
+            delete modelCenter;
+        }
+    }
+    return (bool) zoomToFit;
 }
 
 bool LDSnapshotTaker::saveImage(
@@ -633 +636 @@
         {
                 bool saveAlpha = false;
                 TCByte *buffer = grabImage(imageWidth, imageHeight,
-                        shouldZoomToFit(zoomToFit), NULL, &saveAlpha);
+                        shouldZoomToFit(), NULL, &saveAlpha);
 
                 if (buffer)
                 {

LDLib/LDSnapshotTaker.h

@@ -75 +75 @@
         bool canSaveAlpha(void);
         void renderOffscreenImage(void);
         bool imageProgressCallback(CUCSTR message, float progress);
-        bool shouldZoomToFit(bool zoomToFit);
+        bool shouldZoomToFit();
         void grabSetup(void);
         bool saveStepImage(const char *filename, int imageWidth, int imageHeight,
                 bool zoomToFit);