Changes in src/sas/qtgui/MainWindow/DataExplorer.py [a3c59503:6bc0840] in sasview

File:

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

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -233 +233 @@
         filename = QtWidgets.QFileDialog.getOpenFileName(**kwargs)[0]
         if filename:
-            self.readProject(filename)
-
-    def loadAnalysis(self):
-        """
-        Called when the "Open Analysis" menu item chosen.
-        """
-        kwargs = {
-            'parent'    : self,
-            'caption'   : 'Open Analysis',
-            'filter'    : 'Project (*.fitv);;All files (*.*)',
-            'options'   : QtWidgets.QFileDialog.DontUseNativeDialog
-        }
-        filename = QtWidgets.QFileDialog.getOpenFileName(**kwargs)[0]
-        if filename:
-            self.readAnalysis(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()
 
     def saveProject(self):
@@ -261 +285 @@
         name_tuple = QtWidgets.QFileDialog.getSaveFileName(**kwargs)
         filename = name_tuple[0]
-        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))
-
-        return filename
-
-    def saveAsAnalysisFile(self, tab_id=1):
-        """
-        Show the save as... dialog and return the chosen filepath
-        """
-        default_name = "FitPage"+str(tab_id)+".fitv"
-
-        wildcard = "fitv files (*.fitv)"
-        kwargs = {
-            'caption'   : 'Save As',
-            'directory' : default_name,
-            'filter'    : wildcard,
-            'parent'    : None,
-        }
-        # Query user for filename.
-        filename_tuple = QtWidgets.QFileDialog.getSaveFileName(**kwargs)
-        filename = filename_tuple[0]
-        return filename
-
-    def saveAnalysis(self, data, tab_id=1):
-        """
-        Called when the "Save Analysis" menu item chosen.
-        """
-        filename = self.saveAsAnalysisFile(tab_id)
-        if not filename:
-            return
-        _, extension = os.path.splitext(filename)
-        if not extension:
-            filename = '.'.join((filename, 'fitv'))
-        self.communicator.statusBarUpdateSignal.emit("Saving analysis... %s\n" % os.path.basename(filename))
-
-        with open(filename, 'w') as outfile:
-            GuiUtils.saveData(outfile, data)
-
-        self.communicator.statusBarUpdateSignal.emit('Analysis saved.')
-
-    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 = []
-            # no need to save other_datas - things will be refit on read
-            #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 getDataForID(self, id):
-        # return the dataset with the given ID
-        all_data = []
-        for model in (self.model, self.theory_model):
-            for i in range(model.rowCount()):
-                properties = {}
-                item = model.item(i)
-                data = GuiUtils.dataFromItem(item)
-                if data is None: continue
-                if data.id != id: continue
-                # We found the dataset - save it.
-                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, properties, other_datas]
-                break
-        return all_data
-
-    def getAllData(self):
-        """
-        converts all datasets into serializable dictionary
-        """
-        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
-        return all_data
-
-    def saveDataToFile(self, outfile):
-        """
-        Save every dataset to a json file
-        """
-        all_data = self.getAllData()
-        # save datas
-        GuiUtils.saveData(outfile, all_data)
-
-    def readProject(self, filename):
-        """
-        Read out datasets and fitpages from file
-        """
-        with open(filename, 'r') as infile:
-            all_data = GuiUtils.readDataFromFile(infile)
-
-        for key, value in all_data.items():
-            data_dict = {key:value['fit_data']}
-            items = self.updateModelFromData(data_dict)
-            # send newly created item to its perspective
-            if 'fit_params' in value:
-                self.sendItemToPerspective(items[0])
-                # Make the perspective read the rest of the read data
-                self._perspective().updateFromParameters(value['fit_params'])
-
-        pass # debugger
-
-    def readAnalysis(self, filename):
-        """
-        Read out a single dataset and fitpage from file
-        """
-        with open(filename, 'r') as infile:
-            all_data = GuiUtils.readDataFromFile(infile)
-            # simulate full project structure
-            all_data_dict = {1:all_data['fit_data']}
-            items = self.updateModelFromData(all_data_dict)
-            # TODO: allow other perspectives
-            # send newly created item to its perspective
-            if len(items) > 0:
-                self.sendItemToPerspective(items[0])
-            # Make the perspective read the rest of the read data
-            self._perspective().updateFromParameters(all_data['fit_params'])
-
-            pass
-
-    def updateModelFromData(self, data):
-        """
-        Given data from analysis/project file,
-        create indices and populate data/theory models
-        """
-        # model items for top level datasets
-        items = []
-        #self.model.beginResetModel()
-        for key, value in data.items():
-            # key - cardinal number of dataset
-            # value - main dataset, [dependant filesets]
-            # add the main index
-            if not value: continue
-            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)
-            items.append(new_item)
-            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)
-        return items
+        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)
 
     def deleteFile(self, event):
@@ -557 +410 @@
             retval = msgbox.exec_()
 
-    def sendItemToPerspective(self, item):
-        """
-        Send the passed item data to the current perspective and set the relevant notifiers
-        """
-        # Set the signal handlers
-        self.communicator.updateModelFromPerspectiveSignal.connect(self.updateModelFromPerspective)
-        selected_items = [item]
-        # Notify the GuiManager about the send request
-        try:
-            self._perspective().setData(data_item=selected_items, is_batch=False)
-        except Exception as ex:
-            msg = "%s perspective returned the following message: \n%s\n" %(self._perspective().name, str(ex))
-            logging.error(msg)
-            msg = str(ex)
-            msgbox = QtWidgets.QMessageBox()
-            msgbox.setIcon(QtWidgets.QMessageBox.Critical)
-            msgbox.setText(msg)
-            msgbox.setStandardButtons(QtWidgets.QMessageBox.Ok)
-            retval = msgbox.exec_()
 
     def freezeCheckedData(self):
@@ -1470 +1304 @@
         self.manager.update_stored_data(deleted_names)
 
+    def closeAllPlots(self):
+        """
+        Close all currently displayed plots
+        """
+
+        for plot_id in PlotHelper.currentPlots():
+            try:
+                plotter = PlotHelper.plotById(plot_id)
+                plotter.close()
+                self.plot_widgets[plot_id].close()
+                self.plot_widgets.pop(plot_id, None)
+            except AttributeError as ex:
+                logging.error("Closing of %s failed:\n %s" % (plot_id, str(ex)))
+
     def closePlotsForItem(self, item):
         """
@@ -1560 +1408 @@
         checkbox_item.setCheckable(True)
         checkbox_item.setCheckState(QtCore.Qt.Checked)
-        if p_file is not None:
-            checkbox_item.setText(os.path.basename(p_file))
+        checkbox_item.setText(os.path.basename(p_file))
 
         # Add the actual Data1D/Data2D object