Clean up before release

Add Help menu

Author: cmbruns

CMakeLists.txt

@@ -37,8 +37,8 @@ SET(CPACK_WIX_EXTENSIONS WixUtilExtension)
 
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE.txt")
 set(CPACK_PACKAGE_VERSION_MAJOR "0")
-set(CPACK_PACKAGE_VERSION_MINOR "5")
-set(CPACK_PACKAGE_VERSION_PATCH "6")
+set(CPACK_PACKAGE_VERSION_MINOR "6")
+set(CPACK_PACKAGE_VERSION_PATCH "1")
 set(CPACK_PACKAGE_EXECUTABLES "vimage;vimage")
 
 include(CPack)

vmg/image_widget_gl.py

@@ -119,17 +119,15 @@ def set_image(self, image: PIL.Image.Image):
                 self.view_state = self.sphere_view_state
                 self.program = self.sphere_shader
                 if exif["Model"].lower().startswith("ricoh theta"):
-                    print("360")
+                    # print("360")
                     pass  # TODO 360 image
             except KeyError:
                 pass
         else:
             self.is_360 = False
             self.view_state = self.rect_view_state
             self.program = self.rect_shader
-        print(exif)
         self.image = numpy.array(image)
-        print(image.info)
         # Normalize values to maximum 1.0 and convert to float32
         # TODO: test performance
         max_values = {

vmg/main_window.py

@@ -8,7 +8,6 @@
 from PySide6 import QtCore, QtGui, QtWidgets
 from PySide6.QtCore import Qt
 
-from test.perf_test_1 import perf_test_1
 from vmg.natural_sort import natural_sort_key
 from vmg.pixel_filter import PixelFilter
 from vmg.recent_file import RecentFileList
@@ -200,10 +199,6 @@ def on_actionPrevious_triggered(self):
         self.image_index -= 1
         self.activate_indexed_image()
 
-    @QtCore.Slot()
-    def on_actionRun_Test_triggered(self):
-        perf_test_1(self)
-
     @QtCore.Slot()
     def on_actionSave_As_triggered(self):
         file_path, file_filter = QtWidgets.QFileDialog.getSaveFileName(

vmg/ui_vimage.py

@@ -54,6 +54,9 @@ def setupUi(self, MainWindow):
         self.actionNormal_View.setVisible(True)
         self.actionRun_Test = QAction(MainWindow)
         self.actionRun_Test.setObjectName(u"actionRun_Test")
+        self.actionAbout = QAction(MainWindow)
+        self.actionAbout.setObjectName(u"actionAbout")
+        self.actionAbout.setMenuRole(QAction.AboutRole)
         self.centralwidget = QWidget(MainWindow)
         self.centralwidget.setObjectName(u"centralwidget")
         self.verticalLayout = QVBoxLayout(self.centralwidget)
@@ -76,6 +79,9 @@ def setupUi(self, MainWindow):
         self.menuView.setObjectName(u"menuView")
         self.menuTest = QMenu(self.menubar)
         self.menuTest.setObjectName(u"menuTest")
+        self.menuTest.setEnabled(False)
+        self.menuHelp = QMenu(self.menubar)
+        self.menuHelp.setObjectName(u"menuHelp")
         MainWindow.setMenuBar(self.menubar)
         self.statusbar = QStatusBar(MainWindow)
         self.statusbar.setObjectName(u"statusbar")
@@ -87,6 +93,7 @@ def setupUi(self, MainWindow):
         self.menubar.addAction(self.menuFile.menuAction())
         self.menubar.addAction(self.menuView.menuAction())
         self.menubar.addAction(self.menuTest.menuAction())
+        self.menubar.addAction(self.menuHelp.menuAction())
         self.menuFile.addAction(self.actionOpen)
         self.menuFile.addAction(self.menuOpen_Recent.menuAction())
         self.menuFile.addAction(self.actionSave_As)
@@ -97,6 +104,7 @@ def setupUi(self, MainWindow):
         self.menuView.addAction(self.actionSharp)
         self.menuView.addAction(self.actionFull_Screen)
         self.menuTest.addAction(self.actionRun_Test)
+        self.menuHelp.addAction(self.actionAbout)
         self.toolBar.addAction(self.actionOpen)
         self.toolBar.addAction(self.actionSave_As)
         self.toolBar.addAction(self.actionPrevious)
@@ -132,10 +140,12 @@ def retranslateUi(self, MainWindow):
         self.actionNormal_View.setShortcut(QCoreApplication.translate("MainWindow", u"Esc", None))
 #endif // QT_CONFIG(shortcut)
         self.actionRun_Test.setText(QCoreApplication.translate("MainWindow", u"Run Test", None))
+        self.actionAbout.setText(QCoreApplication.translate("MainWindow", u"About", None))
         self.menuFile.setTitle(QCoreApplication.translate("MainWindow", u"File", None))
         self.menuOpen_Recent.setTitle(QCoreApplication.translate("MainWindow", u"Open Recent", None))
         self.menuView.setTitle(QCoreApplication.translate("MainWindow", u"View", None))
         self.menuTest.setTitle(QCoreApplication.translate("MainWindow", u"Test", None))
+        self.menuHelp.setTitle(QCoreApplication.translate("MainWindow", u"Help", None))
         self.toolBar.setWindowTitle(QCoreApplication.translate("MainWindow", u"toolBar", None))
         pass
     # retranslateUi

vmg/view_model.py

@@ -132,7 +132,6 @@ def drag_relative(self, dx, dy, gl_widget):
             [0, s, c],
         ], dtype=numpy.float32)
         self.image_rotation = m1 @ m2
-        # print(roty, m)
 
     def image_for_window(self, wpos, gl_widget):
         x_scale = y_scale = self.window_zoom
@@ -147,7 +146,6 @@ def image_for_window(self, wpos, gl_widget):
         latitude = math.asin(y)
         c = 1.0 / math.pi
         ix, iy = longitude * c / 2, latitude * c
-        print(ix, iy)
         return ix, iy
 
     def reset(self):

vmg/vimage.ui

@@ -66,14 +66,24 @@
     <addaction name="actionFull_Screen"/>
    </widget>
    <widget class="QMenu" name="menuTest">
+    <property name="enabled">
+     <bool>false</bool>
+    </property>
     <property name="title">
      <string>Test</string>
     </property>
     <addaction name="actionRun_Test"/>
    </widget>
+   <widget class="QMenu" name="menuHelp">
+    <property name="title">
+     <string>Help</string>
+    </property>
+    <addaction name="actionAbout"/>
+   </widget>
    <addaction name="menuFile"/>
    <addaction name="menuView"/>
    <addaction name="menuTest"/>
+   <addaction name="menuHelp"/>
   </widget>
   <widget class="QStatusBar" name="statusbar"/>
   <widget class="QToolBar" name="toolBar">
@@ -175,6 +185,14 @@
     <string>Run Test</string>
    </property>
   </action>
+  <action name="actionAbout">
+   <property name="text">
+    <string>About</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::AboutRole</enum>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>