Changeset dc5ef15 in sasview for src/sas/qtgui/Utilities

Timestamp:

May 18, 2017 5:36:57 AM (8 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:

6066a3f

Parents:

2a432e7

Message:

Removed qtgui dependency on sasgui and wx SASVIEW-590

Location:

src/sas/qtgui/Utilities

Files:

• CategoryInstaller.py (added)
• ConnectionProxy.py (added)
• CustomDir.py (added)
• GenericReader.py (added)
• GuiUtils.py (modified) (7 diffs)
• LocalConfig.py (modified) (2 diffs)
• UnitTesting/GuiUtilsTest.py (modified) (1 diff)

src/sas/qtgui/Utilities/GuiUtils.py

@@ -4 +4 @@
 
 import os
+import re
 import sys
 import imp
@@ -16 +17 @@
 from PyQt4 import QtGui
 
-# Translate event handlers
-#from sas.sasgui.guiframe.events import EVT_CATEGORY
-#from sas.sasgui.guiframe.events import EVT_STATUS
-#from sas.sasgui.guiframe.events import EVT_APPEND_BOOKMARK
-#from sas.sasgui.guiframe.events import EVT_PANEL_ON_FOCUS
-#from sas.sasgui.guiframe.events import EVT_NEW_LOAD_DATA
-#from sas.sasgui.guiframe.events import EVT_NEW_COLOR
-#from sas.sasgui.guiframe.events import StatusEvent
-#from sas.sasgui.guiframe.events import NewPlotEvent
-
 from periodictable import formula as Formula
 
-from sas.sasgui.plottools import transform
-from sas.sasgui.plottools.convert_units import convert_unit
-from sas.sasgui.guiframe.dataFitting import Data1D
-from sas.sasgui.guiframe.dataFitting import Data2D
+from sas.qtgui.Plotting import DataTransform
+from sas.qtgui.Plotting.ConvertUnits import convertUnit
+
+from sas.qtgui.Plotting.PlotterData import Data1D
+from sas.qtgui.Plotting.PlotterData import Data2D
+
 from sas.sascalc.dataloader.loader import Loader
+from sas.qtgui.Utilities import CustomDir
 
 
@@ -109 +103 @@
 if config is None:
     config = _find_local_config('local_config', os.getcwd())
-    if config is None:
-        # Didn't find local config, load the default
-        import sas.sasgui.guiframe.config as config
-        #logging.info("using default local_config")
-    else:
-        pass
-        #logging.info("found local_config in %s", os.getcwd())
+    #if config is None:
+    #    # Didn't find local config, load the default
+    #    import sas.sasgui.guiframe.config as config
+    #    #logging.info("using default local_config")
+    #else:
+    #    pass
+    #    #logging.info("found local_config in %s", os.getcwd())
 else:
     pass
     #logging.info("found local_config in %s", PATH_APP)
 
-from sas.sasgui.guiframe.customdir  import SetupCustom
-c_conf_dir = SetupCustom().setup_dir(PATH_APP)
+c_conf_dir = CustomDir.setup_conf_dir(PATH_APP)
 
 custom_config = _find_local_config('custom_config', c_conf_dir)
@@ -183 +176 @@
     DEFAULT_OPEN_FOLDER = PATH_APP
 
-DEFAULT_STYLE = config.DEFAULT_STYLE
+#DEFAULT_STYLE = config.DEFAULT_STYLE
 
 PLUGIN_STATE_EXTENSIONS = config.PLUGIN_STATE_EXTENSIONS
@@ -672 +665 @@
     # X
     if xLabel == "x":
-        data.transformX(transform.toX, transform.errToX)
+        data.transformX(DataTransform.toX, DataTransform.errToX)
         xLabel = "%s(%s)" % (xname, xunits)
     if xLabel == "x^(2)":
-        data.transformX(transform.toX2, transform.errToX2)
-        xunits = convert_unit(2, xunits)
+        data.transformX(DataTransform.toX2, DataTransform.errToX2)
+        xunits = convertUnit(2, xunits)
         xLabel = "%s^{2}(%s)" % (xname, xunits)
     if xLabel == "x^(4)":
-        data.transformX(transform.toX4, transform.errToX4)
-        xunits = convert_unit(4, xunits)
+        data.transformX(DataTransform.toX4, DataTransform.errToX4)
+        xunits = convertUnit(4, xunits)
         xLabel = "%s^{4}(%s)" % (xname, xunits)
     if xLabel == "ln(x)":
-        data.transformX(transform.toLogX, transform.errToLogX)
+        data.transformX(DataTransform.toLogX, DataTransform.errToLogX)
         xLabel = "\ln{(%s)}(%s)" % (xname, xunits)
     if xLabel == "log10(x)":
-        data.transformX(transform.toX_pos, transform.errToX_pos)
+        data.transformX(DataTransform.toX_pos, DataTransform.errToX_pos)
         xscale = 'log'
         xLabel = "%s(%s)" % (xname, xunits)
     if xLabel == "log10(x^(4))":
-        data.transformX(transform.toX4, transform.errToX4)
-        xunits = convert_unit(4, xunits)
+        data.transformX(DataTransform.toX4, DataTransform.errToX4)
+        xunits = convertUnit(4, xunits)
         xLabel = "%s^{4}(%s)" % (xname, xunits)
         xscale = 'log'
@@ -697 +690 @@
     # Y
     if yLabel == "ln(y)":
-        data.transformY(transform.toLogX, transform.errToLogX)
+        data.transformY(DataTransform.toLogX, DataTransform.errToLogX)
         yLabel = "\ln{(%s)}(%s)" % (yname, yunits)
     if yLabel == "y":
-        data.transformY(transform.toX, transform.errToX)
+        data.transformY(DataTransform.toX, DataTransform.errToX)
         yLabel = "%s(%s)" % (yname, yunits)
     if yLabel == "log10(y)":
-        data.transformY(transform.toX_pos, transform.errToX_pos)
+        data.transformY(DataTransform.toX_pos, DataTransform.errToX_pos)
         yscale = 'log'
         yLabel = "%s(%s)" % (yname, yunits)
     if yLabel == "y^(2)":
-        data.transformY(transform.toX2, transform.errToX2)
-        yunits = convert_unit(2, yunits)
+        data.transformY(DataTransform.toX2, DataTransform.errToX2)
+        yunits = convertUnit(2, yunits)
         yLabel = "%s^{2}(%s)" % (yname, yunits)
     if yLabel == "1/y":
-        data.transformY(transform.toOneOverX, transform.errOneOverX)
-        yunits = convert_unit(-1, yunits)
+        data.transformY(DataTransform.toOneOverX, DataTransform.errOneOverX)
+        yunits = convertUnit(-1, yunits)
         yLabel = "1/%s(%s)" % (yname, yunits)
     if yLabel == "y*x^(2)":
-        data.transformY(transform.toYX2, transform.errToYX2)
-        xunits = convert_unit(2, xunits)
+        data.transformY(DataTransform.toYX2, DataTransform.errToYX2)
+        xunits = convertUnit(2, xunits)
         yLabel = "%s \ \ %s^{2}(%s%s)" % (yname, xname, yunits, xunits)
     if yLabel == "y*x^(4)":
-        data.transformY(transform.toYX4, transform.errToYX4)
-        xunits = convert_unit(4, xunits)
+        data.transformY(DataTransform.toYX4, DataTransform.errToYX4)
+        xunits = convertUnit(4, xunits)
         yLabel = "%s \ \ %s^{4}(%s%s)" % (yname, xname, yunits, xunits)
     if yLabel == "1/sqrt(y)":
-        data.transformY(transform.toOneOverSqrtX,
-                                transform.errOneOverSqrtX)
-        yunits = convert_unit(-0.5, yunits)
+        data.transformY(DataTransform.toOneOverSqrtX, DataTransform.errOneOverSqrtX)
+        yunits = convertUnit(-0.5, yunits)
         yLabel = "1/\sqrt{%s}(%s)" % (yname, yunits)
     if yLabel == "ln(y*x)":
-        data.transformY(transform.toLogXY, transform.errToLogXY)
+        data.transformY(DataTransform.toLogXY, DataTransform.errToLogXY)
         yLabel = "\ln{(%s \ \ %s)}(%s%s)" % (yname, xname, yunits, xunits)
     if yLabel == "ln(y*x^(2))":
-        data.transformY(transform.toLogYX2, transform.errToLogYX2)
-        xunits = convert_unit(2, xunits)
+        data.transformY(DataTransform.toLogYX2, DataTransform.errToLogYX2)
+        xunits = convertUnit(2, xunits)
         yLabel = "\ln (%s \ \ %s^{2})(%s%s)" % (yname, xname, yunits, xunits)
     if yLabel == "ln(y*x^(4))":
-        data.transformY(transform.toLogYX4, transform.errToLogYX4)
-        xunits = convert_unit(4, xunits)
+        data.transformY(DataTransform.toLogYX4, DataTransform.errToLogYX4)
+        xunits = convertUnit(4, xunits)
         yLabel = "\ln (%s \ \ %s^{4})(%s%s)" % (yname, xname, yunits, xunits)
     if yLabel == "log10(y*x^(4))":
-        data.transformY(transform.toYX4, transform.errToYX4)
-        xunits = convert_unit(4, xunits)
+        data.transformY(DataTransform.toYX4, DataTransform.errToYX4)
+        xunits = convertUnit(4, xunits)
         yscale = 'log'
         yLabel = "%s \ \ %s^{4}(%s%s)" % (yname, xname, yunits, xunits)
@@ -792 +784 @@
     else:
         return unit
+
+def parseName(name, expression):
+    """
+    remove "_" in front of a name
+    """
+    if re.match(expression, name) is not None:
+        word = re.split(expression, name, 1)
+        for item in word:           
+            if item.lstrip().rstrip() != '':
+                return item
+    else:
+        return name

src/sas/qtgui/Utilities/LocalConfig.py

@@ -4 +4 @@
 import time
 import os
-import logging
 
-from sas.sasgui.guiframe.gui_style import GUIFRAME
+#from sas.sasgui.guiframe.gui_style import GUIFRAME
 import sas.sasview
 
@@ -104 +103 @@
 SPLASH_SCREEN_PATH = os.path.join(icon_path, "SVwelcome_mini.png")
 TUTORIAL_PATH = os.path.join(media_path, "Tutorial.pdf")
-DEFAULT_STYLE = GUIFRAME.MULTIPLE_APPLICATIONS|GUIFRAME.MANAGER_ON\
-                    |GUIFRAME.CALCULATOR_ON|GUIFRAME.TOOLBAR_ON
+#DEFAULT_STYLE = GUIFRAME.MULTIPLE_APPLICATIONS|GUIFRAME.MANAGER_ON\
+#                    |GUIFRAME.CALCULATOR_ON|GUIFRAME.TOOLBAR_ON
 SPLASH_SCREEN_WIDTH = 512
 SPLASH_SCREEN_HEIGHT = 366

src/sas/qtgui/Utilities/UnitTesting/GuiUtilsTest.py

@@ -12 +12 @@
 # SV imports
 from sas.sascalc.dataloader.loader import Loader
-from sas.sasgui.guiframe.data_manager import DataManager
-from sas.sasgui.guiframe.dataFitting import Data1D
-from sas.sasgui.guiframe.dataFitting import Data2D
+from sas.qtgui.MainWindow.DataManager import DataManager
+from sas.qtgui.Plotting.PlotterData import Data1D
+from sas.qtgui.Plotting.PlotterData import Data2D
 
 # Tested module