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
02c3902d
Commit
02c3902d
authored
5 years ago
by
Daniela Genius
Browse files
Options
Downloads
Patches
Plain Diff
bugfix name of clocks
parent
082327b2
No related branches found
No related tags found
2 merge requests
!255
New lip6
,
!253
New lip6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/ui/SysCAMSPanelTranslator.java
+13
-6
13 additions, 6 deletions
src/main/java/ui/SysCAMSPanelTranslator.java
with
13 additions
and
6 deletions
src/main/java/ui/SysCAMSPanelTranslator.java
+
13
−
6
View file @
02c3902d
...
@@ -66,7 +66,7 @@ public class SysCAMSPanelTranslator {
...
@@ -66,7 +66,7 @@ public class SysCAMSPanelTranslator {
syscamsComponents
=
new
LinkedList
<
SysCAMSTComponent
>();
syscamsComponents
=
new
LinkedList
<
SysCAMSTComponent
>();
syscamsConnectors
=
new
LinkedList
<
SysCAMSTConnector
>();
syscamsConnectors
=
new
LinkedList
<
SysCAMSTConnector
>();
System
.
out
.
println
(
"@@@ Panel Translator "
);
MakeListOfComponent
(
_syscamsDiagramPanel
);
MakeListOfComponent
(
_syscamsDiagramPanel
);
}
}
...
@@ -158,25 +158,31 @@ public class SysCAMSPanelTranslator {
...
@@ -158,25 +158,31 @@ public class SysCAMSPanelTranslator {
}
}
syscamsMap
.
put
(
blockDE
,
syscamsBlockDE
);
syscamsMap
.
put
(
blockDE
,
syscamsBlockDE
);
// System.out.println("@@@ DE block put in map @@@");
// System.out.println("@@@ DE block put in map @@@");
syscamsComponents
.
add
(
syscamsBlockDE
);
syscamsComponents
.
add
(
syscamsBlockDE
);
System
.
out
.
println
(
"@@@ Panel Translator BlockDE name @@@ "
+
blockDEName
);
}
else
if
(
dp
instanceof
SysCAMSClock
)
{
}
else
if
(
dp
instanceof
SysCAMSClock
)
{
SysCAMSClock
clock
=
(
SysCAMSClock
)
dp
;
String
clockName
=
clock
.
getName
();
SysCAMSClock
clock
=
(
SysCAMSClock
)
dp
;
//String clockName = clock.getName();
String
clockName
=
clock
.
getValue
();
double
frequency
=
clock
.
getFrequency
();
double
frequency
=
clock
.
getFrequency
();
String
unit
=
clock
.
getUnit
();
String
unit
=
clock
.
getUnit
();
double
dutyCycle
=
clock
.
getDutyCycle
();
double
dutyCycle
=
clock
.
getDutyCycle
();
double
startTime
=
clock
.
getStartTime
();
double
startTime
=
clock
.
getStartTime
();
String
unitStartTime
=
clock
.
getUnitStartTime
();
String
unitStartTime
=
clock
.
getUnitStartTime
();
boolean
posFirst
=
clock
.
getPosFirst
();
boolean
posFirst
=
clock
.
getPosFirst
();
System
.
out
.
println
(
"@@@ Panel Translator clock name @@@ "
+
clockName
);
SysCAMSTClock
syscamsClock
=
new
SysCAMSTClock
(
clockName
,
frequency
,
unit
,
dutyCycle
,
startTime
,
unitStartTime
,
posFirst
);
SysCAMSTClock
syscamsClock
=
new
SysCAMSTClock
(
clockName
,
frequency
,
unit
,
dutyCycle
,
startTime
,
unitStartTime
,
posFirst
);
syscamsMap
.
put
(
clock
,
syscamsClock
);
syscamsMap
.
put
(
clock
,
syscamsClock
);
//
System.out.println("@@@ Clock put in map @@@");
System
.
out
.
println
(
"@@@ Clock put in map @@@"
);
syscamsComponents
.
add
(
syscamsClock
);
syscamsComponents
.
add
(
syscamsClock
);
}
else
if
(
dp
instanceof
SysCAMSCompositeComponent
)
{
}
else
if
(
dp
instanceof
SysCAMSCompositeComponent
)
{
...
@@ -306,7 +312,8 @@ public class SysCAMSPanelTranslator {
...
@@ -306,7 +312,8 @@ public class SysCAMSPanelTranslator {
for
(
int
i
=
0
;
i
<
clocks
.
size
();
i
++)
{
for
(
int
i
=
0
;
i
<
clocks
.
size
();
i
++)
{
SysCAMSClock
clock
=
clocks
.
get
(
i
);
SysCAMSClock
clock
=
clocks
.
get
(
i
);
String
clockName
=
clock
.
getName
();
// String clockName = clock.getName();
String
clockName
=
clock
.
getValue
();
double
frequency
=
clock
.
getFrequency
();
double
frequency
=
clock
.
getFrequency
();
String
unit
=
clock
.
getUnit
();
String
unit
=
clock
.
getUnit
();
double
dutyCycle
=
clock
.
getDutyCycle
();
double
dutyCycle
=
clock
.
getDutyCycle
();
...
...
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