Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
X
xsocs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
22
Issues
22
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Package Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
kmap
xsocs
Commits
8d4172ed
Commit
8d4172ed
authored
Dec 07, 2016
by
Damien Naudet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changed the order of imports to load silx before matplotlib.
-> no more warning in the console.
parent
5459a242
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
10 deletions
+7
-10
kmap/gui/XsocsGui.py
kmap/gui/XsocsGui.py
+0
-5
kmap/gui/view/FitView.py
kmap/gui/view/FitView.py
+4
-2
kmap/gui/view/IntensityView.py
kmap/gui/view/IntensityView.py
+3
-3
kmap/gui/widgets/XsocsPlot2D.py
kmap/gui/widgets/XsocsPlot2D.py
+0
-0
No files found.
kmap/gui/XsocsGui.py
View file @
8d4172ed
...
...
@@ -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
...
...
kmap/gui/view/FitView.py
View file @
8d4172ed
...
...
@@ -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
...
...
kmap/gui/view/IntensityView.py
View file @
8d4172ed
...
...
@@ -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
...
...
kmap/gui/widgets/XsocsPlot2D.py
0 → 100644
View file @
8d4172ed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment