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

Timestamp:

Oct 24, 2017 2:44:26 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:

fca1f50, d6b234b

Parents:

16afe01 (diff), 5582b078 (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 'master' into ESS_GUI

Location:

src/sas/qtgui/MainWindow

Files:

• DataManager.py (modified) (2 diffs)
• UnitTesting/DataExplorerTest.py (modified) (11 diffs)
• AboutBox.py (added)
• DataExplorer.py (added)
• DataState.py (added)
• DroppableDataLoadWidget.py (added)
• GuiManager.py (added)
• MainWindow.py (added)
• UI/AboutUI.ui (added)
• UI/AcknowledgementsUI.ui (added)
• UI/DataExplorerUI.ui (added)
• UI/MainWindowUI.ui (added)
• UI/TabbedFileLoadUI.ui (added)
• UI/WelcomePanelUI.ui (added)
• UI/__init__.py (added)
• UnitTesting/AboutBoxTest.py (added)
• UnitTesting/DroppableDataLoadWidgetTest.py (added)
• UnitTesting/GuiManagerTest.py (added)
• UnitTesting/MainWindowTest.py (added)
• UnitTesting/WelcomePanelTest.py (added)
• UnitTesting/__init__.py (added)
• WelcomePanel.py (added)
• __init__.py (added)

src/sas/qtgui/MainWindow/DataManager.py

@@ -86 +86 @@
         #creating a name for data
         title = ""
-        file_name = os.path.basename(path) if path is not None else data.filename
+        file_name = os.path.basename(path) if path is not None else os.path.basename(data.filename)
         if file_name:
             name = file_name
@@ -100 +100 @@
             title = file_name
 
-        if new_plot.filename.strip() == "":
+        stripped_filename = new_plot.filename.strip()
+        if not stripped_filename:
+            new_plot.filename = file_name
+        if stripped_filename != os.path.basename(stripped_filename):
             new_plot.filename = file_name
 

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

@@ -25 +25 @@
 import sas.qtgui.Plotting.PlotHelper as PlotHelper
 
-if not QApplication.instance():
-    app = QApplication(sys.argv)
+#if not QApplication.instance():
+app = QApplication(sys.argv)
 
 class DataExplorerTest(unittest.TestCase):
@@ -150 +150 @@
 
         # Populate the model
-        filename = ["cyl_400_20.txt", "Dec07031.ASC", "cyl_400_20.txt"]
+        filename = ["cyl_400_20.txt", "P123_D2O_10_percent.dat", "cyl_400_20.txt"]
         self.form.readData(filename)
 
@@ -170 +170 @@
 
         # Populate the model
-        filename = ["cyl_400_20.txt", "Dec07031.ASC", "cyl_400_20.txt"]
+        #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"]
         self.form.readData(filename)
+
+        self.form.show()
+        app.exec_()
 
         # Assure the model contains three items
@@ -319 +323 @@
         """
         # Populate the model with 1d and 2d data
-        filename = ["cyl_400_20.txt", "Dec07031.ASC"]
+        filename = ["cyl_400_20.txt", "P123_D2O_10_percent.dat"]
         self.form.readData(filename)
 
@@ -469 +473 @@
 
         defaults = 'All (*.*);;canSAS files (*.xml);;SESANS files' +\
-            ' (*.ses);;ASCII files (*.txt);;IGOR 2D files (*.asc);;' +\
+            ' (*.ses);;ASCII files (*.txt);;' +\
             'IGOR/DAT 2D Q_map files (*.dat);;IGOR 1D files (*.abs);;'+\
-            'HFIR 1D files (*.d1d);;DANSE files (*.sans);;NXS files (*.nxs)'
+            'DANSE files (*.sans)'
         default_list = defaults.split(';;')
 
@@ -525 +529 @@
         p_file="cyl_400_20.txt"
         output_object = loader.load(p_file)
-        new_data = [manager.create_gui_data(output_object, p_file)]
+        new_data = [manager.create_gui_data(output_object[0], p_file)]
 
         # Mask retrieval of the data
@@ -556 +560 @@
 
         # get Data2D
-        p_file="Dec07031.ASC"
+        p_file="P123_D2O_10_percent.dat"
         output_object = loader.load(p_file)
-        new_data = [manager.create_gui_data(output_object, p_file)]
+        new_data = [manager.create_gui_data(output_object[0], p_file)]
 
         # Mask retrieval of the data
@@ -594 +598 @@
         output_object = loader.load(p_file)
         output_item = QtGui.QStandardItem()
-        new_data = [(output_item, manager.create_gui_data(output_object, p_file))]
+        new_data = [(output_item, manager.create_gui_data(output_object[0], p_file))]
 
         # Mask plotting
@@ -737 +741 @@
 
         # get Data2D
-        p_file=["Dec07031.ASC"]
+        p_file=["P123_D2O_10_percent.dat"]
         # Read in the file
         output, message = self.form.readData(p_file)
@@ -754 +758 @@
         QFileDialog.getSaveFileName.assert_called_with(
                                 caption="Save As",
-                                directory='Dec07031_out.dat',
+                                directory='P123_D2O_10_percent_out.dat',
                                 filter='IGOR/DAT 2D file in Q_map (*.dat)',
                                 parent=None)
@@ -782 +786 @@
         """
         # get Data1D
-        p_file=["Dec07031.ASC"]
+        p_file=["P123_D2O_10_percent.dat"]
         # Read in the file
         output, message = self.form.readData(p_file)