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

Timestamp:

Nov 9, 2017 8:43:56 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:

53c771e

Parents:

fbfc488

git-author:

Piotr Rozyczko <rozyczko@…> (11/07/17 08:29:59)

git-committer:

Piotr Rozyczko <rozyczko@…> (11/09/17 08:43:56)

Message:

More Qt5 related fixes

Location:

src/sas/qtgui/MainWindow

Files:

• DataExplorer.py (modified) (2 diffs)
• GuiManager.py (modified) (2 diffs)
• MainWindow.py (modified) (1 diff)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -270 +270 @@
             'options'   : QtWidgets.QFileDialog.DontUseNativeDialog
         }
-        filename = str(QtWidgets.QFileDialog.getSaveFileName(**kwargs))
+        name_tuple = QtWidgets.QFileDialog.getSaveFileName(**kwargs)
+        filename = name_tuple[0]
         if filename:
+            _, extension = os.path.splitext(filename)
+            if not extension:
+                filename = '.'.join((filename, 'json'))
             self.communicator.statusBarUpdateSignal.emit("Saving Project... %s\n" % os.path.basename(filename))
             with open(filename, 'w') as outfile:
@@ -1084 +1088 @@
         # TODO: fix this to resemble GuiUtils.updateModelItemWithPlot
         #
-        self.model.beginResetModel()
-        current_tab_name = model_item.text()[:2]
-        for current_index in range(self.theory_model.rowCount()):
-            if current_tab_name in self.theory_model.item(current_index).text():
-                self.theory_model.removeRow(current_index)
-                break
-
-        # Reset the view
-        self.model.endResetModel()
+        ##self.model.beginResetModel()
+        ##current_tab_name = model_item.text()[:2]
+        ##for current_index in range(self.theory_model.rowCount()):
+            #if current_tab_name in self.theory_model.item(current_index).text():
+            #    return
+        ##        self.theory_model.removeRow(current_index)
+        ##        break
+
+        ### Reset the view
+        ##self.model.endResetModel()
 
         # Reset the view

src/sas/qtgui/MainWindow/GuiManager.py

@@ -8 +8 @@
 from PyQt5.QtWidgets import *
 from PyQt5.QtGui import *
-from PyQt5.QtCore import Qt, QLocale
+from PyQt5.QtCore import Qt, QLocale, QUrl
 from PyQt5.QtWebKitWidgets import QWebView
 
@@ -55 +55 @@
         self._workspace = parent
         self._parent = parent
+
+        # Decide on a locale
+        QLocale.setDefault(QLocale('en_US'))
 
         # Add signal callbacks

src/sas/qtgui/MainWindow/MainWindow.py

@@ -61 +61 @@
     # (unless you know what you're doing)
     import qt5reactor
-    # Using the Qt4 reactor wrapper from https://github.com/ghtdak/qtreactor
+    # Using the Qt5 reactor wrapper from https://github.com/ghtdak/qtreactor
     qt5reactor.install()