Commit 8d4172ed authored by Damien Naudet's avatar Damien Naudet

Changed the order of imports to load silx before matplotlib.

-> no more warning in the console.
parent 5459a242
......@@ -30,11 +30,6 @@ import os
from silx.gui import qt as Qt
from .widgets.Wizard import XsocsWizard
from .Widgets import (AcqParamsWidget,
AdjustedLineEdit)
# from .Utils import (viewWidgetFromProjectEvent,
# processWidgetFromViewEvent,
# processDoneEvent)
from .process.RecipSpaceWidget import RecipSpaceWidget
from .process.FitWidget import FitWidget
from .view.IntensityView import IntensityView
......
......@@ -31,16 +31,18 @@ __date__ = "15/09/2016"
import numpy as np
from matplotlib import cm
from silx.gui import qt as Qt
from silx.gui.plot import PlotWindow, PlotWidget
from matplotlib import cm
from kmap.gui.model.Model import Model, RootNode
from kmap.gui.project.Hdf5Nodes import H5File
from kmap.gui.model.ModelDef import ModelRoles, ModelColumns
from kmap.gui.project.XsocsH5Factory import h5NodeToProjectItem
from kmap.gui.widgets.Containers import GroupBox
from silx.gui.plot import PlotWindow, PlotWidget
from kmap.io.FitH5 import FitH5
from kmap.gui.model.TreeView import TreeView
......
......@@ -30,15 +30,15 @@ __license__ = "MIT"
__date__ = "15/09/2016"
import numpy as np
from matplotlib import cm
from silx.gui import qt as Qt
from silx.gui.plot import PlotWindow
from matplotlib import cm
from ..model.TreeView import TreeView
from ..model.Model import Model
from ..model.ModelDef import ModelColumns, ModelRoles
from ..project.XsocsH5Factory import h5NodeToProjectItem
from ..project.XsocsH5Factory import XsocsH5Factory
try:
from silx.gui.plot.ImageRois import ImageRoiManager
......
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