From d14d00b1069bf105ba1035e628ad5fcc747877e6 Mon Sep 17 00:00:00 2001
From: Ross Whitfield <whitfieldre@ornl.gov>
Date: Tue, 30 Apr 2019 11:12:43 -0400
Subject: [PATCH] Move MPLwidgets.py/gui_helper.py to mantidqt

---
 {scripts => qt/python/mantidqt}/MPLwidgets.py       | 2 +-
 {scripts => qt/python/mantidqt}/gui_helper.py       | 0
 qt/python/mantidqt/widgets/sliceviewer/view.py      | 2 +-
 scripts/DGSPlanner.py                               | 2 +-
 scripts/DGSPlanner/DGSPlannerGUI.py                 | 4 ++--
 scripts/DGSPlanner/InstrumentSetupWidget.py         | 2 +-
 scripts/FilterEvents.py                             | 2 +-
 scripts/FilterEvents/eventFilterGUI.py              | 2 +-
 scripts/HFIR_4Circle_Reduction.py                   | 2 +-
 scripts/HFIR_4Circle_Reduction/mpl2dgraphicsview.py | 4 ++--
 scripts/HFIR_4Circle_Reduction/mplgraphicsview.py   | 4 ++--
 scripts/HFIR_4Circle_Reduction/mplgraphicsview3d.py | 2 +-
 scripts/Interface/reduction_application.py          | 2 +-
 scripts/PyChop.py                                   | 2 +-
 scripts/PyChop/PyChopGui.py                         | 4 ++--
 scripts/QECoverage.py                               | 4 ++--
 scripts/TofConverter.py                             | 2 +-
 scripts/TofConverter/converterGUI.py                | 2 +-
 18 files changed, 22 insertions(+), 22 deletions(-)
 rename {scripts => qt/python/mantidqt}/MPLwidgets.py (93%)
 rename {scripts => qt/python/mantidqt}/gui_helper.py (100%)

diff --git a/scripts/MPLwidgets.py b/qt/python/mantidqt/MPLwidgets.py
similarity index 93%
rename from scripts/MPLwidgets.py
rename to qt/python/mantidqt/MPLwidgets.py
index fe5e3f495d3..9c00c92a832 100644
--- a/scripts/MPLwidgets.py
+++ b/qt/python/mantidqt/MPLwidgets.py
@@ -5,7 +5,7 @@
 #     & Institut Laue - Langevin
 # SPDX - License - Identifier: GPL - 3.0 +
 from __future__ import (absolute_import, division, print_function)
-from gui_helper import set_matplotlib_backend
+from .gui_helper import set_matplotlib_backend
 
 backend = set_matplotlib_backend()  # must be at the top of this file
 if backend == 'Qt4Agg':
diff --git a/scripts/gui_helper.py b/qt/python/mantidqt/gui_helper.py
similarity index 100%
rename from scripts/gui_helper.py
rename to qt/python/mantidqt/gui_helper.py
diff --git a/qt/python/mantidqt/widgets/sliceviewer/view.py b/qt/python/mantidqt/widgets/sliceviewer/view.py
index bc18d493649..8adc2106509 100644
--- a/qt/python/mantidqt/widgets/sliceviewer/view.py
+++ b/qt/python/mantidqt/widgets/sliceviewer/view.py
@@ -10,8 +10,8 @@
 from __future__ import (absolute_import, division, print_function)
 from qtpy.QtWidgets import QWidget, QVBoxLayout
 from qtpy.QtCore import Qt
+from mantidqt.MPLwidgets import FigureCanvas, NavigationToolbar2QT as NavigationToolbar
 from matplotlib.figure import Figure
-from MPLwidgets import FigureCanvas, NavigationToolbar2QT as NavigationToolbar
 from .dimensionwidget import DimensionWidget
 
 
