Add an extra button to split compute and save

Author: Cristian2299

src/sas/qtgui/Calculators/DataOperationUtilityPanel.py

@@ -53,6 +53,8 @@ def __init__(self, parent=None):
         self.cmdSaveData.clicked.connect(self.onSaveData)
 
         self.cmdCompute.setEnabled(False)
+        self.cmdSaveData.setEnabled(False)
+        
 
         # validator for coefficient
         self.txtNumber.setValidator(GuiUtils.DoubleValidator())
@@ -147,16 +149,18 @@ def onCompute(self):
 
     def onSaveData(self):
         """ Save current output in data file and add it to the DataExplorer"""
-        # add outputname to self.filenames
-        self.list_data_items.append(str(self.txtOutputData.text()))
-        # send result to DataExplorer
-        self.onPrepareOutputData()
-        # Add the new plot to the comboboxes
-        self.cbData1.addItem(self.output.name)
-        self.cbData2.addItem(self.output.name)
-        if self.filenames is None:
-            self.filenames = {}
-        self.filenames[self.output.name] = self.output
+        # if outputname was unused, proceed to save files
+        if self.onCheckOutputName():
+            # add outputname to self.filenames
+            self.list_data_items.append(str(self.txtOutputData.text()))
+            # send result to DataExplorer
+            self.onPrepareOutputData()
+            # Add the new plot to the comboboxes
+            self.cbData1.addItem(self.output.name)
+            self.cbData2.addItem(self.output.name)
+            if self.filenames is None:
+                self.filenames = {}
+            self.filenames[self.output.name] = self.output
 
     def onPrepareOutputData(self):
         """ Prepare datasets to be added to DataExplorer and DataManager """
@@ -187,6 +191,7 @@ def onReset(self):
 
         self.txtNumber.setEnabled(False)
         self.cmdCompute.setEnabled(False)
+        self.cmdSaveData.setEnabled(False)
 
         self.cbData1.setCurrentIndex(0)
         self.cbData2.setCurrentIndex(0)
@@ -212,6 +217,7 @@ def onSelectData1(self):
             self.data1 = None
             self.data1OK = False
             self.cmdCompute.setEnabled(False) # self.onCheckChosenData())
+            self.cmdSaveData.setEnabled(False)
             return
 
         else:
@@ -223,8 +229,9 @@ def onSelectData1(self):
             self.updatePlot(self.graphData1, self.layoutData1, self.data1)
             # plot default for output graph
             self.newPlot(self.graphOutput, self.layoutOutput)
-            # Enable Compute button only if Data2 is defined and data compatible
+            # Enable Compute and SaveData buttons only if Data2 is defined and data compatible
             self.cmdCompute.setEnabled(self.onCheckChosenData())
+            self.cmdSaveData.setEnabled(self.onCheckChosenData())
 
     def onSelectData2(self):
         """ Plot for selection of Data2 """
@@ -237,15 +244,17 @@ def onSelectData2(self):
             self.data2OK = False
             self.onCheckChosenData()
             self.cmdCompute.setEnabled(False)
+            self.cmdSaveData.setEnabled(False)
             return
 
         elif choice_data2 == 'Number':
             self.data2OK = True
             self.txtNumber.setEnabled(True)
             self.data2 = float(self.txtNumber.text())
 
-            # Enable Compute button only if Data1 defined and compatible data
+            # Enable Compute and SaveData buttons only if Data1 defined and compatible data
             self.cmdCompute.setEnabled(self.onCheckChosenData())
+            self.cmdSaveData.setEnabled(self.onCheckChosenData())
             # Display value of coefficient in graphData2
             self.updatePlot(self.graphData2, self.layoutData2, self.data2)
             # plot default for output graph
@@ -258,6 +267,7 @@ def onSelectData2(self):
             key_id2 = self._findId(choice_data2)
             self.data2 = self._extractData(key_id2)
             self.cmdCompute.setEnabled(self.onCheckChosenData())
+            self.cmdSaveData.setEnabled(self.onCheckChosenData())
 
             # plot Data2
             self.updatePlot(self.graphData2, self.layoutData2, self.data2)
@@ -434,6 +444,8 @@ def updatePlot(self, graph, layout, data):
 
             plotter.plot(data=data, hide_error=True, marker='.')
 
+            layout.setContentsMargins(0, 0, 0, 0)
+
             plotter.show()
 
         elif float(data) and self.cbData2.currentText() == 'Number':

src/sas/qtgui/Calculators/UI/DataOperationUtilityUI.ui

@@ -91,6 +91,9 @@
        <property name="text">
         <string>Save</string>
        </property>
+       <property name="autoDefault">
+        <bool>false</bool>
+       </property>
       </widget>
      </item>
      <item>

src/sas/qtgui/Plotting/PlotterBase.py

@@ -45,7 +45,7 @@ def __init__(self, parent=None, manager=None, quickplot=False):
         # Set the layout and place the canvas widget in it.
         layout = QtWidgets.QVBoxLayout()
         # FIXME setMargin -> setContentsMargins in qt5 with 4 args
-        layout.setContentsMargins(0, 0, 0, 0)
+        #layout.setContentsMargins(0, 0, 0, 0)
         layout.setSpacing(0)
         layout.addWidget(self.canvas)