Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
proview
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Esteban Blanc
proview
Commits
dcf8bf36
Commit
dcf8bf36
authored
Oct 23, 2018
by
Christoffer Ackelman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
QT: Fixed XttTrace not updating the view automatically.
parent
c539f38d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
14 deletions
+13
-14
xtt/lib/flow/src/flow_rect.cpp
xtt/lib/flow/src/flow_rect.cpp
+5
-6
xtt/lib/xtt/qt/xtt_trace_qt.cqt
xtt/lib/xtt/qt/xtt_trace_qt.cqt
+8
-8
No files found.
xtt/lib/flow/src/flow_rect.cpp
View file @
dcf8bf36
...
@@ -264,13 +264,12 @@ void FlowRect::nav_erase(void* pos, void* node)
...
@@ -264,13 +264,12 @@ void FlowRect::nav_erase(void* pos, void* node)
int
FlowRect
::
event_handler
(
int
FlowRect
::
event_handler
(
void
*
pos
,
flow_eEvent
event
,
int
x
,
int
y
,
void
*
node
)
void
*
pos
,
flow_eEvent
event
,
int
x
,
int
y
,
void
*
node
)
{
{
FlowPoint
*
p
;
FlowPoint
*
p
=
(
FlowPoint
*
)
pos
;
p
=
(
FlowPoint
*
)
pos
;
if
(
ll
.
z_x
+
p
->
z_x
-
ctx
->
offset_x
<=
x
if
(
ll
.
z_x
+
((
FlowPoint
*
)
pos
)
->
z_x
-
ctx
->
offset_x
<=
x
&&
x
<=
ur
.
z_x
+
p
->
z_x
-
ctx
->
offset_x
&&
x
<=
ur
.
z_x
+
((
FlowPoint
*
)
pos
)
->
z_x
-
ctx
->
offset_x
&&
ll
.
z_y
+
p
->
z_y
-
ctx
->
offset_y
<=
y
&&
ll
.
z_y
+
((
FlowPoint
*
)
pos
)
->
z_y
-
ctx
->
offset_y
<=
y
&&
y
<=
ur
.
z_y
+
p
->
z_y
-
ctx
->
offset_y
)
{
&&
y
<=
ur
.
z_y
+
((
FlowPoint
*
)
pos
)
->
z_y
-
ctx
->
offset_y
)
{
// std::cout << "Event handler: Hit in rect\n";
// std::cout << "Event handler: Hit in rect\n";
return
1
;
return
1
;
}
else
}
else
...
...
xtt/lib/xtt/qt/xtt_trace_qt.cqt
View file @
dcf8bf36
...
@@ -158,7 +158,7 @@ void RtTraceQtWidget::activate_zoomreset()
...
@@ -158,7 +158,7 @@ void RtTraceQtWidget::activate_zoomreset()
void RtTraceQtWidget::activate_scantime()
void RtTraceQtWidget::activate_scantime()
{
{
rt->scan_time = ((QAction*)sender())->data().to
In
t();
rt->scan_time = ((QAction*)sender())->data().to
Floa
t();
}
}
void RtTraceQtWidget::activate_help()
void RtTraceQtWidget::activate_help()
...
@@ -339,19 +339,19 @@ RtTraceQt::RtTraceQt(void* tr_parent_ctx, QWidget* tr_parent_wid,
...
@@ -339,19 +339,19 @@ RtTraceQt::RtTraceQt(void* tr_parent_ctx, QWidget* tr_parent_wid,
QActionGroup* view_sc_group = new QActionGroup(toplevel);
QActionGroup* view_sc_group = new QActionGroup(toplevel);
QAction* a = addMenuRadioItem(
QAction* a = addMenuRadioItem(
toplevel, view_sc, "0.50 s", SLOT(activate_scantime()), view_sc_group);
toplevel, view_sc, "0.50 s", SLOT(activate_scantime()), view_sc_group);
a->setData(
500
);
a->setData(
0.5f
);
a = addMenuRadioItem(
a = addMenuRadioItem(
toplevel, view_sc, "0.20 s", SLOT(activate_scantime()), view_sc_group);
toplevel, view_sc, "0.20 s", SLOT(activate_scantime()), view_sc_group);
a->setData(
200
);
a->setData(
0.2f
);
a = addMenuRadioItem(
a = addMenuRadioItem(
toplevel, view_sc, "0.10 s", SLOT(activate_scantime()), view_sc_group);
toplevel, view_sc, "0.10 s", SLOT(activate_scantime()), view_sc_group);
a->setData(
100
);
a->setData(
0.1f
);
a = addMenuRadioItem(
a = addMenuRadioItem(
toplevel, view_sc, "0.05 s", SLOT(activate_scantime()), view_sc_group);
toplevel, view_sc, "0.05 s", SLOT(activate_scantime()), view_sc_group);
a->setData(
50
);
a->setData(
0.05f
);
a = addMenuRadioItem(
a = addMenuRadioItem(
toplevel, view_sc, "0.02 s", SLOT(activate_scantime()), view_sc_group);
toplevel, view_sc, "0.02 s", SLOT(activate_scantime()), view_sc_group);
a->setData(
20
);
a->setData(
0.02f
);
// End submenu
// End submenu
// End View entry
// End View entry
...
@@ -426,10 +426,10 @@ RtTraceQt::RtTraceQt(void* tr_parent_ctx, QWidget* tr_parent_wid,
...
@@ -426,10 +426,10 @@ RtTraceQt::RtTraceQt(void* tr_parent_ctx, QWidget* tr_parent_wid,
viewsetup();
viewsetup();
flow_Open(flow_ctx, filename);
flow_Open(flow_ctx, filename);
mode_trace->setChecked(true);
mode_trace->trigger();
view_sc_group->actions()[0]->setChecked(true);
view_sc_group->actions()[0]->setChecked(true);
view_sc_group->actions()[0]->trigger();
view_sc_group->actions()[0]->trigger();
mode_trace->setChecked(true);
mode_trace->trigger();
#if defined OS_LINUX
#if defined OS_LINUX
{
{
...
...
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