tomwer 1.3.26__py3-none-any.whl → 1.4.0__py3-none-any.whl

tomwer/gui/control/scanselectorwidget.py

@@ -1,38 +1,12 @@
 # coding: utf-8
-# /*##########################################################################
-#
-# Copyright (c) 2016-2017 European Synchrotron Radiation Facility
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# ###########################################################################*/
-
-__authors__ = ["C. Nemoz", "H. Payno"]
-__license__ = "MIT"
-__date__ = "25/05/2018"
+from __future__ import annotations
 
 
 import logging
 
 from tomwer.core.scan.scanbase import TomwerScanBase
 from tomwer.gui.control.datalist import GenericScanList
-from tomwer.gui.qfolderdialog import QDataDialog
+from tomwer.gui.dialog.QDataDialog import QDataDialog
 
 from .selectorwidgetbase import _SelectorWidget
 

tomwer/gui/control/selectorwidgetbase.py

@@ -38,8 +38,8 @@ class _SelectorWidget(qt.QMainWindow):
         toolbar.setFloatable(False)
         self.addToolBar(qt.Qt.TopToolBarArea, toolbar)
 
-        tomoObjdisplayAction = TomoObjDisplayModeToolButton(self)
-        toolbar.addWidget(tomoObjdisplayAction)
+        tomoObjDisplayAction = TomoObjDisplayModeToolButton(self)
+        toolbar.addWidget(tomoObjDisplayAction)
 
         # set up
         self.setDisplayMode(DisplayMode.SHORT)
@@ -47,7 +47,7 @@ class _SelectorWidget(qt.QMainWindow):
         # connect signal / slot
         # for drag / drop we need to have an indirect call to the sigUpdated
         self.dataList.listChanged.connect(self._updatedFromDragDrop)
-        tomoObjdisplayAction.sigDisplayModeChanged.connect(self.setDisplayMode)
+        tomoObjDisplayAction.sigDisplayModeChanged.connect(self.setDisplayMode)
 
     def setDisplayMode(self, *args, **kwargs):
         self.dataList.setDisplayMode(*args, **kwargs)
@@ -88,24 +88,25 @@ class _SelectorWidget(qt.QMainWindow):
         return w
 
     def _getSendButtons(self):
-        lLayout = qt.QHBoxLayout()
+        layout = qt.QHBoxLayout()
         widget = qt.QWidget(self)
-        widget.setLayout(lLayout)
+        widget.setLayout(layout)
 
-        # spacer
-        spacer = qt.QWidget(self)
-        spacer.setSizePolicy(qt.QSizePolicy.Expanding, qt.QSizePolicy.Minimum)
-        lLayout.addWidget(spacer)
+        # select all button
+        self._selectAllButton = qt.QPushButton("Select all")
+        self._selectAllButton.setToolTip("Select all scan. (shortcut: Ctrl + A)")
+        self._selectAllButton.clicked.connect(self.selectAll)
+        layout.addWidget(self._selectAllButton)
 
-        # send all button
-        self._sendAllButton = qt.QPushButton("Send all")
-        self._sendAllButton.clicked.connect(self._sendAll)
-        lLayout.addWidget(self._sendAllButton)
+        # horizontal spacer
+        h_spacer = qt.QWidget(self)
+        h_spacer.setSizePolicy(qt.QSizePolicy.Expanding, qt.QSizePolicy.Minimum)
+        layout.addWidget(h_spacer)
 
         # send selected button
         self._sendButton = qt.QPushButton("Send selected")
-        self._sendButton.clicked.connect(self._selectActiveData)
-        lLayout.addWidget(self._sendButton)
+        self._sendButton.clicked.connect(self._sendSelected)
+        layout.addWidget(self._sendButton)
 
         return widget
 
@@ -118,7 +119,7 @@ class _SelectorWidget(qt.QMainWindow):
     def _callbackAddData(self):
         raise NotImplementedError("Base class")
 
-    def _selectActiveData(self):
+    def _sendSelected(self):
         sItem = self.dataList.selectedItems()
         if sItem and len(sItem) >= 1:
             selection = [
@@ -149,7 +150,6 @@ class _SelectorWidget(qt.QMainWindow):
         set the given scan as the active one
 
         :param scan: the scan to set active
-        :type scan: Union[str, TomoBase]
         """
         data_id = data
         self.dataList.setCurrentItem(self.dataList.items[data_id])