Changeset 200bd7e in sasview for src/sas/qtgui/Perspectives

Timestamp:

Dec 1, 2017 2:51:32 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:

50bfab0

Parents:

19fce84 (diff), 6cb305a (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:

Merge branch 'ESS_GUI_SasView795' into ESS_GUI

Location:

src/sas/qtgui/Perspectives

Files:

• Invariant/InvariantPerspective.py (modified) (4 diffs)
• Inversion/InversionPerspective.py (modified) (1 diff)

src/sas/qtgui/Perspectives/Invariant/InvariantPerspective.py

@@ -63 +63 @@
         self._model_item = QtGui.QStandardItem()
 
-        #self._helpView = QtWebKit.QWebView()
+        self._helpView = QtWebKit.QWebView()
         self.detailsDialog = DetailsDialog(self)
         self.detailsDialog.cmdOK.clicked.connect(self.enabling)
@@ -82 +82 @@
         # no reason to have this widget resizable
         self.resize(self.minimumSizeHint())
-        #self.setFixedSize(self.sizeHint())
 
         self.communicate = self._manager.communicator()
@@ -232 +231 @@
         # Send the modified model item to DE for keeping in the model
         # Currently -unused
-        #self.communicate.updateModelFromPerspectiveSignal.emit(self._model_item)
+        # self.communicate.updateModelFromPerspectiveSignal.emit(self._model_item)
 
         plot_data = GuiUtils.plotsFromCheckedItems(self._manager.filesWidget.model)
@@ -365 +364 @@
             if self._high_extrapolate:
                 # for presentation in InvariantDetails
-                qmax_plot = Q_MAXIMUM_PLOT * max(temp_data.x) # self._data.x)
+                qmax_plot = Q_MAXIMUM_PLOT * max(temp_data.x)
 
                 if qmax_plot > Q_MAXIMUM:

src/sas/qtgui/Perspectives/Inversion/InversionPerspective.py

@@ -575 +575 @@
         self.regConstantSuggestionButton.setText("{:.3g}".format(alpha))
         self.regConstantSuggestionButton.setEnabled(True)
-        self.model.setItem(WIDGETS.W_COMP_TIME, QtGui.QStandardItem(str(elapsed)))
+        self.model.setItem(WIDGETS.W_COMP_TIME, QtGui.QStandardItem("{:.2g}".format(elapsed)))
         if message:
             logging.info(message)