Changes in / [e752ab8:ecfe6b6] in sasview

Files:

• build_tools/jenkins_ubuntu_build.sh (modified) (2 diffs)
• src/sas/qtgui/MainWindow/DataExplorer.py (modified) (4 diffs)
• src/sas/qtgui/MainWindow/DataManager.py (modified) (3 diffs)
• src/sas/qtgui/Perspectives/Fitting/FittingPerspective.py (modified) (1 diff)
• src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified) (3 diffs)
• src/sas/qtgui/Plotting/Plotter.py (modified) (1 diff)
• src/sas/qtgui/UI/res/SVwelcome.png (modified) (previous)
• src/sas/qtgui/Utilities/GuiUtils.py (modified) (1 diff)
• src/sas/qtgui/images/SVwelcome.png (modified) (previous)
• src/sas/qtgui/images/SVwelcome_mini.png (modified) (previous)
• src/sas/sasview/images/SVwelcome.png (modified) (previous)
• src/sas/sasview/images/SVwelcome_mini.png (modified) (previous)

build_tools/jenkins_ubuntu_build.sh

@@ -17 +17 @@
 cd sasview
 cd build_tools
-conda env create --force -f conda_qt5_ubuntu.yml
+conda env create --force -f conda_qt5_min_ubuntu.yml
 conda env list
-
 
 # Activate new env
@@ -54 +53 @@
 cd sasview
 cd installers
-pyinstaller sasview_qt5_centos.spec
+pyinstaller sasview_qt5_min_centos.spec
 
 cd $WORKSPACE 

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -80 +80 @@
         self.cmdNew_2.clicked.connect(self.newPlot)
         self.cmdAppend.clicked.connect(self.appendPlot)
+        self.cmdAppend_2.clicked.connect(self.appendPlot)
         self.cmdHelp.clicked.connect(self.displayHelp)
         self.cmdHelp_2.clicked.connect(self.displayHelp)
@@ -414 +415 @@
                 self.model.beginResetModel()
                 theories_copied += 1
-                new_item = self.recursivelyCloneItem(outer_item)
-                # Append a "unique" descriptor to the name
-                time_bit = str(time.time())[7:-1].replace('.', '')
-                new_name = new_item.text() + '_@' + time_bit
-                new_item.setText(new_name)
+                new_item = self.cloneTheory(outer_item)
                 self.model.appendRow(new_item)
                 self.model.endResetModel()
-            #self.model.reset()
 
         freeze_msg = ""
@@ -436 +432 @@
         # Actively switch tabs
         self.setCurrentIndex(1)
+
+    def cloneTheory(self, item_from):
+        """
+        Manually clone theory items into a new HashableItem
+        """
+        new_item = GuiUtils.HashableStandardItem()
+        new_item.setCheckable(True)
+        new_item.setCheckState(QtCore.Qt.Checked)
+        info_item = QtGui.QStandardItem("Info")
+        data_item = QtGui.QStandardItem()
+        data_item.setData(item_from.child(0).data())
+        new_item.setText(item_from.text())
+        new_item.setChild(0, data_item)
+        new_item.setChild(1, info_item)
+        # Append a "unique" descriptor to the name
+        time_bit = str(time.time())[7:-1].replace('.', '')
+        new_name = new_item.text() + '_@' + time_bit
+        new_item.setText(new_name)
+        # Change the underlying data so it is no longer a theory
+        try:
+            new_item.child(0).data().is_data = True
+        except AttributeError:
+            #no data here, pass
+            pass
+        return new_item
 
     def recursivelyCloneItem(self, item):