diff --git a/scripts/DGSPlanner.py b/scripts/DGSPlanner.py
index b6407a94c24..53b7898e147 100644
--- a/scripts/DGSPlanner.py
+++ b/scripts/DGSPlanner.py
@@ -8,7 +8,7 @@
 from __future__ import (absolute_import, division, print_function)
 import sys
 from DGSPlanner import DGSPlannerGUI
-from gui_helper import get_qapplication
+from mantidqt.gui_helper import get_qapplication
 
 app, within_mantid = get_qapplication()
 planner = DGSPlannerGUI.DGSPlannerGUI()
diff --git a/scripts/DGSPlanner/DGSPlannerGUI.py b/scripts/DGSPlanner/DGSPlannerGUI.py
index 73ea29bb0f6..441c7822349 100644
--- a/scripts/DGSPlanner/DGSPlannerGUI.py
+++ b/scripts/DGSPlanner/DGSPlannerGUI.py
@@ -15,8 +15,8 @@ import sys
 import mantid
 from .ValidateOL import ValidateOL
 import matplotlib
-from gui_helper import show_interface_help
-from MPLwidgets import *
+from mantidqt.gui_helper import show_interface_help
+from mantidqt.MPLwidgets import *
 from matplotlib.figure import Figure
 from mpl_toolkits.axisartist.grid_helper_curvelinear import GridHelperCurveLinear
 from mpl_toolkits.axisartist import Subplot
diff --git a/scripts/DGSPlanner/InstrumentSetupWidget.py b/scripts/DGSPlanner/InstrumentSetupWidget.py
index 153404749a2..d4514f154f3 100644
--- a/scripts/DGSPlanner/InstrumentSetupWidget.py
+++ b/scripts/DGSPlanner/InstrumentSetupWidget.py
@@ -13,7 +13,7 @@ import numpy
 
 sys.path.append('..')
 #the following matplotlib imports cannot be placed before the setting of the backend, so we ignore flake8 warnings
-from MPLwidgets import * # noqa
+from mantidqt.MPLwidgets import * # noqa
 from matplotlib.figure import Figure # noqa
 from mpl_toolkits.mplot3d import Axes3D # noqa
 import matplotlib.pyplot # noqa
diff --git a/scripts/FilterEvents.py b/scripts/FilterEvents.py
index a695b662144..60342d50056 100644
--- a/scripts/FilterEvents.py
+++ b/scripts/FilterEvents.py
@@ -7,7 +7,7 @@
 # pylint: disable=invalid-name
 from __future__ import (absolute_import, division, print_function)
 import sys
-from gui_helper import set_matplotlib_backend, get_qapplication
+from mantidqt.gui_helper import set_matplotlib_backend, get_qapplication
 set_matplotlib_backend()  # must be called before anything tries to use matplotlib
 from FilterEvents import eventFilterGUI  # noqa
 
diff --git a/scripts/FilterEvents/eventFilterGUI.py b/scripts/FilterEvents/eventFilterGUI.py
index 8e952334866..f525b816fb5 100644
--- a/scripts/FilterEvents/eventFilterGUI.py
+++ b/scripts/FilterEvents/eventFilterGUI.py
@@ -20,7 +20,7 @@ from mantid.kernel import Logger
 from mantid.simpleapi import AnalysisDataService
 
 from mantid.kernel import ConfigService
-from MPLwidgets import FigureCanvasQTAgg as FigureCanvas
+from mantidqt.MPLwidgets import FigureCanvasQTAgg as FigureCanvas
 from matplotlib.pyplot import (Figure, setp)
 import os
 
diff --git a/scripts/HFIR_4Circle_Reduction.py b/scripts/HFIR_4Circle_Reduction.py
index 8742a608399..4556964e62b 100644
--- a/scripts/HFIR_4Circle_Reduction.py
+++ b/scripts/HFIR_4Circle_Reduction.py
@@ -7,7 +7,7 @@
 #pylint: disable=invalid-name
 from __future__ import (absolute_import, division, print_function)
 import sys
