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
f32864a0
Commit
f32864a0
authored
Mar 29, 2019
by
Christoffer Ackelman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed GlowPolyline not redrawing when attributes change.
parent
14e5b18f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
9 deletions
+8
-9
xtt/lib/ge/src/ge_dyn.cpp
xtt/lib/ge/src/ge_dyn.cpp
+1
-0
xtt/lib/glow/src/glow_growwindow.cpp
xtt/lib/glow/src/glow_growwindow.cpp
+1
-1
xtt/lib/glow/src/glow_polyline.cpp
xtt/lib/glow/src/glow_polyline.cpp
+3
-8
xtt/lib/glow/src/glow_polyline.h
xtt/lib/glow/src/glow_polyline.h
+3
-0
No files found.
xtt/lib/ge/src/ge_dyn.cpp
View file @
f32864a0
...
...
@@ -2202,6 +2202,7 @@ int GeDyn::scan(grow_tObject object)
|| sts == GLOW__SUBTERMINATED || sts == GLOW__SWAPTERMINATED)
return sts;
}
grow_RedrawDefered(graph->grow->ctx);
return 1;
}
...
...
xtt/lib/glow/src/glow_growwindow.cpp
View file @
f32864a0
...
...
@@ -323,7 +323,7 @@ void GrowWindow::draw(DrawWind* w, GlowTransform* t, int highlight, int hot,
ctx
->
gdraw
->
rect
(
ll_x
,
ll_y
,
ur_x
-
ll_x
,
ur_y
-
ll_y
,
fill_drawtype
,
1
,
0
);
window_ctx
->
draw
(
w
,
ll_x
,
ll_y
,
ur_x
,
ur_y
);
window_ctx
->
draw
(
w
indow_ctx
->
mw
,
ll_x
,
ll_y
,
ur_x
,
ur_y
);
ctx
->
gdraw
->
pop_customcolors
();
}
...
...
xtt/lib/glow/src/glow_polyline.cpp
View file @
f32864a0
...
...
@@ -153,9 +153,7 @@ void GlowPolyLine::open(std::ifstream& fp)
void
GlowPolyLine
::
get_borders
(
double
pos_x
,
double
pos_y
,
double
*
x_right
,
double
*
x_left
,
double
*
y_high
,
double
*
y_low
,
void
*
node
)
{
int
i
;
for
(
i
=
0
;
i
<
a_points
.
a_size
-
1
;
i
++
)
{
for
(
int
i
=
0
;
i
<
a_points
.
a_size
-
1
;
i
++
)
{
if
(
pos_x
+
((
GlowPoint
*
)
a_points
[
i
])
->
x
<
*
x_left
)
*
x_left
=
pos_x
+
((
GlowPoint
*
)
a_points
[
i
])
->
x
;
if
(
pos_x
+
((
GlowPoint
*
)
a_points
[
i
+
1
])
->
x
<
*
x_left
)
...
...
@@ -178,19 +176,16 @@ void GlowPolyLine::get_borders(double pos_x, double pos_y, double* x_right,
void
GlowPolyLine
::
add_points
(
void
*
pos
,
glow_sPoint
*
pointarray
,
int
point_cnt
,
int
highlight
,
int
hot
)
{
int
i
;
if
(
points
)
{
// erase( pos, hot, NULL);
// nav_erase( pos, NULL);
free
((
char
*
)
points
);
}
points
=
(
glow_sPointX
*
)
calloc
(
a_points
.
a_size
+
point_cnt
,
sizeof
(
glow_sPointX
));
for
(
i
=
0
;
i
<
point_cnt
;
i
++
)
{
for
(
i
nt
i
=
0
;
i
<
point_cnt
;
i
++
)
{
GlowPoint
*
p
=
new
GlowPoint
(
ctx
,
pointarray
[
i
].
x
,
pointarray
[
i
].
y
);
a_points
.
insert
(
p
);
}
zoom
();
nav_zoom
();
ctx
->
set_dirty
();
}
xtt/lib/glow/src/glow_polyline.h
View file @
f32864a0
...
...
@@ -64,14 +64,17 @@ public:
void
set_fill
(
int
fillval
)
{
fill
=
fillval
;
ctx
->
set_dirty
();
}
void
set_drawtype
(
glow_eDrawType
drawtype
)
{
draw_type
=
drawtype
;
ctx
->
set_dirty
();
}
void
set_linewidth
(
int
linewidth
)
{
line_width
=
linewidth
;
ctx
->
set_dirty
();
}
void
add_points
(
void
*
pos
,
glow_sPoint
*
pointarray
,
int
point_cnt
,
int
highlight
,
int
hot
);
...
...
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