Changeset 38eb433 in sasview

Timestamp:

Aug 14, 2017 2:33:18 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

377ade1

Parents:

ee18d33

Message:

SASVIEW-644: mapping between datasets and fit tabs

Location:

src/sas/qtgui

Files:

• MainWindow/DataExplorer.py (modified) (2 diffs)
• Perspectives/Fitting/FittingPerspective.py (modified) (4 diffs)
• Perspectives/Fitting/FittingWidget.py (modified) (1 diff)
• Perspectives/Fitting/UI/FittingWidgetUI.ui (modified) (1 diff)
• Utilities/GuiUtils.py (modified) (1 diff)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -279 +279 @@
         ind = -1
         # Use 'while' so the row count is forced at every iteration
+        deleted_indices = []
         while ind < self.model.rowCount():
             ind += 1
@@ -284 +285 @@
             if item and item.isCheckable() and item.checkState() == QtCore.Qt.Checked:
                 # Delete these rows from the model
+                deleted_indices.append(item)
                 self.model.removeRow(ind)
                 # Decrement index since we just deleted it
                 ind -= 1
 
-        # pass temporarily kept as a breakpoint anchor
-        pass
+        # Let others know we deleted data
+        self.communicator.dataDeletedSignal.emit(deleted_indices)
 
     def deleteTheory(self, event):

src/sas/qtgui/Perspectives/Fitting/FittingPerspective.py

@@ -32 +32 @@
         self.currentTab = 0
 
-        # The current optimizer
+        # The default optimizer
         self.optimizer = 'Levenberg-Marquardt'
+
+        # Dataset inde -> Fitting tab mapping
+        self.dataToFitTab = {}
 
         # The tabs need to be closeable
@@ -45 +48 @@
         # Deal with signals
         self.tabCloseRequested.connect(self.tabCloses)
+        self.communicate.dataDeletedSignal.connect(self.dataDeleted)
 
         # Perspective window not allowed to close by default
@@ -104 +108 @@
         tab.is_batch_fitting = is_batch
         # Add this tab to the object library so it can be retrieved by scripting/jupyter
-        ObjectLibrary.addObject(self.tabName(), tab)
+        tab_name = self.tabName(is_batch=is_batch)
+        ObjectLibrary.addObject(tab_name, tab)
         self.tabs.append(tab)
+        if data:
+            self.updateFitDict(data, tab_name)
         self.maxIndex += 1
-        self.addTab(tab, self.tabName())
-
-    def tabName(self):
+        self.addTab(tab, tab_name)
+
+    def updateFitDict(self, item_key, tab_name):
+        """
+        Create a list if none exists and append if there's already a list
+        """
+        if item_key in self.dataToFitTab.keys():
+            self.dataToFitTab[item_key].append(tab_name)
+        else:
+            self.dataToFitTab[item_key] = [tab_name]
+
+        #print "CURRENT dict: ", self.dataToFitTab
+
+    def tabName(self, is_batch=False):
         """
         Get the new tab name, based on the number of fitting tabs so far
         """
-        page_name = "FitPage" + str(self.maxIndex)
+        page_name = "BatchPage" if is_batch else "FitPage"
+        page_name = page_name + str(self.maxIndex)
         return page_name
 
+    def resetTab(self, index):
+        """
+        Adds a new tab and removes the last tab
+        as a way of resetting the fit tabs
+        """
+        # If data on tab empty - do nothing
+        if not self.tabs[index].data:
+            return
+        # Add a new, empy tab
+        self.addFit(None)
+        # Remove the previous last tab
+        self.tabCloses(index)
+
     def tabCloses(self, index):
         """
         Update local bookkeeping on tab close
         """
-        assert len(self.tabs) >= index
+        #assert len(self.tabs) >= index
         # don't remove the last tab
         if len(self.tabs) <= 1:
+            self.resetTab(index)
             return
-        ObjectLibrary.deleteObjectByRef(self.tabs[index])
-        del self.tabs[index]
-        self.removeTab(index)
+        try:
+            ObjectLibrary.deleteObjectByRef(self.tabs[index])
+            self.removeTab(index)
+            del self.tabs[index]
+        except IndexError:
+            # The tab might have already been deleted previously
+            pass
+
+    def closeTabByName(self, tab_name):
+        """
+        Given name of the fitting tab - close it
+        """
+        for tab_index in xrange(len(self.tabs)):
+            if self.tabText(tab_index) == tab_name:
+                self.tabCloses(tab_index)
+        pass # debug hook
+
+    def dataDeleted(self, index_list):
+        """
+        Delete fit tabs referencing given data
+        """
+        if not index_list or not self.dataToFitTab:
+            return
+        for index_to_delete in index_list:
+            if index_to_delete in self.dataToFitTab.keys():
+                for tab_name in self.dataToFitTab[index_to_delete]:
+                    # delete tab #index after corresponding data got removed
+                    self.closeTabByName(tab_name)
+                self.dataToFitTab.pop(index_to_delete)
+
+        #print "CURRENT dict: ", self.dataToFitTab
 
     def allowBatch(self):
@@ -158 +219 @@
 
             if numpy.any(available_tabs):
-                self.tabs[available_tabs.index(True)].data = data
+                first_good_tab = available_tabs.index(True)
+                self.tabs[first_good_tab].data = data
+                tab_name = str(self.tabText(first_good_tab))
+                self.updateFitDict(data, tab_name)
             else:
                 self.addFit(data, is_batch=is_batch)

src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

@@ -311 +311 @@
                 self.cbFileNames.addItem(filename)
             self.cbFileNames.setVisible(True)
+            # This panel is not designed to view individual fits, so disable plotting
+            self.cmdPlot.setVisible(False)
         # Similarly on other tabs
         self.options_widget.setEnablementOnDataLoad()

src/sas/qtgui/Perspectives/Fitting/UI/FittingWidgetUI.ui

@@ -34 +34 @@
        <item row="0" column="0">
         <widget class="QComboBox" name="cbFileNames">
+         <property name="toolTip">
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Choose a file to set initial fit parameters.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
          <property name="sizeAdjustPolicy">
           <enum>QComboBox::AdjustToContents</enum>

src/sas/qtgui/Utilities/GuiUtils.py

@@ -245 +245 @@
     # Current perspective changed
     perspectiveChangedSignal = QtCore.pyqtSignal(str)
+
+    # File/dataset got deleted
+    dataDeletedSignal = QtCore.pyqtSignal(list)