Commit 1cb9aeb0 authored by eric pellegrini's avatar eric pellegrini

Updated the modules impacted by previous commit

parent 0d1e88a2
......@@ -32,7 +32,7 @@ Created on Mar 30, 2015
import wx
from MDANSE.GUI import DATA_CONTROLLER
from MDANSE import DATA_CONTROLLER
from MDANSE.Framework.Plugins.IPlugin import IPlugin
def get_data_plugin(window):
......
......@@ -39,11 +39,10 @@ import time
import wx
import wx.aui as aui
from MDANSE import PLATFORM,REGISTRY
from MDANSE import DATA_CONTROLLER, PLATFORM,REGISTRY
from MDANSE.Externals.pubsub import pub
from MDANSE.Framework.Plugins.ComponentPlugin import ComponentPlugin
from MDANSE.Framework.InputData.EmptyData import EmptyData
from MDANSE.GUI import DATA_CONTROLLER
from MDANSE.GUI.ComboWidgets.ConfigurationPanel import ConfigurationPanel
from MDANSE.GUI.ComboWidgets.JobHelpFrame import JobHelpFrame
......
......@@ -33,7 +33,7 @@ Created on Mar 30, 2015
import wx
import wx.lib.intctrl as wxintctrl
from MDANSE.GUI import DATA_CONTROLLER
from MDANSE import DATA_CONTROLLER
from MDANSE.Framework.Widgets.IWidget import IWidget
class FramesWidget(IWidget):
......
......@@ -38,9 +38,8 @@ from matplotlib.backends.backend_wxagg import NavigationToolbar2WxAgg as Navigat
import wx
from MDANSE import REGISTRY
from MDANSE import DATA_CONTROLLER, REGISTRY
from MDANSE.Framework.Widgets.IWidget import IWidget
from MDANSE.GUI import DATA_CONTROLLER
from MDANSE.GUI.ComboWidgets.ConfigurationPanel import ConfigurationPanel
class InstrumentResolutionDialog(wx.Dialog):
......
......@@ -32,8 +32,8 @@ Created on Mar 30, 2015
import wx
from MDANSE import DATA_CONTROLLER
from MDANSE.Framework.Widgets.IWidget import IWidget
from MDANSE.GUI import DATA_CONTROLLER
class InterpolationOrderWidget(IWidget):
......
......@@ -34,9 +34,9 @@ import wx
from MMTK.Trajectory import Trajectory
from MDANSE import DATA_CONTROLLER
from MDANSE.Framework.Configurable import ConfigurationError
from MDANSE.Framework.Widgets.IWidget import IWidget
from MDANSE.GUI import DATA_CONTROLLER
class MMTKTrajectoryWidget(IWidget):
......
......@@ -34,11 +34,10 @@ import wx
from Scientific.IO.NetCDF import _NetCDFFile
from MDANSE import DATA_CONTROLLER
from MDANSE.Externals.pubsub import pub
from MDANSE.Framework.Configurable import ConfigurationError
from MDANSE.Framework.Widgets.IWidget import IWidget
from MDANSE.GUI import DATA_CONTROLLER
class NetCDFInputWidget(IWidget):
......
......@@ -34,8 +34,8 @@ import wx
from MMTK.Trajectory import TrajectoryVariable
from MDANSE import DATA_CONTROLLER
from MDANSE.Framework.Widgets.IWidget import IWidget
from MDANSE.GUI import DATA_CONTROLLER
class TrajectoryVariableWidget(IWidget):
......
......@@ -36,11 +36,10 @@ import os
import wx
import wx.aui as wxaui
from MDANSE import LOGGER, REGISTRY
from MDANSE import DATA_CONTROLLER, LOGGER, REGISTRY
from MDANSE.Externals.pubsub import pub
from MDANSE.Framework.UserDefinitionStore import UD_STORE
from MDANSE.Framework.Widgets.IWidget import IWidget
from MDANSE.GUI import DATA_CONTROLLER
class UserDefinitionDialog(wx.Dialog):
......
......@@ -32,10 +32,9 @@ Created on Apr 10, 2015
import wx
from MDANSE import DATA_CONTROLLER
from MDANSE.Externals.pubsub import pub
from MDANSE.GUI.DataController import DATA_CONTROLLER
class DataObject(wx.TextDataObject):
def __init__(self, pluginStr):
......
......@@ -39,10 +39,9 @@ import webbrowser
import wx
import wx.aui as aui
from MDANSE import DATA_CONTROLLER, LOGGER, PLATFORM, REGISTRY
from MDANSE.__pkginfo__ import __version__, __revision__
from MDANSE import LOGGER, PLATFORM, REGISTRY
from MDANSE.Framework.Jobs.Converters.Converter import Converter
from MDANSE.GUI import DATA_CONTROLLER
from MDANSE.GUI.ControllerPanel import ControllerPanel
from MDANSE.GUI.DataTreePanel import DataTreePanel
from MDANSE.GUI.Icons import ICONS
......
......@@ -33,10 +33,9 @@ Created on Apr 10, 2015
import wx
import wx.aui as wxaui
from MDANSE.Externals.pubsub import pub
from MDANSE import DATA_CONTROLLER, REGISTRY
from MDANSE import REGISTRY
from MDANSE.GUI import DATA_CONTROLLER
from MDANSE.Externals.pubsub import pub
class DropTarget(wx.TextDropTarget):
......
......@@ -6,9 +6,6 @@ import platform
if platform.dist()[0].lower() == "ubuntu":
os.environ["UBUNTU_MENUPROXY"] = "0"
from MDANSE.GUI.DataController import DATA_CONTROLLER
from MDANSE import REGISTRY
from MDANSE.Framework.Plugins.DataPlugin import DataPlugin
from MDANSE.Framework.Plugins.JobPlugin import JobPlugin
......
......@@ -34,6 +34,7 @@ from __pkginfo__ import __version__, __author__, __date__
from MDANSE.Logging.Logger import LOGGER
from MDANSE.Core.DataController import DATA_CONTROLLER
from MDANSE.Core.Platform import PLATFORM
from MDANSE.Core.ClassRegistry import ClassRegistry as REGISTRY
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment