moved qps to eotimeseriesviewer/externals (including pyqtgraph)

Signed-off-by: benjamin.jakimow <benjamin.jakimow@geo.hu-berlin.de>

eotimeseriesviewer/__init__.py

@@ -69,26 +69,27 @@ except:
     pass
 
 
+import eotimeseriesviewer.externals.qps
 try:
     import qps
 except Exception as ex:
-    sys.path.append(DIR_SITE_PACKAGES)
+    sys.modules['qps'] = eotimeseriesviewer.externals.qps
     import qps
 
 
 
-import qps.utils
-qps.utils.UI_DIRECTORIES.append(DIR_UI)
+import eotimeseriesviewer.externals.qps.utils
+eotimeseriesviewer.externals.qps.utils.UI_DIRECTORIES.append(DIR_UI)
 
 # import QPS modules
 
-from qps.crosshair.crosshair import CrosshairStyle, CrosshairWidget, CrosshairMapCanvasItem, CrosshairDialog, getCrosshairStyle
-from qps.plotstyling.plotstyling import PlotStyle, PlotStyleDialog, PlotStyleButton, PlotStyleWidget
-from qps.classification.classificationscheme import ClassificationScheme, ClassInfo, ClassificationSchemeComboBox, ClassificationSchemeWidget, ClassificationSchemeDialog, hasClassification
-from qps.models import Option, OptionListModel, TreeNode, TreeModel, TreeView
-from qps.speclib.spectrallibraries import SpectralLibrary, SpectralProfile
-from qps.maptools import *
-
+from eotimeseriesviewer.externals.qps.crosshair.crosshair import CrosshairStyle, CrosshairWidget, CrosshairMapCanvasItem, CrosshairDialog, getCrosshairStyle
+from eotimeseriesviewer.externals.qps.plotstyling.plotstyling import PlotStyle, PlotStyleDialog, PlotStyleButton, PlotStyleWidget
+from eotimeseriesviewer.externals.qps.classification.classificationscheme import ClassificationScheme, ClassInfo, ClassificationSchemeComboBox, ClassificationSchemeWidget, ClassificationSchemeDialog, hasClassification
+from eotimeseriesviewer.externals.qps.models import Option, OptionListModel, TreeNode, TreeModel, TreeView
+from eotimeseriesviewer.externals.qps.speclib.spectrallibraries import SpectralLibrary, SpectralProfile, SpectralLibraryPanel
+from eotimeseriesviewer.externals.qps.maptools import *
+from eotimeseriesviewer.externals.qps.utils import *
 
 def messageLog(msg, level=None):
     """
@@ -123,7 +124,7 @@ def initEditorWidgets():
     """
     Initialises QgsEditorWidgets
     """
-    import qps
+    import eotimeseriesviewer.externals.qps as qps
     qps.registerEditorWidgets()
 
 def initAll():

eotimeseriesviewer/externals/pyqtgraph.py

+from .qps.externals.pyqtgraph import *
\ No newline at end of file

site-packages/qps/__init__.py → eotimeseriesviewer/externals/qps/__init__.py

@@ -7,16 +7,25 @@ def initResources():
     Initializes compiled Qt resources
     """
     try:
-        import qps.qpsresources
-        qpsresources.qInitResources()
+        from .qpsresources import qInitResources
+        qInitResources()
     except Exception as ex:
         print(ex, file=sys.stderr)
         print('It might be required to compile the qps/resources.py first', file=sys.stderr)
 
+
 # make required modules available in case they are not part of the core-python installation
-if importlib.util.find_spec('pyqtgraph') is None:
-    path = os.path.join(os.path.dirname(__file__), *['externals', 'ext-pyqtgraph'])
-    site.addsitedir(path)
+# if importlib.util.find_spec('pyqtgraph') is None:
+#    path = os.path.join(os.path.dirname(__file__), *['externals', 'ext-pyqtgraph'])
+#    site.addsitedir(path)
+"""
+try:
+    import pyqtgraph
+except:
+    print('PyQtGraph is not installed. Use qps.externals.pyqtgraph instead.')
+    import qps.externals.pyqtgraph
+    sys.modules['pyqtgraph'] = qps.externals.pyqtgraph
+"""
 
 def registerEditorWidgets():
     """
@@ -26,30 +35,30 @@ def registerEditorWidgets():
     assert isinstance(QgsApplication.instance(), QgsApplication), 'QgsApplication has not been instantiated'
 
     try:
-        import qps.speclib.spectrallibraries
-        qps.speclib.spectrallibraries.registerSpectralProfileEditorWidget()
+        from .speclib.spectrallibraries import registerSpectralProfileEditorWidget
+        registerSpectralProfileEditorWidget()
     except Exception as ex:
         print('Failed to call qps.speclib.spectrallibraries.registerSpectralProfileEditorWidget()', file=sys.stderr)
         print(ex, file=sys.stderr)
 
     try:
-        import qps.speclib.qgsfunctions
-        qps.speclib.qgsfunctions.registerQgsExpressionFunctions()
+        from .speclib.qgsfunctions import registerQgsExpressionFunctions
+        registerQgsExpressionFunctions()
     except Exception as ex:
         print('Failed to call qps.speclib.qgsfunctions.registerQgsExpressionFunctions()', file=sys.stderr)
         print(ex, file=sys.stderr)
 
     try:
-        import qps.classification.classificationscheme
-        qps.classification.classificationscheme.registerClassificationSchemeEditorWidget()
+        from .classification.classificationscheme import registerClassificationSchemeEditorWidget
+        registerClassificationSchemeEditorWidget()
     except Exception as ex:
         print('Failed to call qps.classification.classificationscheme.registerClassificationSchemeEditorWidget()',
               file=sys.stderr)
         print(ex, file=sys.stderr)
 
     try:
-        import qps.plotstyling.plotstyling
-        qps.plotstyling.plotstyling.registerPlotStyleEditorWidget()
+        from .plotstyling.plotstyling import registerPlotStyleEditorWidget
+        registerPlotStyleEditorWidget()
     except Exception as ex:
         print('Failed to call qps.plotstyling.plotstyling.registerPlotStyleEditorWidget()', file=sys.stderr)
         print(ex, file=sys.stderr)

eotimeseriesviewer/externals/qps/externals/__init__.py

+# external libraries
+