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

Timestamp:

Oct 17, 2018 8:00:00 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

10d57f6

Parents:

345b3b3 (diff), dd545d1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ESS_GUI' into ESS_GUI_project_save

Location:

src/sas/qtgui/MainWindow

Files:

• GuiManager.py (modified) (5 diffs)
• UI/MainWindowUI.ui (modified) (3 diffs)
• DataExplorer.py (modified) (3 diffs)
• DataManager.py (modified) (1 diff)

src/sas/qtgui/MainWindow/GuiManager.py

@@ -136 +136 @@
         self.logDockWidget = QDockWidget("Log Explorer", self._workspace)
         self.logDockWidget.setObjectName("LogDockWidget")
+        self.logDockWidget.visibilityChanged.connect(self.updateLogContextMenus)
+
 
         self.listWidget = QTextBrowser()
@@ -178 +180 @@
             logger.error("%s: could not load SasView models")
             logger.error(traceback.format_exc())
+
+    def updateLogContextMenus(self, visible=False):
+        """
+        Modify the View/Data Explorer menu item text on widget visibility
+        """
+        if visible:
+            self._workspace.actionHide_LogExplorer.setText("Hide Log Explorer")
+        else:
+            self._workspace.actionHide_LogExplorer.setText("Show Log Explorer")
 
     def updateContextMenus(self, visible=False):
@@ -433 +444 @@
         """
         # disable not yet fully implemented actions
-        self._workspace.actionOpen_Analysis.setEnabled(False)
-        self._workspace.actionUndo.setEnabled(False)
-        self._workspace.actionRedo.setEnabled(False)
-        self._workspace.actionReset.setEnabled(False)
-        self._workspace.actionStartup_Settings.setEnabled(False)
-        self._workspace.actionImage_Viewer.setEnabled(False)
-        self._workspace.actionCombine_Batch_Fit.setEnabled(False)
-        self._workspace.actionFit_Results.setEnabled(False)
+        self._workspace.actionOpen_Analysis.setVisible(False)
+        self._workspace.actionUndo.setVisible(False)
+        self._workspace.actionRedo.setVisible(False)
+        self._workspace.actionReset.setVisible(False)
+        self._workspace.actionStartup_Settings.setVisible(False)
+        self._workspace.actionImage_Viewer.setVisible(False)
+        self._workspace.actionCombine_Batch_Fit.setVisible(False)
+        self._workspace.actionFit_Results.setVisible(False)
         # orientation viewer set to invisible SASVIEW-1132
         self._workspace.actionOrientation_Viewer.setVisible(False)
@@ -467 +478 @@
         self._workspace.actionCategory_Manager.triggered.connect(self.actionCategory_Manager)
         self._workspace.actionHide_DataExplorer.triggered.connect(self.actionHide_DataExplorer)
+        self._workspace.actionHide_LogExplorer.triggered.connect(self.actionHide_LogExplorer)
         # Tools
         self._workspace.actionData_Operation.triggered.connect(self.actionData_Operation)
@@ -654 +666 @@
         """
         if self.dockedFilesWidget.isVisible():
-            #self._workspace.actionHide_DataExplorer.setText("Show Data Explorer")
             self.dockedFilesWidget.setVisible(False)
         else:
-            #self._workspace.actionHide_DataExplorer.setText("Hide Data Explorer")
             self.dockedFilesWidget.setVisible(True)
+        pass
+
+    def actionHide_LogExplorer(self):
+        """
+        Toggle Data Explorer vsibility
+        """
+        if self.logDockWidget.isVisible():
+            self.logDockWidget.setVisible(False)
+        else:
+            self.logDockWidget.setVisible(True)
         pass
 

src/sas/qtgui/MainWindow/UI/MainWindowUI.ui

@@ -25 +25 @@
      <y>0</y>
      <width>915</width>
-     <height>26</height>
+     <height>21</height>
     </rect>
    </property>
@@ -75 +75 @@
     <addaction name="actionHide_Toolbar"/>
     <addaction name="actionHide_DataExplorer"/>
+    <addaction name="actionHide_LogExplorer"/>
     <addaction name="separator"/>
     <addaction name="actionStartup_Settings"/>
@@ -565 +566 @@
    </property>
   </action>
+  <action name="actionHide_LogExplorer">
+   <property name="text">
+    <string>Hide Log Explorer</string>
+   </property>
+  </action>
  </widget>
  <resources/>

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -233 +233 @@
         filename = QtWidgets.QFileDialog.getOpenFileName(**kwargs)[0]
         if filename:
