disable GPU size and GPU checkbox for volume render. (#403)

* Update the viewer when the "view" dropdown in the results tab changes #403
* Remove GPU size and GPU checkbox for volume render in settings #403

Author: paskino

CHANGES.md

@@ -1,10 +1,13 @@
 # ChangeLog
 
-## v25.0.0
+## v24.2.0
 Enhancements:
-* updated default values in Run DVC tab #402
+* Update the viewer when the "view" dropdown in the results tab changes #403
+* Update default values in "Run DVC" tab #402
+
 Bug fixes:
-* Adds 3D viewer docking option in the settings #398
+* Remove GPU size and GPU checkbox for volume render in settings #403
+* Add 3D viewer docking option in the settings #398
 
 
 ## v24.1.1

src/idvc/dvc_interface.py

@@ -791,19 +791,10 @@ def displayFileErrorDialog(self, message, title, action_button=None):
     def view_image(self):
         self.ref_image_data = vtk.vtkImageData()
         self.image_info = dict()
-        if self.settings.value("gpu_size") is not None and self.settings.value("volume_mapper") == "gpu":
-            if self.settings.value("vis_size"):
-                if float(self.settings.value("vis_size")) < float(self.settings.value("gpu_size")):
-                    target_size = float(self.settings.value("vis_size"))
-                else:
-                    target_size = (float(self.settings.value("gpu_size")))
-            else:
-                target_size = (float(self.settings.value("gpu_size")))
+        if self.settings.value("vis_size"):
+            target_size = float(self.settings.value("vis_size"))
         else:
-            if self.settings.value("vis_size"):
-                target_size = float(self.settings.value("vis_size"))
-            else:
-                target_size = 0.125
+            target_size = 0.125
         self.target_image_size = target_size
 
         ImageDataCreator.createImageData(self, self.image[0], self.ref_image_data, info_var = self.image_info, convert_raw = True,  
@@ -4981,6 +4972,7 @@ def CreateViewDVCResultsPanel(self):
         widgetno += 1
 
         result_widgets['load_button'].clicked.connect(self.LoadResultsOnViewer)
+        result_widgets['vec_entry'].currentIndexChanged.connect(result_widgets['load_button'].click)
 
         result_widgets['run_entry'].currentIndexChanged.connect(self.show_run_pcs)   
         result_widgets['graphs_button'].clicked.connect(self.CreateGraphsWindow)
@@ -5267,11 +5259,6 @@ def SaveSession(self, text_value, compress, event):
         self.config['pc_rotz'] = pc['pointcloud_rotation_z_entry'].text()
 
         #Downsampling level
-        if self.settings.value("gpu_size") is not None: 
-            self.config['gpu_size'] = self.settings.value("gpu_size")
-        else:
-            self.config['gpu_size'] = 1
-
         if self.settings.value("vis_size") is not None:
             self.config['vis_size'] = self.settings.value("vis_size")
         else:
@@ -5746,14 +5733,13 @@ def LoadSession(self):
             if 'mask_file' in self.config:
                 self.mask_details=self.config['mask_details']
                 self.mask_load = True
-                if 'gpu_size' in self.config and 'vis_size' in self.config:
-                    if float(self.settings.value('gpu_size')) != float(self.config['gpu_size']) \
-                            or float(self.settings.value('vis_size')) != float(self.config['vis_size']):
+                if 'vis_size' in self.config:
+                    if float(self.settings.value('vis_size')) != float(self.config['vis_size']):
 
                         self.mask_load = False
 
-                        self.e('', '', "If you would like to load the mask, open the settings and change the GPU size field to {gpu_size}GB and the maximum visualisation size to {vis_size} GB.\
-    Then reload the session.".format(gpu_size=self.config['gpu_size'], vis_size = self.config['vis_size']))
+                        self.e('', '', "If you would like to load the mask, open the settings and change the maximum visualisation size to {vis_size} GB.\
+    Then reload the session.".format(vis_size = self.config['vis_size']))
                         error_title = "LOAD ERROR"
                         error_text = 'This session was saved with a different level of downsampling. This means the mask could not be loaded.'
                         self.displayFileErrorDialog(message=error_text, title=error_title)

src/idvc/ui/dialogs.py

@@ -61,33 +61,10 @@ def __init__(self, parent, title="Settings"):
         self.addSpanningWidget(separator,'separator')
         self.addSpanningWidget(self.adv_settings_label, 'advanced_label')
 
-
-        self.gpu_label = QLabel("Please set the size of your GPU memory.")
-        self.gpu_size_label = QLabel("GPU Memory (GB): ")
-        self.gpu_size_entry = QDoubleSpinBox()
-
-        self.addSpanningWidget(self.gpu_label, 'gpu_label')
-        self.addWidget(self.gpu_size_entry, self.gpu_size_label, 'gpu_size')
-
-        # populate from settings
-        if self.parent.settings.value("gpu_size") is not None:
-            self.gpu_size_entry.setValue(float(self.parent.settings.value("gpu_size")))
-        else:
-            self.gpu_size_entry.setValue(1.0)
-
-        self.gpu_size_entry.setMaximum(64.0)
-        self.gpu_size_entry.setMinimum(0.00)
-        self.gpu_size_entry.setSingleStep(0.01)
-
-
-        self.gpu_checkbox = QCheckBox("Use GPU for volume render. (Recommended) ")
-        self.gpu_checkbox.setChecked(True) #gpu is default
-        if self.parent.settings.value("volume_mapper") == "cpu":
-            self.gpu_checkbox.setChecked(False)
+        
+        self.copy_files_checkbox.setChecked(False)
         if hasattr(self.parent, 'copy_files'):
             self.copy_files_checkbox.setChecked(self.parent.copy_files)
-        self.addWidget(self.gpu_checkbox, '', 'gpu_checkbox')
-
 
         self.omp_threads_entry = QSpinBox(self)
         # default OMP_THREADS based on the number of cores available
@@ -135,7 +112,6 @@ def onOk(self):
         else:
             self.parent.settings.setValue("volume_mapper", "cpu")
 
-        self.parent.settings.setValue("gpu_size", float(self.gpu_size_entry.value()))
         self.parent.settings.setValue("vis_size", float(self.vis_size_entry.value()))
 
         if self.parent.settings.value("first_app_load") != "False":

src/idvc/ui/windows.py

@@ -69,12 +69,7 @@ def createEmptyFrame(self):
 
     def displayImageData(self):
         self.createEmptyFrame()
-        if self.viewer == viewer3D:
-            #set volume mapper according to user settings:
-            if self.parent.settings.value("volume_mapper") == "cpu":
-                self.frame.viewer.volume_mapper = vtk.vtkFixedPointVolumeRayCastMapper()
-                self.frame.viewer.volume.SetMapper(self.frame.viewer.volume_mapper)
-        elif self.viewer == viewer2D:
+        if self.viewer == viewer2D:
             self.frame.viewer.style.htext = """
             Mouse Interactions:
                 - Slice: Mouse Scroll