Changes in / [1ba88515:0e80658] in sasview

Location:

src/sas

Files:

• _config.py (modified) (1 diff)
• qtgui/MainWindow/GuiManager.py (modified) (5 diffs)
• qtgui/MainWindow/UI/MainWindowUI.ui (modified) (3 diffs)
• qtgui/MainWindow/UnitTesting/DataExplorerTest.py (modified) (1 diff)
• qtgui/Perspectives/Fitting/FittingPerspective.py (modified) (2 diffs)
• qtgui/Perspectives/Fitting/FittingWidget.py (modified) (6 diffs)
• qtgui/Perspectives/Fitting/GPUOptions.py (deleted)
• qtgui/Perspectives/Fitting/UI/GPUOptionsUI.ui (deleted)
• qtgui/Perspectives/Fitting/UI/GPUTestResultsUI.ui (deleted)
• qtgui/Perspectives/Fitting/UnitTesting/FittingWidgetTest.py (modified) (2 diffs)
• qtgui/Perspectives/Fitting/ViewDelegate.py (modified) (1 diff)
• qtgui/Plotting/Plotter.py (modified) (1 diff)
• qtgui/Plotting/PlotterData.py (modified) (1 diff)
• qtgui/Plotting/UnitTesting/PlotterTest.py (modified) (1 diff)
• sascalc/dataloader/data_info.py (modified) (1 diff)

src/sas/_config.py

@@ -110 +110 @@
         try:
             module = load_module_from_path('sas.custom_config', path)
-            #logger.info("GuiManager loaded %s", path)
+            logger.info("GuiManager loaded %s", path)
             return module
         except Exception as exc:

src/sas/qtgui/MainWindow/GuiManager.py

@@ -184 +184 @@
         Respond to change of the perspective signal
         """
-
-        # Save users from themselves...
-        if isinstance(self._current_perspective, Perspectives.PERSPECTIVES[str(perspective_name)]):
-            self.setupPerspectiveMenubarOptions(self._current_perspective)
-            return
-
         # Close the previous perspective
-        self.clearPerspectiveMenubarOptions(self._current_perspective)
         if self._current_perspective:
             self._current_perspective.setClosable()
@@ -397 +390 @@
         self._workspace.actionCombine_Batch_Fit.triggered.connect(self.actionCombine_Batch_Fit)
         self._workspace.actionFit_Options.triggered.connect(self.actionFit_Options)
-        self._workspace.actionGPU_Options.triggered.connect(self.actionGPU_Options)
         self._workspace.actionFit_Results.triggered.connect(self.actionFit_Results)
         self._workspace.actionChain_Fitting.triggered.connect(self.actionChain_Fitting)
@@ -633 +625 @@
         pass
 
-    def actionGPU_Options(self):
-        """
-        Load the OpenCL selection dialog if the fitting perspective is active
-        """
-        if hasattr(self._current_perspective, "gpu_options_widget"):
-            self._current_perspective.gpu_options_widget.show()
-        pass
-
     def actionFit_Results(self):
         """
@@ -662 +646 @@
     def actionFitting(self):
         """
-        Change to the Fitting perspective
-        """
-        self.perspectiveChanged("Fitting")
+        """
+        print("actionFitting TRIGGERED")
+        pass
 
     def actionInversion(self):
         """
-        Change to the Inversion perspective
-        """
-        # For now we'll just update the analysis menu status but when the inversion is implemented delete from here
-        self.checkAnalysisOption(self._workspace.actionInversion)
+        """
         print("actionInversion TRIGGERED")
