[openrtm-commit:01176] r486 - in branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor: template ui/editor

[openrtm ＠ openrtm.org]

Author: win-ei
Date: 2014-01-23 09:30:07 +0900 (Thu, 23 Jan 2014)
New Revision: 486

Modified:
   branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/template/EcAwakingTbl.c.vsl
   branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/AbstractSystemDiagramEditor.java
Log:
Daily work.

Modified: branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/template/EcAwakingTbl.c.vsl
===================================================================
--- branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/template/EcAwakingTbl.c.vsl	2014-01-22 01:21:43 UTC (rev 485)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/template/EcAwakingTbl.c.vsl	2014-01-23 00:30:07 UTC (rev 486)
@@ -40,19 +40,14 @@
         3,                                 /* MinorTimeWindow number */
         1,                                 /* Share MinorTimeWindow number */
         EC_INDEX_RECEIVE_EC                /* wakesup ECIndex */
-    },
+    }#foreach($comp in $comps),
     {
         1,                                 /* Timing of MajorTimeWindow which wakes up(Wakes up at the time of the multiple of thea specification number) */
-        5,                                 /* MinorTimeWindow number */
+       #set($number = $velocityCount+4) $number,                                 /* MinorTimeWindow number */
         5,                                 /* Share MinorTimeWindow number */
-        EC_INDEX_MYRTCEC_DEMO_ACCELERATION /* wakesup ECIndex */
-    },
-    {
-        1,                                 /* Timing of MajorTimeWindow which wakes up(Wakes up at the time of the multiple of thea specification number) */
-        10,                                /* MinorTimeWindow number */
-        2,                                 /* Share MinorTimeWindow number */
-        EC_INDEX_MYRTCEC_DEMO_LED          /* wakesup ECIndex */
-    }
+        EC_INDEX_MYRTCEC_${comp.toUpperCase()} /* wakesup ECIndex */
+    }#end
+
 };
 
 

Modified: branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/AbstractSystemDiagramEditor.java
===================================================================
--- branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/AbstractSystemDiagramEditor.java	2014-01-22 01:21:43 UTC (rev 485)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/AbstractSystemDiagramEditor.java	2014-01-23 00:30:07 UTC (rev 486)
@@ -839,7 +839,7 @@
 					PrintWriter pw = new PrintWriter(bw);
 					pw.println(gr.getCode());
 					pw.close();
-					System.out.println(gr.getCode());
+					//System.out.println(gr.getCode());
 					}
 					//
 					//EcAwakingTbl.c
@@ -851,6 +851,15 @@
 					String dataPortContct = tablepath+"\\EcAwakingTbl.c";
 					Map<String, Object> contextMap = new HashMap<String, Object>();
 					contextMap.put("template", TEMPLATE_PATH);
+					List<org.openrtp.namespaces.rts.version02.Component> componetns = profile.getComponents();
+					ArrayList complist = new ArrayList();
+					for(org.openrtp.namespaces.rts.version02.Component comp :componetns)
+					{
+						System.out.println(comp.getId());
+						String[] strary = comp.getId().split(":");
+						complist.add(strary[3]); 
+					}
+					contextMap.put("comps", complist);
 					GeneratedResult gr = TemplateUtil.createGeneratedResult(ins, contextMap, dataPortContct);
 					File targetFile = new File(dataPortContct);
 					FileWriter filewriter = new FileWriter(targetFile);
@@ -858,7 +867,7 @@
 					PrintWriter pw = new PrintWriter(bw);
 					pw.println(gr.getCode());
 					pw.close();
-					//System.out.println(gr.getCode());
+					System.out.println(gr.getCode());
 					}
 				}