auto-options-python 0.1.4__tar.gz → 0.1.6__tar.gz

{auto_options_python-0.1.4 → auto_options_python-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: auto-options-python
-Version: 0.1.4
+Version: 0.1.6
 Summary: Mange command options in python and create QWidgets for them.
 Author: Volker Baecker
 Author-email: volker.baecker@mri.cnrs.fr

{auto_options_python-0.1.4 → auto_options_python-0.1.6}/docs/source/user/introduction.rst

@@ -35,13 +35,13 @@ The code to create the options-dialog in Fig.1.1 is:
    from autooptions.options import Options
    from autooptions.widget import OptionsWidget
 
+   viewer = napari.Viewer()
    options = Options("3D Toolbox", "Convolution")
    options.addImage()
-   option.addImage(name="kernel")
+   options.addImage(name="kernel")
    options.addChoice("mode", choices=["same", "valid", "full"])
    options.addChoice("method", choices=["auto", "direct", "fft"])
    options.load()
-   widget = OptionsWidget(self.viewer, self.options, self)
+   widget = OptionsWidget(viewer, options, viewer)
    widget.addApplyButton(None)
-   viewer = napari.Viewer()
    viewer.window.add_dock_widget(widget, name=options.optionsName)

{auto_options_python-0.1.4 → auto_options_python-0.1.6}/src/auto_options_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: auto-options-python
-Version: 0.1.4
+Version: 0.1.6
 Summary: Mange command options in python and create QWidgets for them.
 Author: Volker Baecker
 Author-email: volker.baecker@mri.cnrs.fr

{auto_options_python-0.1.4 → auto_options_python-0.1.6}/src/autooptions/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.1.4'
-__version_tuple__ = version_tuple = (0, 1, 4)
+__version__ = version = '0.1.6'
+__version_tuple__ = version_tuple = (0, 1, 6)
 
-__commit_id__ = commit_id = 'g8103b82a3'
+__commit_id__ = commit_id = 'g52deebf6d'

{auto_options_python-0.1.4 → auto_options_python-0.1.6}/src/autooptions/widget.py

@@ -13,7 +13,7 @@ class OptionsWidget(QWidget):
     to the options file.
     """
 
-    def __init__(self, viewer, options, client=None):
+    def __init__(self, viewer, options, client=None, sameRowMap=None):
         """
         Create a new options widget. Layer add and remove events are caught and
         the combo-boxes are updated accordingly, depending on the layer types.
@@ -41,6 +41,7 @@ class OptionsWidget(QWidget):
         self.labelComboBoxes = []
         self.pointComboBoxes = []
         self.widgets = {}
+        self._isSameRow = sameRowMap
         self.viewer.layers.events.inserted.connect(self._onLayerAddedOrRemoved)
         self.viewer.layers.events.removed.connect(self._onLayerAddedOrRemoved)
         self.input_layer = None
@@ -137,42 +138,55 @@ class OptionsWidget(QWidget):
         return func
 
 
+    def sameRow(self, name):
+        if self._isSameRow is None:
+            self._isSameRow = {}
+        self._isSameRow[name] = True
+
+
+    def isSameRow(self, name):
+        if self._isSameRow is None:
+            return False
+        if name in self._isSameRow.keys():
+            return self._isSameRow[name]
+        return False
+
+
     def _createLayout(self):
         self.mainLayout = QVBoxLayout()
+        layout = None
+        lastLayout = None
         for name, item in self.options.items.items():
             widget = None
             if item['type'] == 'image':
                 layout, widget = self._getImageWidget(name, item)
-                self.mainLayout.addLayout(layout)
                 self.imageComboBoxes.append(widget)
             if item['type'] == 'labels':
                 layout, widget = self._getLabelsWidget(name, item)
-                self.mainLayout.addLayout(layout)
                 self.labelComboBoxes.append(widget)
             if item['type'] == 'points':
                 layout, widget = self._getPointsWidget(name, item)
-                self.mainLayout.addLayout(layout)
                 self.pointComboBoxes.append(widget)
             if item['type'] == 'fft':
                 layout, widget = self._getFFTWidget(name, item)
-                self.mainLayout.addLayout(layout)
                 self.fftComboBoxes.append(widget)
             if item['type'] == 'int':
                 layout, widget = self._getIntWidget(name, item)
-                self.mainLayout.addLayout(layout)
             if item['type'] == 'float':
                 layout, widget = self._getFloatWidget(name, item)
-                self.mainLayout.addLayout(layout)
             if item['type'] == 'choice':
                 layout, widget = self._getChoiceWidget(name, item)
-                self.mainLayout.addLayout(layout)
             if item['type'] == 'str':
                 layout, widget = self._getStrWidget(name, item)
-                self.mainLayout.addLayout(layout)
             if item['type'] == 'bool':
                 layout, widget = self._getBoolWidget(name, item)
+            if self.isSameRow(name):
+                lastLayout.addWidget(layout.itemAt(0).widget())
+                lastLayout.addWidget(layout.itemAt(1).widget())
+            else:
                 self.mainLayout.addLayout(layout)
             self.widgets[name] = widget
+            lastLayout = layout
         self.setLayout(self.mainLayout)
 
 
@@ -291,26 +305,24 @@ class OptionsWidget(QWidget):
 
 
     def _createApplyButton(self, callback):
-        button = self._createButton("&Apply", callback)
-        button.clicked.connect(self._onApplyButtonClicked)
+        button = self._createButton("&Apply", callback, self._onApplyButtonClicked)
         return button
 
 
     def _createOKButton(self, callback):
-        button = self._createButton("&Ok", callback)
-        button.clicked.connect(self._onOKButtonClicked)
+        button = self._createButton("&Ok", callback, self._onOKButtonClicked)
         return button
 
 
     def _createCancelButton(self, callback):
-        button = self._createButton("&Cancel", callback)
-        button.clicked.connect(self._onCancelButtonClicked)
+        button = self._createButton("&Cancel", callback, self._onCancelButtonClicked)
         return button
 
 
     @classmethod
-    def _createButton(cls, name, callback):
+    def _createButton(cls, name, callback, innerCallback):
         button = QPushButton(name)
+        button.clicked.connect(innerCallback)
         if callback:
             button.clicked.connect(callback)
         return button

{auto_options_python-0.1.4 → auto_options_python-0.1.6}/src/scratch/options.py

@@ -4,12 +4,17 @@ from autooptions.widget import OptionsWidget
 
 class Client:
 
+
     def __init__(self):
         self.viewer = napari.Viewer()
         self.options = None
         self.widget = None
 
 
+    def onApplyButtonClicked(self):
+        print(self.options.items)
+
+
     def onInputChanged(self, value):
         if not value.isnumeric():
             self.widget.widgets["size xy"].setText(str(self.options.value("size xy")))
@@ -24,8 +29,8 @@ class Client:
         self.options.addChoice('footprint', value=None, choices=["none", "cube", "ball", "octahedron"])
         self.options.addInt('radius', value=1, widget="input")
         self.options.load()
-        self.widget = OptionsWidget(self.viewer, self.options, self)
-        self.widget.addApplyButton(None)
+        self.widget = OptionsWidget(self.viewer, self.options, self, sameRowMap={"size z": True})
+        self.widget.addApplyButton(self.onApplyButtonClicked)
         #self.widget.addOKButton(None)
         #self.widget.addCancelButton(None)
         self.viewer.window.add_dock_widget(self.widget, name=self.options.optionsName)