Merge branch 'main' into 2588-fixing-BoxInteractor-method-signature-m…

…ismatch
SasView · Sep 11, 2023 · 3e67f28 · 3e67f28
2 parents 975a1b6 + 55b1e9f
commit 3e67f28
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
@@ -56,7 +56,7 @@ jobs:
 
       - name: Staple Release Build (OSX)
         if: ${{ startsWith(matrix.os, 'macos') }}
-        uses: devbotsxyz/xcode-staple@v1
+        uses: BoundfoxStudios/action-xcode-staple@v1
         with:
           product-path: "installers/dist/SasView-nightly-MacOSX.dmg"
 

diff --git a/src/sas/qtgui/Calculators/DensityPanel.py b/src/sas/qtgui/Calculators/DensityPanel.py
@@ -57,8 +57,7 @@ def setupUi(self):
         self.ui = Ui_DensityPanel()
         self.ui.setupUi(self)
 
-        #self.setFixedSize(self.minimumSizeHint())
-        self.resize(self.minimumSizeHint())
+        self.setFixedSize(self.minimumSizeHint())
 
         # set validators
         #self.ui.editMolecularFormula.setValidator(FormulaValidator(self.ui.editMolecularFormula))

diff --git a/src/sas/qtgui/Calculators/GenericScatteringCalculator.py b/src/sas/qtgui/Calculators/GenericScatteringCalculator.py
@@ -54,6 +54,7 @@ def __init__(self, parent=None):
         self.setupUi(self)
         # disable the context help icon
         self.setWindowFlags(self.windowFlags() & ~QtCore.Qt.WindowContextHelpButtonHint)
+        self.setFixedSize(self.minimumSizeHint())
 
         self.manager = parent
         self.communicator = self.manager.communicator()

diff --git a/src/sas/qtgui/Calculators/ResolutionCalculatorPanel.py b/src/sas/qtgui/Calculators/ResolutionCalculatorPanel.py
@@ -42,6 +42,7 @@ def __init__(self, parent=None):
         self.setupUi(self)
         # disable the context help icon
         self.setWindowFlags(self.windowFlags() & ~QtCore.Qt.WindowContextHelpButtonHint)
+        self.setFixedSize(self.minimumSizeHint())
 
         self.manager = parent
 

diff --git a/src/sas/qtgui/Calculators/SldPanel.py b/src/sas/qtgui/Calculators/SldPanel.py
@@ -97,6 +97,7 @@ def __init__(self, parent=None):
         self.setupUi()
         # disable the context help icon
         self.setWindowFlags(self.windowFlags() & ~QtCore.Qt.WindowContextHelpButtonHint)
+        self.setFixedSize(self.minimumSizeHint())
 
         self.setupModel()
         self.setupMapper()

diff --git a/src/sas/qtgui/MainWindow/DataExplorer.py b/src/sas/qtgui/MainWindow/DataExplorer.py
@@ -232,7 +232,7 @@ def loadFolder(self, event=None):
         caption = 'Choose a directory'
         options = QtWidgets.QFileDialog.ShowDirsOnly | QtWidgets.QFileDialog.DontUseNativeDialog
         directory = self.default_load_location
-        folder = QtWidgets.QFileDialog.getExistingDirectory(parent, caption, directory, "", options)
+        folder = QtWidgets.QFileDialog.getExistingDirectory(parent, caption, directory, options)
 
         if folder is None:
             return
@@ -1251,7 +1251,7 @@ def appendPlot(self):
     @staticmethod
     def appendOrUpdatePlot(self, data, plot):
         name = data.name
-        if isinstance(plot, Plotter2D) or name in plot.plot_dict.keys():
+        if isinstance(plot, Plotter2DWidget) or name in plot.plot_dict.keys():
             plot.replacePlot(name, data)
         else:
             plot.plot(data)

diff --git a/src/sas/qtgui/Plotting/SlicerParameters.py b/src/sas/qtgui/Plotting/SlicerParameters.py
@@ -220,7 +220,7 @@ def onChooseFilesLocation(self):
         caption = 'Save files to:'
         options = QtWidgets.QFileDialog.ShowDirsOnly | QtWidgets.QFileDialog.DontUseNativeDialog
         directory = self.save_location
-        folder = QtWidgets.QFileDialog.getExistingDirectory(parent, caption, directory, "", options)
+        folder = QtWidgets.QFileDialog.getExistingDirectory(parent, caption, directory, options)
 
         if folder is None:
             return