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
bed7fb61
Commit
bed7fb61
authored
Jan 02, 2017
by
Claes Sjofors
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ge bugfix in move dynamic with scale in combination with DigSwap
parent
2679958e
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
23 additions
and
0 deletions
+23
-0
xtt/lib/ge/src/ge_dyn.cpp
xtt/lib/ge/src/ge_dyn.cpp
+8
-0
xtt/lib/glow/src/glow_array_elem.h
xtt/lib/glow/src/glow_array_elem.h
+1
-0
xtt/lib/glow/src/glow_growapi.cpp
xtt/lib/glow/src/glow_growapi.cpp
+5
-0
xtt/lib/glow/src/glow_growapi.h
xtt/lib/glow/src/glow_growapi.h
+6
-0
xtt/lib/glow/src/glow_grownode.h
xtt/lib/glow/src/glow_grownode.h
+1
-0
xtt/lib/glow/src/glow_transform.h
xtt/lib/glow/src/glow_transform.h
+2
-0
No files found.
xtt/lib/ge/src/ge_dyn.cpp
View file @
bed7fb61
...
@@ -6027,6 +6027,13 @@ int GeMove::connect( grow_tObject object, glow_sTraceData *trace_data)
...
@@ -6027,6 +6027,13 @@ int GeMove::connect( grow_tObject object, glow_sTraceData *trace_data)
width_orig
=
ur_x
-
x_orig
;
width_orig
=
ur_x
-
x_orig
;
height_orig
=
ur_y
-
y_orig
;
height_orig
=
ur_y
-
y_orig
;
}
}
else
{
grow_RevertTransform
(
object
);
grow_GetObjectBorder
(
object
);
grow_MeasureNode
(
object
,
&
x_orig
,
&
y_orig
,
&
ur_x
,
&
ur_y
);
width_orig
=
ur_x
-
x_orig
;
height_orig
=
ur_y
-
y_orig
;
}
return
1
;
return
1
;
}
}
...
@@ -6041,6 +6048,7 @@ int GeMove::disconnect( grow_tObject object)
...
@@ -6041,6 +6048,7 @@ int GeMove::disconnect( grow_tObject object)
if
(
scale_y_p
&&
scale_y_db
==
graph_eDatabase_Gdh
)
if
(
scale_y_p
&&
scale_y_db
==
graph_eDatabase_Gdh
)
gdh_UnrefObjectInfo
(
scale_y_subid
);
gdh_UnrefObjectInfo
(
scale_y_subid
);
move_x_p
=
move_y_p
=
scale_x_p
=
scale_y_p
=
0
;
move_x_p
=
move_y_p
=
scale_x_p
=
scale_y_p
=
0
;
return
1
;
return
1
;
}
}
...
...
xtt/lib/glow/src/glow_array_elem.h
View file @
bed7fb61
...
@@ -189,6 +189,7 @@ class GlowArrayElem {
...
@@ -189,6 +189,7 @@ class GlowArrayElem {
virtual
void
set_transform
(
GlowTransform
*
t
)
{};
virtual
void
set_transform
(
GlowTransform
*
t
)
{};
virtual
void
set_transform_from_stored
(
GlowTransform
*
t
)
{};
virtual
void
set_transform_from_stored
(
GlowTransform
*
t
)
{};
virtual
void
store_transform
()
{};
virtual
void
store_transform
()
{};
virtual
void
revert_transform
()
{};
virtual
bool
transform_is_stored
()
{
return
false
;};
virtual
bool
transform_is_stored
()
{
return
false
;};
virtual
void
get_node_borders
()
{};
virtual
void
get_node_borders
()
{};
virtual
void
get_ctx
(
void
**
ctx
)
{};
virtual
void
get_ctx
(
void
**
ctx
)
{};
...
...
xtt/lib/glow/src/glow_growapi.cpp
View file @
bed7fb61
...
@@ -4831,6 +4831,11 @@ void grow_StoreTransform( grow_tObject object)
...
@@ -4831,6 +4831,11 @@ void grow_StoreTransform( grow_tObject object)
((
GlowArrayElem
*
)
object
)
->
store_transform
();
((
GlowArrayElem
*
)
object
)
->
store_transform
();
}
}
void
grow_RevertTransform
(
grow_tObject
object
)
{
((
GlowArrayElem
*
)
object
)
->
revert_transform
();
}
int
grow_TransformIsStored
(
grow_tObject
object
)
int
grow_TransformIsStored
(
grow_tObject
object
)
{
{
return
(
int
)
((
GlowArrayElem
*
)
object
)
->
transform_is_stored
();
return
(
int
)
((
GlowArrayElem
*
)
object
)
->
transform_is_stored
();
...
...
xtt/lib/glow/src/glow_growapi.h
View file @
bed7fb61
...
@@ -2251,6 +2251,12 @@ extern "C" {
...
@@ -2251,6 +2251,12 @@ extern "C" {
*/
*/
void
grow_StoreTransform
(
grow_tObject
object
);
void
grow_StoreTransform
(
grow_tObject
object
);
//! Revert transform to stored state.
/*!
\param object Object.
*/
void
grow_RevertTransform
(
grow_tObject
object
);
//! Check if there is a stored transform
//! Check if there is a stored transform
/*!
/*!
\return Returns 1 if the transform is previously stored with a call to grow_StoreTransform.
\return Returns 1 if the transform is previously stored with a call to grow_StoreTransform.
...
...
xtt/lib/glow/src/glow_grownode.h
View file @
bed7fb61
...
@@ -689,6 +689,7 @@ class GrowNode : public GlowNode {
...
@@ -689,6 +689,7 @@ class GrowNode : public GlowNode {
/*! The stored transform can be used as starting point for future scaling or rotations.
/*! The stored transform can be used as starting point for future scaling or rotations.
*/
*/
void
store_transform
()
{
trf
.
store
();
};
void
store_transform
()
{
trf
.
store
();
};
void
revert_transform
()
{
trf
.
revert
();
get_node_borders
();};
//! Check if there is a stored transform
//! Check if there is a stored transform
/*!
/*!
...
...
xtt/lib/glow/src/glow_transform.h
View file @
bed7fb61
...
@@ -66,6 +66,8 @@ class GlowTransform {
...
@@ -66,6 +66,8 @@ class GlowTransform {
double
rot
()
{
return
rotation
;};
double
rot
()
{
return
rotation
;};
void
store
()
{
s_a11
=
a11
;
s_a12
=
a12
;
s_a13
=
a13
;
s_a21
=
a21
;
s_a22
=
a22
;
s_a23
=
a23
;
void
store
()
{
s_a11
=
a11
;
s_a12
=
a12
;
s_a13
=
a13
;
s_a21
=
a21
;
s_a22
=
a22
;
s_a23
=
a23
;
s_rotation
=
rotation
;
stored
=
true
;};
s_rotation
=
rotation
;
stored
=
true
;};
void
revert
()
{
a11
=
s_a11
;
a12
=
s_a12
;
a13
=
s_a13
;
a21
=
s_a21
;
a22
=
s_a22
;
a23
=
s_a23
;
rotation
=
s_rotation
;};
void
scale_from_stored
(
double
sx
,
double
sy
,
double
x0
,
double
y0
);
void
scale_from_stored
(
double
sx
,
double
sy
,
double
x0
,
double
y0
);
void
rotate_from_stored
(
double
angle
,
double
x0
,
double
y0
);
void
rotate_from_stored
(
double
angle
,
double
x0
,
double
y0
);
void
move_from_stored
(
double
x0
,
double
y0
);
void
move_from_stored
(
double
x0
,
double
y0
);
...
...
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