@@ -626 +647 @@
         Add data set(s) to the existing matplotlib chart
         """
-        # new plot data
-        new_plots = GuiUtils.plotsFromCheckedItems(self.model)
+        # new plot data; check which tab is currently active
+        if self.current_view == self.treeView:
+            new_plots = GuiUtils.plotsFromCheckedItems(self.model)
+        else:
+            new_plots = GuiUtils.plotsFromCheckedItems(self.theory_model)
 
         # old plot data

src/sas/qtgui/MainWindow/DataManager.py

@@ -24 +24 @@
 import json
 import time
-from io import StringIO
+from io import BytesIO
 import numpy as np
 
@@ -368 +368 @@
             # ndarray
             if isinstance(o, np.ndarray):
-                buffer = StringIO()
+                buffer = BytesIO()
                 np.save(buffer, o)
                 buffer.seek(0)
@@ -435 +435 @@
             # ndarray
             if cls == np.ndarray:
-                buffer = StringIO()
+                buffer = BytesIO()
                 buffer.write(data['data'].encode('latin-1'))
                 buffer.seek(0)

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

@@ -115 +115 @@
         Add a new tab for passed data
         """
-        tab     = FittingWidget(parent=self.parent, data=data, tab_id=self.maxIndex+1)
+        tab     = FittingWidget(parent=self.parent, data=data, tab_id=self.maxIndex)
         tab.is_batch_fitting = is_batch
 

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

@@ -2778 +2778 @@
         state_reader = Reader(self.loadPageStateCallback)
         filepath = self.saveAsAnalysisFile()
-        if filepath is None:
+        if filepath is None or filepath == "":
             return
         state_reader.write(filename=filepath, fitstate=state)
@@ -2830 +2830 @@
         state.formfactorcombobox = self.cbModel.currentText()
         if self.cbStructureFactor.isEnabled():
-            state.structureCombobox = self.cbStructureFactor.currentText()
+            state.structurecombobox = self.cbStructureFactor.currentText()
         state.tcChi = self.chi2
 
@@ -2862 +2862 @@
         p = self.model_parameters
         # save checkbutton state and txtcrtl values
-        state.parameters = FittingUtilities.getStandardParam()
-        state.orientation_params_disp = FittingUtilities.getOrientationParam()
+        state.parameters = FittingUtilities.getStandardParam(self._model_model)
+        state.orientation_params_disp = FittingUtilities.getOrientationParam(self.kernel_module)
 
         #self._copy_parameters_state(self.orientation_params_disp, self.state.orientation_params_disp)

src/sas/qtgui/Plotting/Plotter.py

@@ -75 +75 @@
         is_fit = (self.data.id=="fit")
 
-        # make sure we have some function to operate on
-        if self.data.xtransform is None:
-            self.data.xtransform = 'log10(x)'
-        if self.data.ytransform is None:
-            self.data.ytransform = 'log10(y)'
-
-        # Transform data if required.
-        if self.data.xtransform is not None or self.data.ytransform is not None:
-            _, _, xscale, yscale = GuiUtils.xyTransform(self.data, self.data.xtransform, self.data.ytransform)
-            if xscale != 'log':
-                self.xscale = xscale
-            if yscale != 'log':
-                self.yscale = yscale
-
-            # Redefine the Scale properties dialog
-            self.properties = ScaleProperties(self,
-                                    init_scale_x=self.data.xtransform,
-                                    init_scale_y=self.data.ytransform)
+        if not is_fit:
+            # make sure we have some function to operate on
+            if self.data.xtransform is None:
+                self.data.xtransform = 'log10(x)'
+            if self.data.ytransform is None:
+                self.data.ytransform = 'log10(y)'
+
+            # Transform data if required.
+            if self.data.xtransform is not None or self.data.ytransform is not None:
+                _, _, xscale, yscale = GuiUtils.xyTransform(self.data, self.data.xtransform, self.data.ytransform)
+                if xscale != 'log':
+                    self.xscale = xscale
+                if yscale != 'log':
+                    self.yscale = yscale
+
+                # Redefine the Scale properties dialog
+                self.properties = ScaleProperties(self,
+                                        init_scale_x=self.data.xtransform,
+                                        init_scale_y=self.data.ytransform)
 
         # Shortcuts

src/sas/qtgui/Utilities/GuiUtils.py

@@ -427 +427 @@
     for index in range(model_item.rowCount()):
         item = model_item.item(index)
-        if str(item.text()) == filename:
+        if filename in str(item.text()):
             # TODO: assure item type is correct (either data1/2D or Plotter)
             plot_data[item] = item.child(0).data()