Changeset 6ff2eb3 in sasview


Ignore:
Timestamp:
Jun 22, 2017 8:11:45 AM (4 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:
3 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/Perspectives/Fitting/FitPage.py

    r6964d44 r6ff2eb3  
    4646        # Fit options - tab #2 
    4747        self.fit_options = {} 
    48         # Weight options - tab #2 
    49         #self.weighting_options = {} 
    5048        # Smearing options - tab #3 
     49        # Should this be just part of self.fit_options? 
    5150        self.smearing_options = {} 
     51 
     52        # Polydispersity - tab #4 
     53        #self.poly 
     54 
     55        # Magnetism - tab #5 
     56        #self.magnetism 
     57 
     58        # Algorithm 
     59        self.algorithm = None 
     60        self.algorithm_options = {} 
    5261 
    5362    def save(self): 
  • src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

    r72f4834 r6ff2eb3  
    197197        self.lblFilename.setText("") 
    198198 
     199        # Magnetic angles explained in one picture 
     200        self.magneticAnglesWidget = QtGui.QWidget() 
     201        labl = QtGui.QLabel(self.magneticAnglesWidget) 
     202        pixmap = QtGui.QPixmap(GuiUtils.IMAGES_DIRECTORY_LOCATION + '/M_angles_pic.bmp') 
     203        labl.setPixmap(pixmap) 
     204        self.magneticAnglesWidget.setFixedSize(pixmap.width(), pixmap.height()) 
     205 
    199206    def initializeModels(self): 
    200207        """ 
     
    274281        self.chk2DView.setEnabled(False) 
    275282        self.chk2DView.setVisible(False) 
    276         self.chkMagnetism.setEnabled(True) 
     283        self.chkMagnetism.setEnabled(self.is2D) 
    277284        # Similarly on other tabs 
    278285        self.options_widget.setEnablementOnDataLoad() 
     
    359366        self.cmdPlot.clicked.connect(self.onPlot) 
    360367        self.cmdHelp.clicked.connect(self.onHelp) 
     368        self.cmdMagneticDisplay.clicked.connect(self.onDisplayMagneticAngles) 
    361369 
    362370        # Respond to change in parameters from the UI 
     
    541549        self.helpView.show() 
    542550 
     551    def onDisplayMagneticAngles(self): 
     552        """ 
     553        Display a simple image showing direction of magnetic angles 
     554        """ 
     555        self.magneticAnglesWidget.show() 
     556 
    543557    def onFit(self): 
    544558        """ 
     
    15441558        fp.kernel_module = self.kernel_module 
    15451559 
     1560        # Algorithm options 
     1561        # fp.algorithm = self.parent.fit_options.selected_id 
     1562 
    15461563        # Options tab 
    15471564        fp.fit_options[fp.MIN_RANGE] = self.q_range_min 
  • src/sas/qtgui/Utilities/GuiUtils.py

    rb0c5e8c r6ff2eb3  
    9797## TODO: CHANGE FOR SHIPPED PATH IN RELEASE 
    9898HELP_DIRECTORY_LOCATION = "docs/sphinx-docs/build/html" 
     99IMAGES_DIRECTORY_LOCATION = HELP_DIRECTORY_LOCATION + "/_images" 
    99100 
    100101# GUI always starts from the App folder 
Note: See TracChangeset for help on using the changeset viewer.