-from gui_helper import set_matplotlib_backend, get_qapplication
+from mantidqt.gui_helper import set_matplotlib_backend, get_qapplication
 set_matplotlib_backend()  # must be called before anything tries to use matplotlib
 from HFIR_4Circle_Reduction import reduce4circleGUI  # noqa
 
diff --git a/scripts/HFIR_4Circle_Reduction/mpl2dgraphicsview.py b/scripts/HFIR_4Circle_Reduction/mpl2dgraphicsview.py
index a515456faef..01127893ce6 100644
--- a/scripts/HFIR_4Circle_Reduction/mpl2dgraphicsview.py
+++ b/scripts/HFIR_4Circle_Reduction/mpl2dgraphicsview.py
@@ -9,8 +9,8 @@ from __future__ import (absolute_import, division, print_function)
 import os
 import numpy as np
 from qtpy.QtWidgets import (QWidget, QVBoxLayout, QSizePolicy)
-from MPLwidgets import FigureCanvasQTAgg as FigureCanvas
-from MPLwidgets import NavigationToolbar2QT as NavigationToolbar2
+from mantidqt.MPLwidgets import FigureCanvasQTAgg as FigureCanvas
+from mantidqt.MPLwidgets import NavigationToolbar2QT as NavigationToolbar2
 from matplotlib.figure import Figure
 import matplotlib.image
 from matplotlib import pyplot as plt
diff --git a/scripts/HFIR_4Circle_Reduction/mplgraphicsview.py b/scripts/HFIR_4Circle_Reduction/mplgraphicsview.py
index 0936492816e..bdea6df7b35 100644
--- a/scripts/HFIR_4Circle_Reduction/mplgraphicsview.py
+++ b/scripts/HFIR_4Circle_Reduction/mplgraphicsview.py
@@ -9,8 +9,8 @@ from __future__ import (absolute_import, division, print_function)
 from six.moves import range
 import os
 import numpy as np
-from MPLwidgets import FigureCanvasQTAgg as FigureCanvas
-from MPLwidgets import NavigationToolbar2QT as NavigationToolbar2
+from mantidqt.MPLwidgets import FigureCanvasQTAgg as FigureCanvas
+from mantidqt.MPLwidgets import NavigationToolbar2QT as NavigationToolbar2
 from matplotlib.figure import Figure
 import matplotlib.image
 import matplotlib.collections
diff --git a/scripts/HFIR_4Circle_Reduction/mplgraphicsview3d.py b/scripts/HFIR_4Circle_Reduction/mplgraphicsview3d.py
index 714fcc32805..c0f592244df 100644
--- a/scripts/HFIR_4Circle_Reduction/mplgraphicsview3d.py
+++ b/scripts/HFIR_4Circle_Reduction/mplgraphicsview3d.py
@@ -11,7 +11,7 @@ import numpy as np
 import os
 
 from qtpy.QtWidgets import QSizePolicy
-from MPLwidgets import FigureCanvasQTAgg as FigureCanvas
+from mantidqt.MPLwidgets import FigureCanvasQTAgg as FigureCanvas
 from matplotlib.figure import Figure
 from mpl_toolkits.mplot3d import Axes3D
 
diff --git a/scripts/Interface/reduction_application.py b/scripts/Interface/reduction_application.py
index 73aa72181be..43151fa5f0e 100644
--- a/scripts/Interface/reduction_application.py
+++ b/scripts/Interface/reduction_application.py
@@ -13,7 +13,7 @@ import six
 import sys
 import os
 import traceback
-from gui_helper import get_qapplication
+from mantidqt.gui_helper import get_qapplication
 from qtpy.QtWidgets import (QAction, QDialog, QFileDialog, QMainWindow, QMessageBox)  # noqa
 from qtpy.QtCore import (QFile, QFileInfo, QSettings)  # noqa
 from mantid.kernel import Logger
