Small bug fixes

GUI/Live_view_FLIR.py

@@ -315,9 +315,16 @@ def live_view(self):
                     scale_percent = 15  # percent of original size
                     width = int(width * scale_percent / 100)
                     height = int(height * scale_percent / 100)
+
+                    #ensure dims are even to prevent diagonal cut in resized image
+                    if (width % 2) != 0:
+                        width = (width + 1)
+                    if (height % 2) != 0:
+                        height = (height + 1)
+
                     dim = (width, height)
+
                     # resize image
-
                     resized = cv2.resize(img_conv.GetNDArray(), dim, interpolation=cv2.INTER_AREA)
 
                     # Release image

GUI/scAnt_GUI_mw.py

@@ -1189,7 +1189,7 @@ def setupUi(self, MainWindow):
         self.label_focalLengthIn35mmFormat.setObjectName("label_focalLengthIn35mmFormat")
         self.gridLayout_13.addWidget(self.label_focalLengthIn35mmFormat, 9, 0, 1, 1)
         self.label = QtWidgets.QLabel(self.frame_exinf)
-        self.label.setMaximumSize(QtCore.QSize(16777215, 18))
+        self.label.setMaximumSize(QtCore.QSize(16777215, 30))
         font = QtGui.QFont()
         font.setPointSize(11)
         font.setBold(True)
@@ -1402,7 +1402,7 @@ def setupUi(self, MainWindow):
         self.label_stackImages.setObjectName("label_stackImages")
         self.gridLayout_10.addWidget(self.label_stackImages, 1, 0, 1, 1)
         self.label_2 = QtWidgets.QLabel(self.frame_post_processing_2)
-        self.label_2.setMaximumSize(QtCore.QSize(16777215, 20))
+        self.label_2.setMaximumSize(QtCore.QSize(16777215, 30))
         font = QtGui.QFont()
         font.setPointSize(11)
         font.setBold(True)

GUI/scAnt_GUI_mw.ui

@@ -2293,7 +2293,7 @@
              <property name="maximumSize">
               <size>
                <width>16777215</width>
-               <height>18</height>
+               <height>30</height>
               </size>
              </property>
              <property name="font">
@@ -2720,7 +2720,7 @@
              <property name="maximumSize">
               <size>
                <width>16777215</width>
-               <height>20</height>
+               <height>30</height>
               </size>
              </property>
              <property name="font">

README.md

@@ -486,7 +486,6 @@ All outputs within Meshroom are automatically saved in the project’s environme
   * check for the option to configure end-stop connection and location (front vs back)
 * add support for generic USB stepper driver via 3D printer board / custom scAnt board (tbd)
 * Add DSLR support through gphoto2 under Linux
-* code-clean-up: remove all old post-processing code, make a single python file that contains all post-processing functions that can be both used from the scAnt GUI as well as a standalone command line-based script
 * update documentation on anaconda environment use
 
 #### make scAnt operating system agnostic

processStack.py

@@ -611,8 +611,8 @@ def mask_images(input_paths, min_rgb, max_rgb, min_bl, min_wh, create_cutout=Fal
 
     ap = argparse.ArgumentParser()
     ap.add_argument("-p", "--path", required=True, help="Path to scAnt project")
-    ap.add_argument("-s", "--stacking", default=True, help="stack RAW images [True / False]")
-    ap.add_argument("-m", "--masking", default=True, help="mask stacked images [True / False]")
+    ap.add_argument("-s", "--stacking", default=True, help="stack RAW images [True / False] (True by default)")
+    ap.add_argument("-m", "--masking", default=True, help="mask stacked images [True / False] (True by default)")
     ap.add_argument("-f", "--focus_check", default=True,
                     help="check whether out-of-focus images should be discarded before stacking [True / False]")
     ap.add_argument("-t", "--threshold", type=float,

scAnt.py

@@ -204,8 +204,9 @@ def __init__(self):
 
         try:
             self.scanner = ScannerController()
-            self.homeX()
-            self.homeZ()
+            # Uncomment if prefered homing on startup
+            # self.homeX()
+            # self.homeZ()
             self.scanner_initialised = True
 
         except IndexError: