Changeset dc57b4f in sasview for src/sas/qtgui/MainWindow

Timestamp:

Oct 25, 2017 5:38:11 AM (7 years ago)

Author:

Adam Washington <adam.washington@…>

Children:

505357a

Parents:

4a9786d8 (diff), f7d14a1 (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' of github.com:SasView/sasview into ESS_Corfunc

File:

• src/sas/qtgui/MainWindow/UnitTesting/DataExplorerTest.py (modified) (2 diffs)

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

@@ -37 +37 @@
             def allowBatch(self):
                 return False
-            def setData(self, data_item=None):
+            def setData(self, data_item=None, is_batch=False):
                 return None
             def title(self):
@@ -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", "cyl_400_20.txt", "cyl_400_20.txt"]
         self.form.readData(filename)
-
-        self.form.show()
-        app.exec_()
 
         # Assure the model contains three items