-            load_thread = threads.deferToThread(self.readProject, filename)
-            load_thread.addCallback(self.readProjectComplete)
-            load_thread.addErrback(self.readProjectFailed)
-
-    def loadFailed(self, reason):
-        """
-        """
-        print("file load FAILED: ", reason)
-        pass
-
-    def readProjectFailed(self, reason):
-        """
-        """
-        print("readProjectFailed FAILED: ", reason)
-        pass
-
-    def readProject(self, filename):
-        self.communicator.statusBarUpdateSignal.emit("Loading Project... %s" % os.path.basename(filename))
-        try:
-            manager = DataManager()
-            with open(filename, 'r') as infile:
-                manager.load_from_readable(infile)
-
-            self.communicator.statusBarUpdateSignal.emit("Loaded Project: %s" % os.path.basename(filename))
-            return manager
-
-        except:
-            self.communicator.statusBarUpdateSignal.emit("Failed: %s" % os.path.basename(filename))
-            raise
-
-    def readProjectComplete(self, manager):
-        self.model.clear()
-
-        self.manager.assign(manager)
-        self.model.beginResetModel()
-        for id, item in self.manager.get_all_data().items():
-            self.updateModel(item.data, item.path)
-
-        self.model.endResetModel()
+            self.readProject(filename)
 
     def saveProject(self):
@@ -285 +247 @@
         name_tuple = QtWidgets.QFileDialog.getSaveFileName(**kwargs)
         filename = name_tuple[0]
-        if filename:
-            _, extension = os.path.splitext(filename)
-            if not extension:
-                filename = '.'.join((filename, 'json'))
-            self.communicator.statusBarUpdateSignal.emit("Saving Project... %s\n" % os.path.basename(filename))
-            with open(filename, 'w') as outfile:
-                self.manager.save_to_writable(outfile)
+        if not filename:
+            return
+        _, extension = os.path.splitext(filename)
+        if not extension:
+            filename = '.'.join((filename, 'json'))
+        self.communicator.statusBarUpdateSignal.emit("Saving Project... %s\n" % os.path.basename(filename))
+
+        with open(filename, 'w') as outfile:
+            self.saveDataToFile(outfile)
+
+    def allDataForModel(self, model):
+        # data model
+        all_data = {}
+        for i in range(model.rowCount()):
+            properties = {}
+            item = model.item(i)
+            data = GuiUtils.dataFromItem(item)
+            if data is None: continue
+            # Now, all plots under this item
+            filename = data.filename
+            is_checked = item.checkState()
+            properties['checked'] = is_checked
+            other_datas = GuiUtils.plotsFromFilename(filename, model)
+            # skip the main plot
+            other_datas = list(other_datas.values())[1:]
+            all_data[data.id] = [data, properties, other_datas]
+        return all_data
+
+    def saveDataToFile(self, outfile):
+        """
+        Save every dataset to a json file
+        """
+        data = self.allDataForModel(self.model)
+        theory = self.allDataForModel(self.theory_model)
+
+        all_data = {}
+        for key, value in data.items():
+            all_data[key] = value
+        for key, value in theory.items():
+            if key in all_data:
+                raise ValueError("Inconsistent data in Project file.")
+            all_data[key] = value
+
+        # perspectives
+        current_perspective = self._perspective()
+        try:
+            perspective_dump = current_perspective.getCurrentStateAsXml()
+        except Exception:
+            ex = "State of " + current_perspective.windowTitle() + \
+                " cannot be saved."
+            logging.error(ex)
+        if perspective_dump is not None:
+            assert(isinstance(perspective_dump, dict))
+            all_data['perspective'] = perspective_dump
+        # save datas
+        GuiUtils.saveData(outfile, all_data)
+        return
+
+    def readProject(self, filename):
+        """
+        Read out datasets and fitpages from file
+        """
+        with open(filename, 'r') as infile:
+            all_data = GuiUtils.readDataFromFile(infile)
+        # clear the model
+        self.model.clear()
+
+        #self.model.beginResetModel()
+        for key, value in all_data.items():
+            # key - cardinal number of dataset
+            # value - main dataset, [dependant filesets]
+            # add the main index
+            new_data = value[0]
+            assert isinstance(new_data, (Data1D, Data2D))
+            properties = value[1]
+            is_checked = properties['checked']
+            new_item = GuiUtils.createModelItemWithPlot(new_data, new_data.filename)
+            new_item.setCheckState(is_checked)
+            model = self.theory_model
+            if new_data.is_data:
+                model = self.model
+            model.appendRow(new_item)
+            self.manager.add_data(data_list={new_data.id:new_data})
+
+            # Add the underlying data
+            if not value[2]:
+                continue
+            for plot in value[2]:
+                assert isinstance(plot, (Data1D, Data2D))
+                GuiUtils.updateModelItemWithPlot(new_item, plot, plot.name)
 
     def deleteFile(self, event):
@@ -1394 +1439 @@
         checkbox_item.setCheckable(True)
         checkbox_item.setCheckState(QtCore.Qt.Checked)
-        checkbox_item.setText(os.path.basename(p_file))
+        if p_file is not None:
+            checkbox_item.setText(os.path.basename(p_file))
 
         # Add the actual Data1D/Data2D object

src/sas/qtgui/MainWindow/DataManager.py

@@ -29 +29 @@
 from sas.qtgui.Plotting.PlotterData import Data1D
 from sas.qtgui.Plotting.PlotterData import Data2D
-from sas.qtgui.Plotting.Plottables import Plottable
 from sas.qtgui.Plotting.Plottables import PlottableTheory1D
 from sas.qtgui.Plotting.Plottables import PlottableFit1D