Changeset 0ba0774 in sasview

Timestamp:

Dec 14, 2016 4:49:41 AM (7 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:

• DataExplorer.py (modified) (2 diffs)
• WindowTitle.py (modified) (2 diffs)
• GuiManager.py (modified) (3 diffs)
• SlitSizeCalculator.py (added)
• UI/SlitSizeCalculator.ui (added)
• UnitTesting/SlitSizeCalculatorTest.py (added)
• beam_profile.DAT (added)
• empty_file.txt (added)

src/sas/qtgui/DataExplorer.py

@@ -384 +384 @@
         orig_text = self.cbgraph.currentText()
         self.cbgraph.clear()
-        graph_titles = []
         graph_titles= ["Graph"+str(graph) for graph in graph_list]
 
@@ -391 +390 @@
         if ind > 0:
             self.cbgraph.setCurrentIndex(ind)
-        pass
 
     def newPlot(self):

src/sas/qtgui/WindowTitle.py

@@ +1 @@
+"""
+Allows users to change the title of the current graph
+from "Graph_n" to any ASCII text.
+"""
 from PyQt4 import QtGui
-
-import sas.sasview
 
 from sas.qtgui.UI.WindowTitleUI import Ui_WindowTitle
@@ -13 +15 @@
 
     def title(self):
+        """ Return the new title """
         return self.txtTitle.text()
 

src/sas/qtgui/GuiManager.py

@@ -26 +26 @@
 from sas.qtgui.DensityPanel import DensityPanel
 from sas.qtgui.KiessigPanel import KiessigPanel
+from sas.qtgui.SlitSizeCalculator import SlitSizeCalculator
 
 # Perspectives
@@ -139 +140 @@
         self.DVCalculator = DensityPanel(self)
         #self.KIESSIGCalculator = DensityPanel(self)#KiessigPanel(self)
-        self.KIESSIGCalculator =  KiessigPanel(self)
+        self.KIESSIGCalculator = KiessigPanel(self)
+        self.SlitSizeCalculator = SlitSizeCalculator(self)
     def statusBarSetup(self):
         """
@@ -539 +541 @@
         """
         """
-        print("actionSlit_Size_Calculator TRIGGERED")
-        pass
+        self.SlitSizeCalculator.show()
 
     def actionSAS_Resolution_Estimator(self):