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
5b5a2598
Commit
5b5a2598
authored
May 28, 2019
by
Christoffer Ackelman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added missing line from junction to (not yet created) FlowCon/GlowCon.
parent
fdd4a7b6
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
10 deletions
+24
-10
xtt/lib/flow/src/flow_ctx.cpp
xtt/lib/flow/src/flow_ctx.cpp
+4
-0
xtt/lib/glow/src/glow_ctx.cpp
xtt/lib/glow/src/glow_ctx.cpp
+4
-0
xtt/lib/glow/src/glow_growctx.cpp
xtt/lib/glow/src/glow_growctx.cpp
+16
-10
No files found.
xtt/lib/flow/src/flow_ctx.cpp
View file @
5b5a2598
...
@@ -557,6 +557,10 @@ void FlowCtx::draw(int ll_x, int ll_y, int ur_x, int ur_y)
...
@@ -557,6 +557,10 @@ void FlowCtx::draw(int ll_x, int ll_y, int ur_x, int ur_y)
select_rect_ur_x
-
select_rect_ll_x
,
select_rect_ur_x
-
select_rect_ll_x
,
select_rect_ur_y
-
select_rect_ll_y
,
flow_eDrawType_Line
,
0
,
0
);
select_rect_ur_y
-
select_rect_ll_y
,
flow_eDrawType_Line
,
0
,
0
);
}
}
if
(
con_create_active
)
{
fdraw
->
line
(
con_create_conpoint_x
,
con_create_conpoint_y
,
con_create_last_x
,
con_create_last_y
,
flow_eDrawType_Line
,
0
);
}
tiptext
->
draw
();
tiptext
->
draw
();
}
}
...
...
xtt/lib/glow/src/glow_ctx.cpp
View file @
5b5a2598
...
@@ -731,6 +731,10 @@ void GlowCtx::draw(DrawWind* w, int ll_x, int ll_y, int ur_x, int ur_y)
...
@@ -731,6 +731,10 @@ void GlowCtx::draw(DrawWind* w, int ll_x, int ll_y, int ur_x, int ur_y)
select_rect_ur_x
-
select_rect_ll_x
,
select_rect_ur_x
-
select_rect_ll_x
,
select_rect_ur_y
-
select_rect_ll_y
,
glow_eDrawType_Line
,
0
,
0
);
select_rect_ur_y
-
select_rect_ll_y
,
glow_eDrawType_Line
,
0
,
0
);
}
}
if
(
con_create_active
)
{
gdraw
->
line
(
con_create_conpoint_x
,
con_create_conpoint_y
,
con_create_last_x
,
con_create_last_y
,
glow_eDrawType_Line
,
0
);
}
if
(
show_grid
)
if
(
show_grid
)
draw_grid
(
mw
,
ll_x
,
ll_y
,
ur_x
,
ur_y
);
draw_grid
(
mw
,
ll_x
,
ll_y
,
ur_x
,
ur_y
);
}
else
if
(
w
==
navw
)
{
}
else
if
(
w
==
navw
)
{
...
...
xtt/lib/glow/src/glow_growctx.cpp
View file @
5b5a2598
...
@@ -2483,7 +2483,8 @@ void GrowCtx::draw(DrawWind* w, int ll_x, int ll_y, int ur_x, int ur_y)
...
@@ -2483,7 +2483,8 @@ void GrowCtx::draw(DrawWind* w, int ll_x, int ll_y, int ur_x, int ur_y)
}
}
gdraw
->
reset_clip_rectangle
(
w
);
gdraw
->
reset_clip_rectangle
(
w
);
if
(
w
==
mw
&&
select_rect_active
)
{
if
(
w
==
mw
)
{
if
(
select_rect_active
)
{
if
(
edit_mode
==
grow_eMode_Circle
)
if
(
edit_mode
==
grow_eMode_Circle
)
gdraw
->
arc
(
select_rect_ll_x
,
select_rect_ll_y
,
gdraw
->
arc
(
select_rect_ll_x
,
select_rect_ll_y
,
select_rect_ur_x
-
select_rect_ll_x
,
select_rect_ur_x
-
select_rect_ll_x
,
...
@@ -2493,6 +2494,11 @@ void GrowCtx::draw(DrawWind* w, int ll_x, int ll_y, int ur_x, int ur_y)
...
@@ -2493,6 +2494,11 @@ void GrowCtx::draw(DrawWind* w, int ll_x, int ll_y, int ur_x, int ur_y)
gdraw
->
rect
(
select_rect_ll_x
,
select_rect_ll_y
,
gdraw
->
rect
(
select_rect_ll_x
,
select_rect_ll_y
,
select_rect_ur_x
-
select_rect_ll_x
,
select_rect_ur_x
-
select_rect_ll_x
,
select_rect_ur_y
-
select_rect_ll_y
,
glow_eDrawType_Line
,
0
,
0
);
select_rect_ur_y
-
select_rect_ll_y
,
glow_eDrawType_Line
,
0
,
0
);
}
if
(
con_create_active
)
{
gdraw
->
line
(
con_create_conpoint_x
,
con_create_conpoint_y
,
con_create_last_x
,
con_create_last_y
,
glow_eDrawType_Line
,
0
);
}
}
else
if
(
w
==
navw
)
{
}
else
if
(
w
==
navw
)
{
nav_rect_ll_x
=
int
(
nav_rect_ll_x
=
int
(
navw
->
zoom_factor_x
*
mw
->
offset_x
/
mw
->
zoom_factor_x
-
navw
->
offset_x
);
navw
->
zoom_factor_x
*
mw
->
offset_x
/
mw
->
zoom_factor_x
-
navw
->
offset_x
);
...
...
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