Changes in src/sas/qtgui/MainWindow/DataExplorer.py [8ac3551:e90988c] in sasview

File:

• src/sas/qtgui/MainWindow/DataExplorer.py (modified) (3 diffs)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -473 +473 @@
         Notify the gui manager about the new perspective chosen.
         """
-        self.communicator.perspectiveChangedSignal.emit(self.cbFitting.itemText(index))
+        self.communicator.perspectiveChangedSignal.emit(self.cbFitting.currentText())
         self.chkBatch.setEnabled(self.parent.perspective().allowBatch())
 
-    def displayFile(self, filename=None, is_data=True):
+    def displayData(self, data_list):
         """
         Forces display of charts for the given filename
         """
-        model = self.model if is_data else self.theory_model
+        plot_to_show = data_list[0]
+
+        # passed plot is used ONLY to figure out its title,
+        # so all the charts related by it can be pulled from 
+        # the data explorer indices.
+        filename = plot_to_show.filename
+        model = self.model if plot_to_show.is_data else self.theory_model
+
         # Now query the model item for available plots
         plots = GuiUtils.plotsFromFilename(filename, model)
@@ -499 +506 @@
         if new_plots:
             self.plotData(new_plots)
-
-    def displayData(self, data_list):
-        """
-        Forces display of charts for the given data set
-        """
-        plot_to_show = data_list[0]
-        # passed plot is used ONLY to figure out its title,
-        # so all the charts related by it can be pulled from 
-        # the data explorer indices.
-        filename = plot_to_show.filename
-        self.displayFile(filename=filename, is_data=plot_to_show.is_data)
 
     def addDataPlot2D(self, plot_set, item):
@@ -1031 +1027 @@
         pass
 
-    def onAnalysisUpdate(self, new_perspective=""):
-        """
-        Update the perspective combo index based on passed string
-        """
-        assert new_perspective in Perspectives.PERSPECTIVES.keys()
-        self.cbFitting.blockSignals(True)
-        self.cbFitting.setCurrentIndex(self.cbFitting.findText(new_perspective))
-        self.cbFitting.blockSignals(False)
-        pass
-
     def loadComplete(self, output):
         """