Changeset 30bed93 in sasview for src/sas/qtgui/MainWindow

Timestamp:

Sep 21, 2018 5:41:31 AM (6 years ago)

Author:

GitHub <noreply@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

c928e81

Parents:

33d5956 (diff), d8d81ea (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.

git-author:

Ingo Breßler <dev@…> (09/21/18 05:41:31)

git-committer:

GitHub <noreply@…> (09/21/18 05:41:31)

Message:

Merge pull request #181 from SasView?/ESS_GUI_poly_plot2

plot polydispersity (SASVIEW-1035 and trac ticket 17)

Location:

src/sas/qtgui/MainWindow

Files:

• DataExplorer.py (modified) (1 diff)
• GuiManager.py (modified) (7 diffs)
• UI/MainWindowUI.ui (modified) (2 diffs)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -579 +579 @@
             # Don't plot intermediate results, e.g. P(Q), S(Q)
             match = GuiUtils.theory_plot_ID_pattern.match(plot.id)
-            # 2nd match group contains the identifier for the intermediate result, if present (e.g. "[P(Q)]")
+            # 2nd match group contains the identifier for the intermediate
+            # result, if present (e.g. "[P(Q)]")
             if match and match.groups()[1] != None:
                 continue
-            # Don't include plots from different fitpages, but always include the original data
-            if fitpage_name in plot.name or filename in plot.name or filename == plot.filename:
+            # Don't include plots from different fitpages,
+            # but always include the original data
+            if (fitpage_name in plot.name
+                    or filename in plot.name
+                    or filename == plot.filename):
                 # Residuals get their own plot
                 if plot.plot_role == Data1D.ROLE_RESIDUAL:

src/sas/qtgui/MainWindow/GuiManager.py

@@ -12 +12 @@
 from twisted.internet import reactor
 # General SAS imports
+from sas import get_local_config, get_custom_config
 from sas.qtgui.Utilities.ConnectionProxy import ConnectionProxy
 from sas.qtgui.Utilities.SasviewLogger import setup_qt_logging
@@ -136 +137 @@
         self.aboutWidget = AboutBox()
         self.categoryManagerWidget = CategoryManager(self._parent, manager=self)
-        self.welcomePanel = WelcomePanel()
         self.grid_window = None
         self._workspace.toolBar.setVisible(LocalConfig.TOOLBAR_SHOW)
@@ -241 +241 @@
         perspective_width = perspective_size.width()
         self._current_perspective.resize(perspective_width, workspace_height-10)
-        # Resize the mdi area to match the widget within
-        subwindow.resize(subwindow.minimumSizeHint())
 
         self._current_perspective.show()
@@ -388 +386 @@
             self.communicate.statusBarUpdateSignal.emit(msg)
 
-    def showWelcomeMessage(self):
+    def actionWelcome(self):
         """ Show the Welcome panel """
+        self.welcomePanel = WelcomePanel()
         self._workspace.workspace.addSubWindow(self.welcomePanel)
         self.welcomePanel.show()
+
+    def showWelcomeMessage(self):
+        """ Show the Welcome panel, when required """
+        # Assure the welcome screen is requested
+        show_welcome_widget = True
+        custom_config = get_custom_config()
+        if hasattr(custom_config, "WELCOME_PANEL_SHOW"):
+            if isinstance(custom_config.WELCOME_PANEL_SHOW, bool):
+                show_welcome_widget = custom_config.WELCOME_PANEL_SHOW
+            else:
+                logging.warning("WELCOME_PANEL_SHOW has invalid value in custom_config.py")
+        if show_welcome_widget:
+            self.actionWelcome()
 
     def addCallbacks(self):
@@ -478 +490 @@
         self._workspace.actionAcknowledge.triggered.connect(self.actionAcknowledge)
         self._workspace.actionAbout.triggered.connect(self.actionAbout)
+        self._workspace.actionWelcomeWidget.triggered.connect(self.actionWelcome)
         self._workspace.actionCheck_for_update.triggered.connect(self.actionCheck_for_update)
 
@@ -979 +992 @@
         When setting a perspective, sets up the menu bar
         """
+        self._workspace.actionReport.setEnabled(False)
         if isinstance(perspective, Perspectives.PERSPECTIVES["Fitting"]):
             self.checkAnalysisOption(self._workspace.actionFitting)
@@ -988 +1002 @@
             self._workspace.menubar.addAction(self._workspace.menuWindow.menuAction())
             self._workspace.menubar.addAction(self._workspace.menuHelp.menuAction())
+            self._workspace.actionReport.setEnabled(True)
 
         elif isinstance(perspective, Perspectives.PERSPECTIVES["Invariant"]):

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

@@ -148 +148 @@
     <addaction name="separator"/>
     <addaction name="actionAbout"/>
+    <addaction name="actionWelcomeWidget"/>
+    <addaction name="separator"/>
     <addaction name="actionCheck_for_update"/>
    </widget>
@@ -558 +560 @@
    </property>
   </action>
+  <action name="actionWelcomeWidget">
+   <property name="text">
+    <string>Welcome to SasView</string>
+   </property>
+  </action>
  </widget>
  <resources/>