Changeset d3475fe in sasview for src

Timestamp:

Oct 25, 2017 1:34:29 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:

f7d14a1

Parents:

7ace296

Message:

Additional guard against unwanted GUI options on data load.

Location:

src/sas/qtgui

Files:

• MainWindow/UnitTesting/DataExplorerTest.py (modified) (1 diff)
• Perspectives/Fitting/FittingWidget.py (modified) (1 diff)

src/sas/qtgui/MainWindow/UnitTesting/DataExplorerTest.py

@@ -170 +170 @@
 
         # Populate the model
-        #filename = ["cyl_400_20.txt", "P123_D2O_10_percent.dat", "cyl_400_20.txt"]
-        filename = ["cyl_400_20.txt", "cyl_400_20.txt", "P123_D2O_10_percent.dat"]
+        filename = ["cyl_400_20.txt", "P123_D2O_10_percent.dat", "cyl_400_20.txt"]
         self.form.readData(filename)
-
-        self.form.show()
-        app.exec_()
 
         # Assure the model contains three items

src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

@@ -356 +356 @@
         self.options_widget.setEnablementOnDataLoad()
 
+        # Reload the model
+        self.onSelectModel()
+
         # Smearing tab
         self.smearing_widget.updateSmearing(self.data)