Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
core_tools
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
QuTech QDLabs
core_tools
Commits
e83def2a
Commit
e83def2a
authored
1 month ago
by
Sander Snoo
Browse files
Options
Downloads
Patches
Plain Diff
Removed support for QT-DataViewer < 0.3.10
parent
4a35d295
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
core_tools/data/gui/qml/GUI_controll.py
+13
-24
13 additions, 24 deletions
core_tools/data/gui/qml/GUI_controll.py
with
13 additions
and
24 deletions
core_tools/data/gui/qml/GUI_controll.py
+
13
−
24
View file @
e83def2a
...
...
@@ -10,6 +10,8 @@ from core_tools.data.ds.data_set import load_by_uuid
try
:
from
qt_dataviewer.core_tools
import
CoreToolsDatasetViewer
from
qt_dataviewer
import
DatasetList
from
packaging.version
import
Version
from
qt_dataviewer
import
__version__
as
qt_dataviewer_version
use_qt_dataviewer
=
True
except
ImportError
:
from
core_tools.data.gui.plot_mgr
import
data_plotter
...
...
@@ -278,6 +280,17 @@ class signale_handler(QtQuick.QQuickView):
return
try
:
if
use_qt_dataviewer
:
if
Version
(
qt_dataviewer_version
)
<
Version
(
"
0.3.10
"
):
error_msg
=
"
Update QT-DataViewer. Minimmum version 0.3.10
"
logger
.
error
(
error_msg
)
msg
=
QMessageBox
()
msg
.
setIcon
(
QMessageBox
.
Critical
)
msg
.
setText
(
error_msg
)
msg
.
setWindowTitle
(
"
Update QT-DataViewer
"
)
msg
.
setStandardButtons
(
QMessageBox
.
Ok
)
msg
.
exec_
()
raise
Exception
(
error_msg
)
datalist
=
DataList
(
self
.
data_overview_model
,
uuid
)
p
=
CoreToolsDatasetViewer
(
ds
,
datalist
=
datalist
)
datalist
.
viewer
=
p
...
...
@@ -389,27 +402,3 @@ if use_qt_dataviewer:
return
self
.
_load_ds
(
self
.
uuid
)
logger
.
info
(
f
"
No previous data (index =
{
index
}
)
"
)
raise
StopIteration
(
'
No more datasets
'
)
from
None
# -------------------------------------
# OLD interface qt-dataviewer v0.2.x
# TODO remove after some releases.
def
select_next
(
self
):
index
=
self
.
_get_index
()
if
index
is
not
None
and
index
>
0
:
self
.
uuid
=
self
.
data_overview_model
.
_data
[
index
-
1
].
uuid
self
.
_set_ds
(
self
.
uuid
)
def
select_previous
(
self
):
index
=
self
.
_get_index
()
if
index
is
not
None
and
index
+
1
<
len
(
self
.
data_overview_model
.
_data
):
self
.
uuid
=
self
.
data_overview_model
.
_data
[
index
+
1
].
uuid
self
.
_set_ds
(
self
.
uuid
)
def
_set_ds
(
self
,
uuid
):
try
:
ds
=
self
.
_load_ds
(
uuid
)
if
ds
is
not
None
:
self
.
viewer
.
set_ds
(
ds
)
except
Exception
:
logger
.
error
(
f
'
Failed to set dataset
{
uuid
}
'
,
exc_info
=
True
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment