Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
CFA Analysis
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
JOSSOUD Olivier
CFA Analysis
Commits
9f687dd9
Commit
9f687dd9
authored
3 years ago
by
JOSSOUD Olivier
Browse files
Options
Downloads
Patches
Plain Diff
IcbkTransition. Display distance to _hovered_ transition instead of _selected_ transition.
parent
75487a39
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
pyqt/icbktransition_dialog.ui
+1
-1
1 addition, 1 deletion
pyqt/icbktransition_dialog.ui
src/gui/ui_icbktransition_dialog.py
+4
-4
4 additions, 4 deletions
src/gui/ui_icbktransition_dialog.py
src/uim/icbktransitionuim.py
+9
-10
9 additions, 10 deletions
src/uim/icbktransitionuim.py
with
14 additions
and
15 deletions
pyqt/icbktransition_dialog.ui
+
1
−
1
View file @
9f687dd9
...
@@ -166,7 +166,7 @@
...
@@ -166,7 +166,7 @@
</spacer>
</spacer>
</item>
</item>
<item>
<item>
<widget
class=
"QLabel"
name=
"label_distanceto
select
ed"
>
<widget
class=
"QLabel"
name=
"label_distanceto
hover
ed"
>
<property
name=
"text"
>
<property
name=
"text"
>
<string/>
<string/>
</property>
</property>
...
...
This diff is collapsed.
Click to expand it.
src/gui/ui_icbktransition_dialog.py
+
4
−
4
View file @
9f687dd9
...
@@ -84,10 +84,10 @@ class Ui_IcbktransitionDialog(object):
...
@@ -84,10 +84,10 @@ class Ui_IcbktransitionDialog(object):
self
.
horizontalLayout_2
.
addWidget
(
self
.
checkbox_reftime_disable
)
self
.
horizontalLayout_2
.
addWidget
(
self
.
checkbox_reftime_disable
)
spacerItem
=
QtWidgets
.
QSpacerItem
(
40
,
20
,
QtWidgets
.
QSizePolicy
.
Expanding
,
QtWidgets
.
QSizePolicy
.
Minimum
)
spacerItem
=
QtWidgets
.
QSpacerItem
(
40
,
20
,
QtWidgets
.
QSizePolicy
.
Expanding
,
QtWidgets
.
QSizePolicy
.
Minimum
)
self
.
horizontalLayout_2
.
addItem
(
spacerItem
)
self
.
horizontalLayout_2
.
addItem
(
spacerItem
)
self
.
label_distanceto
select
ed
=
QtWidgets
.
QLabel
(
IcbktransitionDialog
)
self
.
label_distanceto
hover
ed
=
QtWidgets
.
QLabel
(
IcbktransitionDialog
)
self
.
label_distanceto
select
ed
.
setText
(
""
)
self
.
label_distanceto
hover
ed
.
setText
(
""
)
self
.
label_distanceto
select
ed
.
setObjectName
(
"
label_distanceto
select
ed
"
)
self
.
label_distanceto
hover
ed
.
setObjectName
(
"
label_distanceto
hover
ed
"
)
self
.
horizontalLayout_2
.
addWidget
(
self
.
label_distanceto
select
ed
)
self
.
horizontalLayout_2
.
addWidget
(
self
.
label_distanceto
hover
ed
)
spacerItem1
=
QtWidgets
.
QSpacerItem
(
40
,
20
,
QtWidgets
.
QSizePolicy
.
Expanding
,
QtWidgets
.
QSizePolicy
.
Minimum
)
spacerItem1
=
QtWidgets
.
QSpacerItem
(
40
,
20
,
QtWidgets
.
QSizePolicy
.
Expanding
,
QtWidgets
.
QSizePolicy
.
Minimum
)
self
.
horizontalLayout_2
.
addItem
(
spacerItem1
)
self
.
horizontalLayout_2
.
addItem
(
spacerItem1
)
self
.
label_cursor
=
QtWidgets
.
QLabel
(
IcbktransitionDialog
)
self
.
label_cursor
=
QtWidgets
.
QLabel
(
IcbktransitionDialog
)
...
...
This diff is collapsed.
Click to expand it.
src/uim/icbktransitionuim.py
+
9
−
10
View file @
9f687dd9
...
@@ -109,7 +109,6 @@ class IcbktransitionUim:
...
@@ -109,7 +109,6 @@ class IcbktransitionUim:
def
__unselect_transition__
(
self
):
def
__unselect_transition__
(
self
):
self
.
selected_transition
=
None
self
.
selected_transition
=
None
self
.
icbktransition_ui
.
label_distancetoselected
.
setText
(
""
)
self
.
__paint_transitions_in_table__
()
self
.
__paint_transitions_in_table__
()
self
.
__paint_transitions_in_plot__
()
self
.
__paint_transitions_in_plot__
()
...
@@ -135,8 +134,10 @@ class IcbktransitionUim:
...
@@ -135,8 +134,10 @@ class IcbktransitionUim:
if
len
(
df
.
index
)
==
0
:
if
len
(
df
.
index
)
==
0
:
self
.
hovered_transition
=
None
self
.
hovered_transition
=
None
self
.
icbktransition_ui
.
label_distancetohovered
.
setText
(
""
)
else
:
else
:
self
.
hovered_transition
=
df
.
loc
[[
df
[
"
interval
"
].
idxmin
()]].
index
[
0
]
self
.
hovered_transition
=
df
.
loc
[[
df
[
"
interval
"
].
idxmin
()]].
index
[
0
]
self
.
__update_distance_to_hovered_transition
(
timestamp_sec
)
self
.
__paint_transitions_in_plot__
()
self
.
__paint_transitions_in_plot__
()
self
.
__paint_transitions_in_table__
()
self
.
__paint_transitions_in_table__
()
...
@@ -294,8 +295,6 @@ class IcbktransitionUim:
...
@@ -294,8 +295,6 @@ class IcbktransitionUim:
if
self
.
selected_transition
is
None
:
if
self
.
selected_transition
is
None
:
self
.
__mark_hovered_transition__
(
mouse_point
.
x
())
self
.
__mark_hovered_transition__
(
mouse_point
.
x
())
else
:
self
.
__update_distance_to_selected_transition
(
mouse_point
.
x
())
def
__mouse_clicked__
(
self
,
event
:
MouseClickEvent
)
->
None
:
def
__mouse_clicked__
(
self
,
event
:
MouseClickEvent
)
->
None
:
"""
Function triggered when the user clicks on the plot. Display a vertical line under the mouse click and call
"""
Function triggered when the user clicks on the plot. Display a vertical line under the mouse click and call
...
@@ -406,16 +405,16 @@ class IcbktransitionUim:
...
@@ -406,16 +405,16 @@ class IcbktransitionUim:
pos_x
=
pos_x
.
toUTC
()
pos_x
=
pos_x
.
toUTC
()
self
.
icbktransition_ui
.
timeedit_cursor
.
setDateTime
(
pos_x
)
self
.
icbktransition_ui
.
timeedit_cursor
.
setDateTime
(
pos_x
)
def
__update_distance_to_
select
ed_transition
(
self
,
timestamp_sec
:
int
):
def
__update_distance_to_
hover
ed_transition
(
self
,
timestamp_sec
:
int
):
select
ed_transition_info
=
self
.
icbktransition_prvd
.
transitions_df
.
iloc
[
self
.
select
ed_transition
]
hover
ed_transition_info
=
self
.
icbktransition_prvd
.
transitions_df
.
iloc
[
self
.
hover
ed_transition
]
# Distance in seconds
# Distance in seconds
distance_sec
=
timestamp_sec
-
select
ed_transition_info
[
"
timestamp
"
]
distance_sec
=
timestamp_sec
-
hover
ed_transition_info
[
"
timestamp
"
]
# Distance in mm
# Distance in mm
position_
select
ed
=
self
.
icbktransition_prvd
.
get_encoder_height_at
(
select
ed_transition_info
[
"
datetime
"
])
position_
hover
ed
=
self
.
icbktransition_prvd
.
get_encoder_height_at
(
hover
ed_transition_info
[
"
datetime
"
])
position_cursor
=
self
.
icbktransition_prvd
.
get_encoder_height_at
(
pd
.
Timestamp
(
timestamp_sec
*
10
**
9
,
tz
=
"
UTC
"
))
position_cursor
=
self
.
icbktransition_prvd
.
get_encoder_height_at
(
pd
.
Timestamp
(
timestamp_sec
*
10
**
9
,
tz
=
"
UTC
"
))
distance_mm
=
position_cursor
-
position_
select
ed
distance_mm
=
position_cursor
-
position_
hover
ed
self
.
icbktransition_ui
.
label_distanceto
select
ed
.
setText
(
self
.
icbktransition_ui
.
label_distanceto
hover
ed
.
setText
(
"
Distance to
select
ed:
"
+
"
{:.1f}
"
.
format
(
distance_sec
)
+
"
s &
"
+
"
{:.1f}
"
.
format
(
distance_mm
)
+
"
mm
"
)
"
Distance to
hover
ed:
"
+
"
{:.1f}
"
.
format
(
distance_sec
)
+
"
s &
"
+
"
{:.1f}
"
.
format
(
distance_mm
)
+
"
mm
"
)
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