Changeset 3b3b40b in sasview for src/sas/qtgui/Utilities

Timestamp:

Mar 21, 2018 4:17:04 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:

8b480d27

Parents:

e4c475b7

git-author:

Piotr Rozyczko <rozyczko@…> (02/08/18 04:19:04)

git-committer:

Piotr Rozyczko <rozyczko@…> (03/21/18 04:17:04)

Message:

Merging feature branches

Location:

src/sas/qtgui/Utilities

Files:

• GridPanel.py (added)
• GuiUtils.py (modified) (3 diffs)
• LocalConfig.py (modified) (1 diff)
• ModelEditor.py (added)
• PluginDefinition.py (added)
• PluginManager.py (added)
• PythonSyntax.py (added)
• TabbedModelEditor.py (added)
• UI/GridPanelUI.ui (added)
• UI/ModelEditor.ui (added)
• UI/PluginDefinitionUI.ui (added)
• UI/PluginManagerUI.ui (added)
• UI/TabbedModelEditor.ui (added)
• UnitTesting/GridPanelTest.py (added)
• UnitTesting/ModelEditorTest.py (added)
• UnitTesting/PluginDefinitionTest.py (added)
• UnitTesting/TabbedModelEditorTest.py (added)

src/sas/qtgui/Utilities/GuiUtils.py

@@ -213 +213 @@
     plotRequestedSignal = QtCore.pyqtSignal(list)
 
+    # Plot from file names
+    plotFromFilenameSignal = QtCore.pyqtSignal(str)
+
     # Plot update requested from a perspective
     plotUpdateSignal = QtCore.pyqtSignal(list)
@@ -236 +239 @@
     # Send result of Data Operation Utility panel to Data Explorer
     updateModelFromDataOperationPanelSignal = QtCore.pyqtSignal(QtGui.QStandardItem, dict)
+
+    # Notify about a new custom plugin being written/deleted/modified
+    customModelDirectoryChanged = QtCore.pyqtSignal()
 
 def updateModelItemWithPlot(item, update_data, name=""):
@@ -872 +878 @@
         raise TypeError
 
+def findNextFilename(filename, directory):
+    """
+    Finds the next available (non-existing) name for 'filename' in 'directory'.
+    plugin.py -> plugin (n).py  - for first 'n' for which the file doesn't exist
+    """
+    basename, ext = os.path.splitext(filename)
+    # limit the number of copies
+    MAX_FILENAMES = 1000
+    # Start with (1)
+    number_ext = 1
+    proposed_filename = ""
+    found_filename = False
+    # Find the next available filename or exit if too many copies
+    while not found_filename or number_ext > MAX_FILENAMES:
+        proposed_filename = basename + " ("+str(number_ext)+")" + ext
+        if os.path.exists(os.path.join(directory, proposed_filename)):
+            number_ext += 1
+        else:
+            found_filename = True
+
+    return proposed_filename
+
+
 class DoubleValidator(QtGui.QDoubleValidator):
     """

src/sas/qtgui/Utilities/LocalConfig.py

@@ -141 +141 @@
 # Time out for updating sasview
 UPDATE_TIMEOUT = 2
+
+# Logging levels to disable, if any
+DISABLE_LOGGING = logging.DEBUG
+
 def printEVT(message):
     """