Changeset d6e38661 in sasview

Timestamp:

Apr 5, 2018 8:32:38 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:

ded5e77, 01ef3f7

Parents:

bb57068

Message:

Fixed naming of datasets for both theory and file data

Location:

src/sas/qtgui

Files:

• MainWindow/DataExplorer.py (modified) (1 diff)
• Perspectives/Fitting/FittingLogic.py (modified) (1 diff, 1 prop)
• Perspectives/Fitting/FittingWidget.py (modified) (1 diff)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -1133 +1133 @@
         # Check if there are any other items for this tab
         # If so, delete them
-        # TODO: fix this to resemble GuiUtils.updateModelItemWithPlot
-        #
-        ##self.model.beginResetModel()
-        ##current_tab_name = model_item.text()[:2]
-        ##for current_index in range(self.theory_model.rowCount()):
+        current_tab_name = model_item.text()
+        for current_index in range(self.theory_model.rowCount()):
             #if current_tab_name in self.theory_model.item(current_index).text():
-            #    return
-        ##        self.theory_model.removeRow(current_index)
-        ##        break
-
-        ### Reset the view
-        ##self.model.endResetModel()
-
-        # Reset the view
+            if current_tab_name == self.theory_model.item(current_index).text():
+                return
+                self.theory_model.removeRow(current_index)
+                break
+
+        # send in the new item
         self.theory_model.appendRow(model_item)
-
-        # Pass acting as a debugger anchor
-        pass
 
 

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

@@ -126 +126 @@
 
         new_plot.group_id = data.group_id
-        new_plot.id = str(tab_id) + " " + data.name
-        new_plot.name = model.name + " [" + data.name + "]"
+        new_plot.id = str(tab_id) + " " + model.id
+
+        if data.filename:
+            new_plot.name = model.name + " [" + data.filename + "]" # data file
+        else:
+            new_plot.name = model.name + " [" + model.id + "]"  # theory
+
         new_plot.title = new_plot.name
         new_plot.xaxis(_xaxis, _xunit)

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

@@ -1957 +1957 @@
             self.updateModelIndex(fitted_data)
         else:
-            name = self.nameForFittedData(self.kernel_module.name)
+            name = self.nameForFittedData(self.kernel_module.id)
             fitted_data.title = name
             fitted_data.name = name