-        # to here and uncomment the following line
-        # self.perspectiveChanged("Inversion")
+        pass
 
     def actionInvariant(self):
         """
-        Change to the Invariant perspective
-        """
-        self.perspectiveChanged("Invariant")
+        """
+        print("actionInvariant TRIGGERED")
+        pass
 
     #============ WINDOW =================
@@ -779 +759 @@
         if hasattr(self, "filesWidget"):
             self.filesWidget.displayData(plot)
-
-    def uncheckAllMenuItems(self, menuObject):
-        """
-        Uncheck all options in a given menu
-        """
-        menuObjects = menuObject.actions()
-
-        for menuItem in menuObjects:
-            menuItem.setChecked(False)
-
-    def checkAnalysisOption(self, analysisMenuOption):
-        """
-        Unchecks all the items in the analysis menu and checks the item passed
-        """
-        self.uncheckAllMenuItems(self._workspace.menuAnalysis)
-        analysisMenuOption.setChecked(True)
-
-    def clearPerspectiveMenubarOptions(self, perspective):
-        """
-        When closing a perspective, clears the menu bar
-        """
-        for menuItem in self._workspace.menuAnalysis.actions():
-            menuItem.setChecked(False)
-
-        if isinstance(self._current_perspective, Perspectives.PERSPECTIVES["Fitting"]):
-            self._workspace.menubar.removeAction(self._workspace.menuFitting.menuAction())
-
-    def setupPerspectiveMenubarOptions(self, perspective):
-        """
-        When setting a perspective, sets up the menu bar
-        """
-        if isinstance(perspective, Perspectives.PERSPECTIVES["Fitting"]):
-            self.checkAnalysisOption(self._workspace.actionFitting)
-            # Put the fitting menu back in
-            # This is a bit involved but it is needed to preserve the menu ordering
-            self._workspace.menubar.removeAction(self._workspace.menuWindow.menuAction())
-            self._workspace.menubar.removeAction(self._workspace.menuHelp.menuAction())
-            self._workspace.menubar.addAction(self._workspace.menuFitting.menuAction())
-            self._workspace.menubar.addAction(self._workspace.menuWindow.menuAction())
-            self._workspace.menubar.addAction(self._workspace.menuHelp.menuAction())
-        elif isinstance(perspective, Perspectives.PERSPECTIVES["Invariant"]):
-            self.checkAnalysisOption(self._workspace.actionInvariant)
-        # elif isinstance(perspective, Perspectives.PERSPECTIVES["Inversion"]):
-        #     self.checkAnalysisOption(self._workspace.actionInversion)

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

@@ -25 +25 @@
      <y>0</y>
      <width>915</width>
-     <height>26</height>
+     <height>21</height>
     </rect>
    </property>
@@ -103 +103 @@
     <addaction name="separator"/>
     <addaction name="actionFit_Options"/>
-    <addaction name="actionGPU_Options"/>
     <addaction name="actionFit_Results"/>
     <addaction name="separator"/>
@@ -500 +499 @@
    </property>
   </action>
-  <action name="actionGPU_Options">
-   <property name="text">
-    <string>GPU Options</string>
-   </property>
-   <property name="softKeyRole">
-    <enum>QAction::NoSoftKey</enum>
-   </property>
-  </action>
  </widget>
  <resources/>

src/sas/qtgui/MainWindow/UnitTesting/DataExplorerTest.py

@@ -171 +171 @@
 
         # Populate the model
-        filename = ["cyl_400_20.txt", "cyl_400_20.txt", "cyl_400_20.txt"]
+        #filename = ["cyl_400_20.txt", "P123_D2O_10_percent.dat", "cyl_400_20.txt"]
+        filename = ["cyl_400_20.txt", "cyl_400_20.txt", "P123_D2O_10_percent.dat"]
         self.form.readData(filename)
 

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

@@ -12 +12 @@
 from sas.qtgui.Perspectives.Fitting.FittingWidget import FittingWidget
 from sas.qtgui.Perspectives.Fitting.FittingOptions import FittingOptions
-from sas.qtgui.Perspectives.Fitting.GPUOptions import GPUOptions
 #from sas.qtgui.Perspectives.Fitting import ModelUtilities
 
@@ -64 +63 @@
         self.fit_options_widget.fit_option_changed.connect(self.onFittingOptionsChange)
 
-        # GPU Options
-        self.gpu_options_widget = GPUOptions(self)
+        #self.menu_manager = ModelUtilities.ModelManager()
+        ## TODO: reuse these in FittingWidget properly
+        #self.model_list_box = self.menu_manager.get_model_list()
+        #self.model_dictionary = self.menu_manager.get_model_dictionary()
 
         #self.setWindowTitle('Fit panel - Active Fitting Optimizer: %s' % self.optimizer)

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

@@ -18 +18 @@
 #from PyQt5 import QtWebEngineWidgets
 
-from sasmodels import product
 from sasmodels import generate
 from sasmodels import modelinfo
@@ -152 +151 @@
     def data(self, value):
         """ data setter """
-        # Value is either a list of indices for batch fitting or a simple index
-        # for standard fitting. Assure we have a list, regardless.
         if isinstance(value, list):
             self.is_batch_fitting = True
@@ -167 +164 @@
 
         # Update logics with data items
-        # Logics.data contains only a single Data1D/Data2D object
         self.logic.data = GuiUtils.dataFromItem(value[0])
 
@@ -173 +169 @@
         self.is2D = True if isinstance(self.logic.data, Data2D) else False
 
-        # Let others know we're full of data now
         self.data_is_loaded = True
 
@@ -353 +348 @@
         self.chk2DView.setVisible(False)
         self.chkMagnetism.setEnabled(self.is2D)
-        self.tabFitting.setTabEnabled(TAB_MAGNETISM, self.is2D)
         # Combo box or label for file name"
         if self.is_batch_fitting:
@@ -1288 +1282 @@
         structure_module = generate.load_kernel_module(structure_factor)
         structure_parameters = modelinfo.make_parameter_table(getattr(structure_module, 'parameters', []))
-        structure_kernel = self.models[structure_factor]()
-
-        self.kernel_module._model_info = product.make_product_info(self.kernel_module._model_info, structure_kernel._model_info)
 
         new_rows = FittingUtilities.addSimpleParametersToModel(structure_parameters, self.is2D)

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingWidgetTest.py

@@ -104 +104 @@
         self.assertEqual(delegate.editableParameters(), [1, 2, 3, 4, 5])
         self.assertEqual(delegate.poly_function, 6)
-        self.assertIsInstance(delegate.combo_updated, QtCore.pyqtBoundSignal)
-
-    def testSelectMagnetism(self):
-        """
-        Test if models have been loaded properly
-        """
-        fittingWindow =  self.widget
-
-        self.assertIsInstance(fittingWindow.lstMagnetic.itemDelegate(), QtGui.QStyledItemDelegate)
-        #Test loading from json categories
-        fittingWindow.SASModelToQModel("cylinder")
-        mag_index = fittingWindow.lstMagnetic.model().index(0,0)
-        self.assertEqual(str(mag_index.data().toString()), "up:frac_i")
-        mag_index = fittingWindow.lstMagnetic.model().index(1,0)
-        self.assertEqual(str(mag_index.data().toString()), "up:frac_f")
-        mag_index = fittingWindow.lstMagnetic.model().index(2,0)
-        self.assertEqual(str(mag_index.data().toString()), "up:angle")
-        mag_index = fittingWindow.lstMagnetic.model().index(3,0)
-        self.assertEqual(str(mag_index.data().toString()), "M0:sld")
-        mag_index = fittingWindow.lstMagnetic.model().index(4,0)
-        self.assertEqual(str(mag_index.data().toString()), "mtheta:sld")
-        mag_index = fittingWindow.lstMagnetic.model().index(5,0)
-        self.assertEqual(str(mag_index.data().toString()), "mphi:sld")
-        mag_index = fittingWindow.lstMagnetic.model().index(6,0)
-        self.assertEqual(str(mag_index.data().toString()), "M0:sld_solvent")
-        mag_index = fittingWindow.lstMagnetic.model().index(7,0)
-        self.assertEqual(str(mag_index.data().toString()), "mtheta:sld_solvent")
-        mag_index = fittingWindow.lstMagnetic.model().index(8,0)
-        self.assertEqual(str(mag_index.data().toString()), "mphi:sld_solvent")
-
-        # test the delegate a bit
-        delegate = fittingWindow.lstMagnetic.itemDelegate()
-        self.assertEqual(delegate.editableParameters(), [1, 2, 3])
         self.assertIsInstance(delegate.combo_updated, QtCore.pyqtBoundSignal)
 
@@ -860 +827 @@
         self.assertEqual(self.widget.cbModel.currentText(), 'onion')
         self.assertTrue(self.widget.chkPolydispersity.isChecked())
-        #Check if polidispersity tab is available
-        self.assertTrue(self.widget.tabFitting.isTabEnabled(3))
-
-        #Check if magnetism box and tab are disabled when 1D data is loaded
-        self.assertFalse(self.widget.chkMagnetism.isEnabled())
-        self.assertFalse(self.widget.tabFitting.isTabEnabled(4))
-
-    def testReadFitPage2D(self):
-        """
-        Read in the fitpage object and restore state
-        """
-        # Set data
-
-        test_data = Data2D(image=[1.0, 2.0, 3.0],
-                           err_image=[0.01, 0.02, 0.03],
-                           qx_data=[0.1, 0.2, 0.3],
-                           qy_data=[0.1, 0.2, 0.3],
-                           xmin=0.1, xmax=0.3, ymin=0.1, ymax=0.3,
-                           mask=[True, True, True])
-
-        # Force same data into logic
-        self.widget.logic.data = test_data
-        self.widget.data_is_loaded = True
-
-        #item = QtGui.QStandardItem()
-        #updateModelItem(item, [test_data], "test")
-        # Force same data into logic
-        #self.widget.logic.data = item
-        #self.widget.data_is_loaded = True
-
-        category_index = self.widget.cbCategory.findText("Cylinder")
-        self.widget.cbCategory.setCurrentIndex(category_index)
-
-        # Test no fitting params
-        self.widget.parameters_to_fit = ['scale']
-
-        # Invoke the tested method
-        fp = self.widget.currentState()
-
-        # Prepare modified fit page
-        fp.current_model = 'cylinder'
-        fp.is_polydisperse = True
-        fp.is_magnetic = True
-        fp.is2D = True
-
-        # Read in modified state
-        self.widget.readFitPage(fp)
-
-        # Check if the widget got updated accordingly
-        self.assertEqual(self.widget.cbModel.currentText(), 'cylinder')
-        self.assertTrue(self.widget.chkPolydispersity.isChecked())
-        self.assertTrue(self.widget.chkPolydispersity.isEnabled())
-        #Check if polidispersity tab is available
-        self.assertTrue(self.widget.tabFitting.isTabEnabled(3))
-
-        #Check if magnetism box and tab are disabled when 1D data is loaded
-        self.assertTrue(self.widget.chkMagnetism.isChecked())
-        self.assertTrue(self.widget.chkMagnetism.isEnabled())
-        self.assertTrue(self.widget.tabFitting.isTabEnabled(4))
 
     def testCurrentState(self):

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

@@ -220 +220 @@
 
     def editableParameters(self):
-        return [self.mag_value, self.mag_min, self.mag_max]
+        return [self.mag_min, self.mag_max]
 
     def addErrorColumn(self):

src/sas/qtgui/Plotting/Plotter.py

@@ -51 +51 @@
         self.xLabel = "%s(%s)"%(value._xaxis, value._xunit)
         self.yLabel = "%s(%s)"%(value._yaxis, value._yunit)
-        if value.isSesans:
-            self.xscale = 'linear'
-            self.yscale = 'linear'
         self.title(title=value.name)
 

src/sas/qtgui/Plotting/PlotterData.py

@@ -54 +54 @@
         self.yaxis(data1d._yaxis, data1d._yunit)
         self.title = data1d.title
-        self.isSesans = data1d.isSesans
         
     def __str__(self):

src/sas/qtgui/Plotting/UnitTesting/PlotterTest.py

@@ -77 +77 @@
         self.assertTrue(FigureCanvas.draw_idle.called)
         self.plotter.figure.clf()
-
-    def testPlotWithSesans(self):
-        """ Ensure that Sesans data is plotted in linear cooredinates"""
-        data = Data1D(x=[1.0, 2.0, 3.0],
-                      y=[10.0, 11.0, 12.0],
-                      dx=[0.1, 0.2, 0.3],
-                      dy=[0.1, 0.2, 0.3])
-        data.title = "Sesans data"
-        data.name = "Test Sesans"
-        data.isSesans = True
-        data.id = 2
-
-        self.plotter.data = data
-        self.plotter.show()
-        FigureCanvas.draw = MagicMock()
-
-        self.plotter.plot(hide_error=True)
-
-        self.assertEqual(self.plotter.ax.get_xscale(), 'linear')
-        self.assertEqual(self.plotter.ax.get_yscale(), 'linear')
-        self.assertTrue(FigureCanvas.draw.called)
 
     def testCreateContextMenuQuick(self):

src/sas/sascalc/dataloader/data_info.py

@@ -775 +775 @@
         clone.meta_data = deepcopy(self.meta_data)
         clone.errors = deepcopy(self.errors)
-        clone.isSesans = self.isSesans
 
         return clone