diff --git a/scripts/PyChop.py b/scripts/PyChop.py
index 4d8b1e5db97..ac005f12bfa 100644
--- a/scripts/PyChop.py
+++ b/scripts/PyChop.py
@@ -12,7 +12,7 @@ Module to import and run the PyChop GUI for use either on the commandline or as
 
 import sys
 from PyChop import PyChopGui
-from gui_helper import set_matplotlib_backend, get_qapplication
+from mantidqt.gui_helper import set_matplotlib_backend, get_qapplication
 set_matplotlib_backend()  # must be called before anything tries to use matplotlib
 
 app, within_mantid = get_qapplication()
diff --git a/scripts/PyChop/PyChopGui.py b/scripts/PyChop/PyChopGui.py
index ea86550e19e..5cfe88870dd 100755
--- a/scripts/PyChop/PyChopGui.py
+++ b/scripts/PyChop/PyChopGui.py
@@ -27,8 +27,8 @@ from qtpy.QtCore import (QEventLoop, Qt)  # noqa
 from qtpy.QtWidgets import (QAction, QCheckBox, QComboBox, QDialog, QFileDialog, QGridLayout, QHBoxLayout, QMenu, QLabel,
                             QLineEdit, QMainWindow, QMessageBox, QPushButton, QSizePolicy, QSpacerItem, QTabWidget,
                             QTextEdit, QVBoxLayout, QWidget)  # noqa
-from MPLwidgets import FigureCanvasQTAgg as FigureCanvas
-from MPLwidgets import NavigationToolbar2QT as NavigationToolbar
+from mantidqt.MPLwidgets import FigureCanvasQTAgg as FigureCanvas
+from mantidqt.MPLwidgets import NavigationToolbar2QT as NavigationToolbar
 import matplotlib
 from matplotlib.figure import Figure
 from matplotlib.widgets import Slider
diff --git a/scripts/QECoverage.py b/scripts/QECoverage.py
index dbd86c136ef..9a396738350 100644
--- a/scripts/QECoverage.py
+++ b/scripts/QECoverage.py
@@ -7,12 +7,12 @@
 # pylint: disable=line-too-long, too-many-instance-attributes, invalid-name, missing-docstring, too-many-statements
 # pylint: disable= too-many-branches, no-self-use
 from __future__ import (absolute_import, division, print_function)
-from gui_helper import get_qapplication, show_interface_help
+from mantidqt.gui_helper import get_qapplication, show_interface_help
 import numpy as np
 import os
 import mantid
 from qtpy import QtWidgets
-from MPLwidgets import *
+from mantidqt.MPLwidgets import *
 import matplotlib
 from matplotlib.figure import Figure
 from scipy import constants
diff --git a/scripts/TofConverter.py b/scripts/TofConverter.py
index ec7294bed7d..ff490a92704 100644
--- a/scripts/TofConverter.py
+++ b/scripts/TofConverter.py
@@ -7,7 +7,7 @@
 #pylint: disable=invalid-name
 from __future__ import (absolute_import, division, print_function)
 from TofConverter import converterGUI
-from gui_helper import get_qapplication
+from mantidqt.gui_helper import get_qapplication
 
 app, within_mantid = get_qapplication()
 
diff --git a/scripts/TofConverter/converterGUI.py b/scripts/TofConverter/converterGUI.py
index 0fe46da7d30..c015658cfdb 100644
--- a/scripts/TofConverter/converterGUI.py
+++ b/scripts/TofConverter/converterGUI.py
@@ -11,7 +11,7 @@ from qtpy.QtGui import QDoubleValidator
 from qtpy import QtCore
 import os
 from mantid.kernel import Logger
-from gui_helper import show_interface_help
+from mantidqt.gui_helper import show_interface_help
 import math
 import TofConverter.convertUnits
 
-- 
GitLab