Changeset 6ff2eb3 in sasview

Timestamp:

Jun 22, 2017 6:11:45 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

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:

2a8bd705

Parents:

b67bfa7

Message:

Magnetic angles image widget

Location:

src/sas/qtgui

Files:

• Perspectives/Fitting/FitPage.py (modified) (1 diff)
• Perspectives/Fitting/FittingWidget.py (modified) (5 diffs)
• Utilities/GuiUtils.py (modified) (1 diff)

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

@@ -46 +46 @@
         # Fit options - tab #2
         self.fit_options = {}
-        # Weight options - tab #2
-        #self.weighting_options = {}
         # Smearing options - tab #3
+        # Should this be just part of self.fit_options?
         self.smearing_options = {}
+
+        # Polydispersity - tab #4
+        #self.poly
+
+        # Magnetism - tab #5
+        #self.magnetism
+
+        # Algorithm
+        self.algorithm = None
+        self.algorithm_options = {}
 
     def save(self):

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

@@ -197 +197 @@
         self.lblFilename.setText("")
 
+        # Magnetic angles explained in one picture
+        self.magneticAnglesWidget = QtGui.QWidget()
+        labl = QtGui.QLabel(self.magneticAnglesWidget)
+        pixmap = QtGui.QPixmap(GuiUtils.IMAGES_DIRECTORY_LOCATION + '/M_angles_pic.bmp')
+        labl.setPixmap(pixmap)
+        self.magneticAnglesWidget.setFixedSize(pixmap.width(), pixmap.height())
+
     def initializeModels(self):
         """
@@ -274 +281 @@
         self.chk2DView.setEnabled(False)
         self.chk2DView.setVisible(False)
-        self.chkMagnetism.setEnabled(True)
+        self.chkMagnetism.setEnabled(self.is2D)
         # Similarly on other tabs
         self.options_widget.setEnablementOnDataLoad()
@@ -359 +366 @@
         self.cmdPlot.clicked.connect(self.onPlot)
         self.cmdHelp.clicked.connect(self.onHelp)
+        self.cmdMagneticDisplay.clicked.connect(self.onDisplayMagneticAngles)
 
         # Respond to change in parameters from the UI
@@ -541 +549 @@
         self.helpView.show()
 
+    def onDisplayMagneticAngles(self):
+        """
+        Display a simple image showing direction of magnetic angles
+        """
+        self.magneticAnglesWidget.show()
+
     def onFit(self):
         """
@@ -1544 +1558 @@
         fp.kernel_module = self.kernel_module
 
+        # Algorithm options
+        # fp.algorithm = self.parent.fit_options.selected_id
+
         # Options tab
         fp.fit_options[fp.MIN_RANGE] = self.q_range_min

src/sas/qtgui/Utilities/GuiUtils.py

@@ -97 +97 @@
 ## TODO: CHANGE FOR SHIPPED PATH IN RELEASE
 HELP_DIRECTORY_LOCATION = "docs/sphinx-docs/build/html"
+IMAGES_DIRECTORY_LOCATION = HELP_DIRECTORY_LOCATION + "/_images"
 
 # GUI always starts from the App folder