Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
TTool
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor 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
mbe-tools
TTool
Commits
524c3a2b
Commit
524c3a2b
authored
6 years ago
by
Ludovic Apvrille
Browse files
Options
Downloads
Patches
Plain Diff
Update on composite compnents tests
parent
7a7cd69f
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
modeling/AVATAR/testCompositeStates.xml
+9
-8
9 additions, 8 deletions
modeling/AVATAR/testCompositeStates.xml
src/main/java/avatartranslator/AvatarStateMachine.java
+2
-0
2 additions, 0 deletions
src/main/java/avatartranslator/AvatarStateMachine.java
with
11 additions
and
8 deletions
modeling/AVATAR/testCompositeStates.xml
+
9
−
8
View file @
524c3a2b
...
@@ -228,8 +228,8 @@
...
@@ -228,8 +228,8 @@
</SUBCOMPONENT>
</SUBCOMPONENT>
<COMPONENT
type=
"5103"
id=
"91"
>
<COMPONENT
type=
"5103"
id=
"91"
>
<cdparam
x=
"37
4
"
y=
"386"
/>
<cdparam
x=
"37
8
"
y=
"386"
/>
<sizeparam
width=
"
67
"
height=
"20"
minWidth=
"30"
minHeight=
"1"
maxWidth=
"2000"
maxHeight=
"2000"
minDesiredWidth=
"0"
minDesiredHeight=
"0"
/>
<sizeparam
width=
"
59
"
height=
"20"
minWidth=
"30"
minHeight=
"1"
maxWidth=
"2000"
maxHeight=
"2000"
minDesiredWidth=
"0"
minDesiredHeight=
"0"
/>
<hidden
value=
"false"
/>
<hidden
value=
"false"
/>
<enabled
value=
"true"
/>
<enabled
value=
"true"
/>
<cdrectangleparam
minX=
"10"
maxX=
"2500"
minY=
"10"
maxY=
"1500"
/>
<cdrectangleparam
minX=
"10"
maxX=
"2500"
minY=
"10"
maxY=
"1500"
/>
...
@@ -307,8 +307,8 @@
...
@@ -307,8 +307,8 @@
</COMPONENT>
</COMPONENT>
<COMPONENT
type=
"5103"
id=
"145"
>
<COMPONENT
type=
"5103"
id=
"145"
>
<cdparam
x=
"3
58
"
y=
"215"
/>
<cdparam
x=
"3
62
"
y=
"215"
/>
<sizeparam
width=
"
56
"
height=
"20"
minWidth=
"30"
minHeight=
"1"
maxWidth=
"2000"
maxHeight=
"2000"
minDesiredWidth=
"0"
minDesiredHeight=
"0"
/>
<sizeparam
width=
"
49
"
height=
"20"
minWidth=
"30"
minHeight=
"1"
maxWidth=
"2000"
maxHeight=
"2000"
minDesiredWidth=
"0"
minDesiredHeight=
"0"
/>
<hidden
value=
"false"
/>
<hidden
value=
"false"
/>
<enabled
value=
"true"
/>
<enabled
value=
"true"
/>
<cdrectangleparam
minX=
"10"
maxX=
"2500"
minY=
"10"
maxY=
"1500"
/>
<cdrectangleparam
minX=
"10"
maxX=
"2500"
minY=
"10"
maxY=
"1500"
/>
...
@@ -549,8 +549,8 @@
...
@@ -549,8 +549,8 @@
</SUBCOMPONENT>
</SUBCOMPONENT>
<COMPONENT
type=
"5104"
id=
"207"
>
<COMPONENT
type=
"5104"
id=
"207"
>
<cdparam
x=
"3
87
"
y=
"367"
/>
<cdparam
x=
"3
91
"
y=
"367"
/>
<sizeparam
width=
"7
5
"
height=
"20"
minWidth=
"30"
minHeight=
"1"
maxWidth=
"2000"
maxHeight=
"2000"
minDesiredWidth=
"0"
minDesiredHeight=
"0"
/>
<sizeparam
width=
"
6
7"
height=
"20"
minWidth=
"30"
minHeight=
"1"
maxWidth=
"2000"
maxHeight=
"2000"
minDesiredWidth=
"0"
minDesiredHeight=
"0"
/>
<hidden
value=
"false"
/>
<hidden
value=
"false"
/>
<enabled
value=
"true"
/>
<enabled
value=
"true"
/>
<cdrectangleparam
minX=
"10"
maxX=
"2500"
minY=
"10"
maxY=
"1500"
/>
<cdrectangleparam
minX=
"10"
maxX=
"2500"
minY=
"10"
maxY=
"1500"
/>
...
@@ -565,11 +565,12 @@
...
@@ -565,11 +565,12 @@
<TGConnectingPoint
num=
"7"
id=
"204"
/>
<TGConnectingPoint
num=
"7"
id=
"204"
/>
<TGConnectingPoint
num=
"8"
id=
"205"
/>
<TGConnectingPoint
num=
"8"
id=
"205"
/>
<TGConnectingPoint
num=
"9"
id=
"206"
/>
<TGConnectingPoint
num=
"9"
id=
"206"
/>
<accessibility
/>
</COMPONENT>
</COMPONENT>
<COMPONENT
type=
"5104"
id=
"218"
>
<COMPONENT
type=
"5104"
id=
"218"
>
<cdparam
x=
"38
3
"
y=
"260"
/>
<cdparam
x=
"38
7
"
y=
"260"
/>
<sizeparam
width=
"
64
"
height=
"20"
minWidth=
"30"
minHeight=
"1"
maxWidth=
"2000"
maxHeight=
"2000"
minDesiredWidth=
"0"
minDesiredHeight=
"0"
/>
<sizeparam
width=
"
57
"
height=
"20"
minWidth=
"30"
minHeight=
"1"
maxWidth=
"2000"
maxHeight=
"2000"
minDesiredWidth=
"0"
minDesiredHeight=
"0"
/>
<hidden
value=
"false"
/>
<hidden
value=
"false"
/>
<enabled
value=
"true"
/>
<enabled
value=
"true"
/>
<cdrectangleparam
minX=
"10"
maxX=
"2500"
minY=
"10"
maxY=
"1500"
/>
<cdrectangleparam
minX=
"10"
maxX=
"2500"
minY=
"10"
maxY=
"1500"
/>
...
...
This diff is collapsed.
Click to expand it.
src/main/java/avatartranslator/AvatarStateMachine.java
+
2
−
0
View file @
524c3a2b
...
@@ -1358,6 +1358,8 @@ public class AvatarStateMachine extends AvatarElement {
...
@@ -1358,6 +1358,8 @@ public class AvatarStateMachine extends AvatarElement {
while
((
current
!=
null
)
&&
!(
current
instanceof
AvatarState
))
{
while
((
current
!=
null
)
&&
!(
current
instanceof
AvatarState
))
{
//TraceManager.addDev("Cloning: " + current);
//TraceManager.addDev("Cloning: " + current);
current
.
setNotCheckable
();
current
.
setAsVerifiable
(
false
);
tmp
=
current
.
basicCloneMe
(
block
);
tmp
=
current
.
basicCloneMe
(
block
);
addElement
(
tmp
);
addElement
(
tmp
);
tomake
.
addNext
(
tmp
);
tomake
.
addNext
(
tmp
);
...
...
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