Merge pull request #280 from k-dominik/auto-2d3d-tilewidth

Set tilewidth automatically for 2D and 3D data

Author: k-dominik

volumina/imageScene2D.py

@@ -40,7 +40,6 @@
 from volumina.tiling import Tiling, TileProvider
 from volumina.layerstack import LayerStackModel
 from volumina.pixelpipeline.imagepump import StackedImageSources
-from volumina.utility import preferences
 
 import datetime
 import threading
@@ -296,7 +295,7 @@ def cacheSize(self):
 
     def setTileWidth(self, tileWidth):
         self._tileWidth = tileWidth
-        preferences.set("ImageScene2D", "tileWidth", tileWidth)
+        self.reset()
 
     def tileWidth(self):
         return self._tileWidth
@@ -400,7 +399,7 @@ def __init__(
         self._offsetX = 0
         self._offsetY = 0
         self.name = name
-        self._tileWidth = preferences.get("ImageScene2D", "tileWidth", default=512)
+        self._tileWidth = 256
 
         self._stackedImageSources = StackedImageSources(LayerStackModel())
         self._showTileOutlines = False

volumina/volumeEditor.py

@@ -255,6 +255,10 @@ def showCropLines(self, visible):
         for view in self.imageViews:
             view.showCropLines(visible)
 
+    def setTileWidth(self, tileWidth):
+        for i in self.imageScenes:
+            i.setTileWidth(tileWidth)
+
     def cleanUp(self):
         QApplication.processEvents()
         for scene in self._imageViews:

volumina/volumeEditorWidget.py

@@ -59,6 +59,7 @@
 from .pixelpipeline.datasources import ArraySource
 from .volumeEditor import VolumeEditor
 from volumina.utility import ShortcutManager
+from volumina.utility import preferences
 
 
 class __TimerEventEater(QObject):
@@ -269,6 +270,8 @@ def onShapeChanged():
                     self.editor.imageViews[i].setHudVisible(self.hudsShown[i])
                 self.quadview.statusBar.crosshairsCheckbox.setChecked(False)
 
+            self._updateTileWidth()
+
             self.quadview.statusBar.crosshairsCheckbox.setVisible(True)
 
             if self.editor.cropModel.cropZero() or None in self.editor.cropModel.get_roi_3d()[0]:
@@ -324,6 +327,33 @@ def _rubberBandZoom(self):
                     self.editor.imageViews[self.editor._lastImageViewFocus]._cursorBackup
                 )
 
+    def _updateTileWidth(self):
+        tile_width = self._getTileWidth()
+        self.editor.setTileWidth(tile_width)
+
+    def _getTileWidthConfigKeyDefault(self):
+        singletons_spacial = sum(1 for dim in self.editor.posModel.shape if dim == 1)
+        assert singletons_spacial in range(2)
+        if singletons_spacial == 0:
+            # 3D data
+            key = "tileWidth3D"
+            default = 256
+        else:
+            # 2D data
+            key = "tileWidth"
+            default = 512
+        return key, default
+
+    def _getTileWidth(self):
+        key, default = self._getTileWidthConfigKeyDefault()
+        tile_width = preferences.get("ImageScene2D", key, default=default)
+        return tile_width
+
+    def _setTileWidth(self, value):
+        key, _ = self._getTileWidthConfigKeyDefault()
+        preferences.set("ImageScene2D", key, value)
+        self._updateTileWidth()
+
     def _toggleHUDs(self, checked):
         for v in self.editor.imageViews:
             v.setHudVisible(checked)
@@ -576,9 +606,10 @@ def changeTileWidth():
             dlg.setWindowTitle("Viewer Tile Width")
             dlg.setModal(True)
 
+            saved = self._getTileWidth()
             spinBox = QSpinBox(parent=dlg)
             spinBox.setRange(128, 10 * 1024)
-            spinBox.setValue(self.editor.imageScenes[0].tileWidth())
+            spinBox.setValue(saved)
 
             ctrl_layout = QHBoxLayout()
             ctrl_layout.addSpacerItem(QSpacerItem(10, 0, QSizePolicy.Expanding))
@@ -597,12 +628,11 @@ def changeTileWidth():
             dlg_layout.addWidget(button_box)
 
             dlg.setLayout(dlg_layout)
+            spinBox.setFocus()
 
             if dlg.exec_() == QDialog.Accepted:
-                for s in self.editor.imageScenes:
-                    if s.tileWidth != spinBox.value():
-                        s.setTileWidth(spinBox.value())
-                        s.reset()
+                if spinBox.value() != saved:
+                    self._setTileWidth(spinBox.value())
 
         self._viewMenu.addAction("Set Tile Width...").triggered.connect(changeTileWidth)