Changeset 0ba0774 in sasview for src/sas/qtgui


Ignore:
Timestamp:
Dec 14, 2016 6:49:41 AM (8 years ago)
Author:
wojciech
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:
9290b1a
Parents:
886d2f2c (diff), edbd4b6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merged with ESS_GUI

Location:
src/sas/qtgui
Files:
5 added
3 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/DataExplorer.py

    r8696721 r0ba0774  
    384384        orig_text = self.cbgraph.currentText() 
    385385        self.cbgraph.clear() 
    386         graph_titles = [] 
    387386        graph_titles= ["Graph"+str(graph) for graph in graph_list] 
    388387 
     
    391390        if ind > 0: 
    392391            self.cbgraph.setCurrentIndex(ind) 
    393         pass 
    394392 
    395393    def newPlot(self): 
  • src/sas/qtgui/WindowTitle.py

    r27313b7 redbd4b6  
     1""" 
     2Allows users to change the title of the current graph 
     3from "Graph_n" to any ASCII text. 
     4""" 
    15from PyQt4 import QtGui 
    2  
    3 import sas.sasview 
    46 
    57from sas.qtgui.UI.WindowTitleUI import Ui_WindowTitle 
     
    1315 
    1416    def title(self): 
     17        """ Return the new title """ 
    1518        return self.txtTitle.text() 
    1619 
  • src/sas/qtgui/GuiManager.py

    r363fbfa rabc5e70  
    2626from sas.qtgui.DensityPanel import DensityPanel 
    2727from sas.qtgui.KiessigPanel import KiessigPanel 
     28from sas.qtgui.SlitSizeCalculator import SlitSizeCalculator 
    2829 
    2930# Perspectives 
     
    139140        self.DVCalculator = DensityPanel(self) 
    140141        #self.KIESSIGCalculator = DensityPanel(self)#KiessigPanel(self) 
    141         self.KIESSIGCalculator =  KiessigPanel(self) 
     142        self.KIESSIGCalculator = KiessigPanel(self) 
     143        self.SlitSizeCalculator = SlitSizeCalculator(self) 
    142144    def statusBarSetup(self): 
    143145        """ 
     
    539541        """ 
    540542        """ 
    541         print("actionSlit_Size_Calculator TRIGGERED") 
    542         pass 
     543        self.SlitSizeCalculator.show() 
    543544 
    544545    def actionSAS_Resolution_Estimator(self): 
Note: See TracChangeset for help on using the changeset viewer.