Changeset d5c5d3d in sasview for src/sas/qtgui/MainWindow

Timestamp:

Oct 17, 2017 3:25:17 PM (7 years ago)

Author:

celinedurniak <celine.durniak@…>

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:

f0bb711

Parents:

d6e5b31

Message:

Implemented new GUI for data operation panel

Location:

src/sas/qtgui/MainWindow

Files:

• DataExplorer.py (modified) (3 diffs)
• GuiManager.py (modified) (7 diffs)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -93 +93 @@
         self.communicator.activeGraphName.connect(self.updatePlotName)
         self.communicator.plotUpdateSignal.connect(self.updatePlot)
+
         self.cbgraph.editTextChanged.connect(self.enableGraphCombo)
         self.cbgraph.currentIndexChanged.connect(self.enableGraphCombo)
@@ -869 +870 @@
         self.txt_widget.setWindowIcon(QtGui.QIcon(":/res/ball.ico"))
         self.txt_widget.setWindowTitle("Data Info: %s" % data.filename)
+        self.txt_widget.clear()
         self.txt_widget.insertPlainText(text_to_show)
 
@@ -1012 +1014 @@
         self.model.appendRow(checkbox_item)
 
-
     def updateModelFromPerspective(self, model_item):
         """

src/sas/qtgui/MainWindow/GuiManager.py

@@ -31 +31 @@
 from sas.qtgui.Calculators.GenericScatteringCalculator import GenericScatteringCalculator
 from sas.qtgui.Calculators.ResolutionCalculatorPanel import ResolutionCalculatorPanel
-
+from sas.qtgui.Calculators.DataOperationUtilityPanel import DataOperationUtilityPanel
 
 # Perspectives
@@ -47 +47 @@
     Main SasView window functionality
     """
+
     def __init__(self, parent=None):
         """
@@ -142 +143 @@
         self.GENSASCalculator = GenericScatteringCalculator(self)
         self.ResolutionCalculator = ResolutionCalculatorPanel(self)
+        self.DataOperation = DataOperationUtilityPanel(self)
 
     def statusBarSetup(self):
@@ -337 +339 @@
         self.communicate.updateTheoryFromPerspectiveSignal.connect(self.updateTheoryFromPerspective)
         self.communicate.plotRequestedSignal.connect(self.showPlot)
+        self.communicate.updateModelFromDataOperationPanelSignal.connect(self.updateModelFromDataOperationPanel)
 
     def addTriggers(self):
@@ -531 +534 @@
         """
         """
-        print("actionData_Operation TRIGGERED")
-        pass
+        self.communicate.sendDataToPanel.emit(self._data_manager.get_all_data())
+
+        self.DataOperation.show()
 
     def actionSLD_Calculator(self):
@@ -731 +735 @@
         self.filesWidget.updateTheoryFromPerspective(index)
 
+    def updateModelFromDataOperationPanel(self, new_item, new_datalist_item):
+        """
+        :param new_item: item to be added to list of loaded files
+        :param new_datalist_item:
+        """
+        if not isinstance(new_item, QtGui.QStandardItem) or \
+                not isinstance(new_datalist_item, dict):
+            msg = "Wrong data type returned from calculations."
+            raise AttributeError, msg
+
+        self.filesWidget.model.appendRow(new_item)
+        self._data_manager.add_data(new_datalist_item)
+
     def showPlot(self, plot):
         """
@@ -737 +754 @@
         if hasattr(self, "filesWidget"):
             self.filesWidget.displayData(plot)
-