Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
bliss
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
505
Issues
505
List
Boards
Labels
Service Desk
Milestones
Jira
Jira
Merge Requests
133
Merge Requests
133
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Bliss
bliss
Commits
36c53370
Commit
36c53370
authored
Feb 12, 2020
by
Valentin Valls
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update the cache when item changes
parent
a96f6ae6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
71 additions
and
53 deletions
+71
-53
bliss/flint/model/plot_model.py
bliss/flint/model/plot_model.py
+8
-3
bliss/flint/model/plot_state_model.py
bliss/flint/model/plot_state_model.py
+63
-50
No files found.
bliss/flint/model/plot_model.py
View file @
36c53370
...
...
@@ -432,14 +432,19 @@ class ComputableMixIn:
resultAvailable
=
qt
.
Signal
(
object
)
def
inputData
(
self
)
->
Any
:
"""Needed to invalidate the data according to the configuration"""
return
None
def
isResultComputed
(
self
,
scan
:
scan_model
.
Scan
)
->
bool
:
return
scan
.
hasCachedResult
(
self
)
def
reachResult
(
self
,
scan
:
scan_model
.
Scan
):
# FIXME: implement an asynchronous the cache system
# FIXME: cache system have to be invalidated when self config changes
if
scan
.
hasCachedResult
(
self
):
result
=
scan
.
getCachedResult
(
self
)
key
=
(
self
,
self
.
inputData
())
if
scan
.
hasCachedResult
(
key
):
result
=
scan
.
getCachedResult
(
key
)
else
:
try
:
result
=
self
.
compute
(
scan
)
...
...
@@ -452,7 +457,7 @@ class ComputableMixIn:
)
result
=
None
scan
.
setCachedResult
(
self
,
result
)
scan
.
setCachedResult
(
key
,
result
)
if
not
self
.
isResultValid
(
result
):
return
None
return
result
...
...
bliss/flint/model/plot_state_model.py
View file @
36c53370
...
...
@@ -32,9 +32,26 @@ from ..utils import mathutils
_logger
=
logging
.
getLogger
(
__name__
)
def
_getHashableSource
(
obj
:
plot_model
.
Item
):
while
isinstance
(
obj
,
plot_model
.
ChildItem
):
obj
=
obj
.
source
()
if
isinstance
(
obj
,
plot_item_model
.
CurveItem
):
x
=
obj
.
xChannel
()
y
=
obj
.
yChannel
()
xName
=
None
if
x
is
None
else
x
.
name
()
yName
=
None
if
y
is
None
else
y
.
name
()
return
(
xName
,
yName
)
else
:
_logger
.
error
(
"Source list not implemented for %s"
%
type
(
obj
))
return
tuple
()
class
CurveStatisticItem
(
plot_model
.
ChildItem
):
"""Statistic displayed on a source item, depending on it y-axis."""
def
inputData
(
self
):
return
_getHashableSource
(
self
.
source
())
def
yAxis
(
self
)
->
str
:
"""Returns the name of the y-axis in which the statistic have to be displayed"""
source
=
self
.
source
()
...
...
@@ -48,10 +65,16 @@ class CurveStatisticItem(plot_model.ChildItem):
if
source
is
not
None
:
source
.
valueChanged
.
connect
(
self
.
__sourceChanged
)
self
.
__sourceChanged
(
plot_model
.
ChangeEventType
.
YAXIS
)
self
.
__sourceChanged
(
plot_model
.
ChangeEventType
.
X_CHANNEL
)
self
.
__sourceChanged
(
plot_model
.
ChangeEventType
.
Y_CHANNEL
)
def
__sourceChanged
(
self
,
eventType
):
if
eventType
==
plot_model
.
ChangeEventType
.
YAXIS
:
self
.
_emitValueChanged
(
plot_model
.
ChangeEventType
.
YAXIS
)
if
eventType
==
plot_model
.
ChangeEventType
.
Y_CHANNEL
:
self
.
_emitValueChanged
(
plot_model
.
ChangeEventType
.
Y_CHANNEL
)
if
eventType
==
plot_model
.
ChangeEventType
.
X_CHANNEL
:
self
.
_emitValueChanged
(
plot_model
.
ChangeEventType
.
X_CHANNEL
)
class
DerivativeData
(
NamedTuple
):
...
...
@@ -60,20 +83,50 @@ class DerivativeData(NamedTuple):
nb_points
:
int
class
DerivativeItem
(
plot_model
.
ChildItem
,
plot_model
.
IncrementalComputableMixIn
,
plot_item_model
.
CurveMixIn
,
):
class
ComputedCurveItem
(
plot_model
.
ChildItem
,
plot_item_model
.
CurveMixIn
):
def
inputData
(
self
):
return
_getHashableSource
(
self
.
source
())
def
isResultValid
(
self
,
result
):
return
result
is
not
None
def
xData
(
self
,
scan
:
scan_model
.
Scan
)
->
Optional
[
scan_model
.
Data
]:
result
=
self
.
reachResult
(
scan
)
if
not
self
.
isResultValid
(
result
):
return
None
data
=
result
.
xx
return
scan_model
.
Data
(
self
,
data
)
def
yData
(
self
,
scan
:
scan_model
.
Scan
)
->
Optional
[
scan_model
.
Data
]:
result
=
self
.
reachResult
(
scan
)
if
not
self
.
isResultValid
(
result
):
return
None
data
=
result
.
yy
return
scan_model
.
Data
(
self
,
data
)
def
setSource
(
self
,
source
:
plot_model
.
Item
):
previousSource
=
self
.
source
()
if
previousSource
is
not
None
:
previousSource
.
valueChanged
.
disconnect
(
self
.
__sourceChanged
)
plot_model
.
ChildItem
.
setSource
(
self
,
source
)
if
source
is
not
None
:
source
.
valueChanged
.
connect
(
self
.
__sourceChanged
)
self
.
__sourceChanged
(
plot_model
.
ChangeEventType
.
X_CHANNEL
)
self
.
__sourceChanged
(
plot_model
.
ChangeEventType
.
Y_CHANNEL
)
def
__sourceChanged
(
self
,
eventType
):
if
eventType
==
plot_model
.
ChangeEventType
.
Y_CHANNEL
:
self
.
_emitValueChanged
(
plot_model
.
ChangeEventType
.
Y_CHANNEL
)
if
eventType
==
plot_model
.
ChangeEventType
.
X_CHANNEL
:
self
.
_emitValueChanged
(
plot_model
.
ChangeEventType
.
X_CHANNEL
)
class
DerivativeItem
(
ComputedCurveItem
,
plot_model
.
IncrementalComputableMixIn
):
"""This item use the scan data to process result before displaying it."""
EXTRA_POINTS
=
5
"""Extra points needed before and after a single point to compute a result"""
def
__init__
(
self
,
parent
=
None
):
plot_model
.
ChildItem
.
__init__
(
self
,
parent
=
parent
)
plot_item_model
.
CurveMixIn
.
__init__
(
self
)
def
__getstate__
(
self
):
state
:
Dict
[
str
,
Any
]
=
{}
state
.
update
(
plot_model
.
ChildItem
.
__getstate__
(
self
))
...
...
@@ -84,9 +137,6 @@ class DerivativeItem(
plot_model
.
ChildItem
.
__setstate__
(
self
,
state
)
plot_item_model
.
CurveMixIn
.
__setstate__
(
self
,
state
)
def
isResultValid
(
self
,
result
):
return
result
is
not
None
def
compute
(
self
,
scan
:
scan_model
.
Scan
)
->
Optional
[
DerivativeData
]:
sourceItem
=
self
.
source
()
...
...
@@ -106,20 +156,6 @@ class DerivativeItem(
return
DerivativeData
(
derived
[
0
],
derived
[
1
],
len
(
xx
))
def
xData
(
self
,
scan
:
scan_model
.
Scan
)
->
Optional
[
scan_model
.
Data
]:
result
=
self
.
reachResult
(
scan
)
if
not
self
.
isResultValid
(
result
):
return
None
data
=
result
.
xx
return
scan_model
.
Data
(
self
,
data
)
def
yData
(
self
,
scan
:
scan_model
.
Scan
)
->
Optional
[
scan_model
.
Data
]:
result
=
self
.
reachResult
(
scan
)
if
not
self
.
isResultValid
(
result
):
return
None
data
=
result
.
yy
return
scan_model
.
Data
(
self
,
data
)
def
incrementalCompute
(
self
,
previousResult
:
DerivativeData
,
scan
:
scan_model
.
Scan
)
->
DerivativeData
:
...
...
@@ -183,15 +219,9 @@ class GaussianFitData(NamedTuple):
fit
:
mathutils
.
GaussianFitResult
class
GaussianFitItem
(
plot_model
.
ChildItem
,
plot_model
.
ComputableMixIn
,
plot_item_model
.
CurveMixIn
):
class
GaussianFitItem
(
ComputedCurveItem
,
plot_model
.
ComputableMixIn
):
"""This item use the scan data to process result before displaying it."""
def
__init__
(
self
,
parent
=
None
):
plot_model
.
ChildItem
.
__init__
(
self
,
parent
=
parent
)
plot_item_model
.
CurveMixIn
.
__init__
(
self
)
def
__getstate__
(
self
):
state
:
Dict
[
str
,
Any
]
=
{}
state
.
update
(
plot_model
.
ChildItem
.
__getstate__
(
self
))
...
...
@@ -202,9 +232,6 @@ class GaussianFitItem(
plot_model
.
ChildItem
.
__setstate__
(
self
,
state
)
plot_item_model
.
CurveMixIn
.
__setstate__
(
self
,
state
)
def
isResultValid
(
self
,
result
):
return
result
is
not
None
def
compute
(
self
,
scan
:
scan_model
.
Scan
)
->
Optional
[
GaussianFitData
]:
sourceItem
=
self
.
source
()
...
...
@@ -225,20 +252,6 @@ class GaussianFitItem(
yy
=
fit
.
transform
(
xx
)
return
GaussianFitData
(
xx
,
yy
,
fit
)
def
xData
(
self
,
scan
:
scan_model
.
Scan
)
->
Optional
[
scan_model
.
Data
]:
result
=
self
.
reachResult
(
scan
)
if
not
self
.
isResultValid
(
result
):
return
None
data
=
result
.
xx
return
scan_model
.
Data
(
self
,
data
)
def
yData
(
self
,
scan
:
scan_model
.
Scan
)
->
Optional
[
scan_model
.
Data
]:
result
=
self
.
reachResult
(
scan
)
if
not
self
.
isResultValid
(
result
):
return
None
data
=
result
.
yy
return
scan_model
.
Data
(
self
,
data
)
def
displayName
(
self
,
axisName
,
scan
:
scan_model
.
Scan
)
->
str
:
"""Helper to reach the axis display name"""
sourceItem
=
self
.
source
()
...
...
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