[openrtm-commit:00558] r237 - in trunk/rtmtools/jp.go.aist.rtm.rtcbuilder: resource/100/CXX/ExecutionCxt resource/100/CXX/constraint/Constraint1 resource/100/CXX/constraint/Constraint2 resource/100/CXX/constraint/Constraint3 src/jp/go/aist/rtm/rtcbuilder/template src/jp/go/aist/rtm/rtcbuilder/template/common
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2012年 1月 7日 (土) 00:50:46 JST
Author: sakamoto
Date: 2012-01-07 00:50:45 +0900 (Sat, 07 Jan 2012)
New Revision: 237
Modified:
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/foo.conf
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/foo.conf
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/foo.conf
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/foo.conf
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/TemplateHelper.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/Component.conf.vsl
Log:
modify XXX.conf #2299
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/foo.conf
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/foo.conf 2012-01-05 17:09:47 UTC (rev 236)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/foo.conf 2012-01-06 15:50:45 UTC (rev 237)
@@ -103,7 +103,6 @@
# conf.__widget__.vector_param1: orderd_list
-
# conf.__constraints__.int_param0: 0<=x<=150
# conf.__constraints__.int_param1: 0<=x<=1000
# conf.__constraints__.double_param0: 0<=x<=100
@@ -112,8 +111,6 @@
# conf.__constraints__.vector_param0: (dog,monky,pheasant,cat)
# conf.__constraints__.vector_param1: (pita,gora,switch)
-
-
##============================================================
## Execution context settings
##============================================================
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/foo.conf
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/foo.conf 2012-01-05 17:09:47 UTC (rev 236)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/foo.conf 2012-01-06 15:50:45 UTC (rev 237)
@@ -103,18 +103,8 @@
# conf.__widget__.vector_param1: orderd_list
+# conf.__constraints__.int_param0, 0<x<1
-# conf.__constraints__.int_param0: 0<=x<=150
-# conf.__constraints__.int_param1: 0<=x<=1000
-# conf.__constraints__.double_param0: 0<=x<=100
-# conf.__constraints__.double_param1:
-# conf.__constraints__.str_param0: (default,mode0,mode1)
-# conf.__constraints__.vector_param0: (dog,monky,pheasant,cat)
-# conf.__constraints__.vector_param1: (pita,gora,switch)
-
-conf.__constraints__.int_param0, 0<x<1
-
-
##============================================================
## Execution context settings
##============================================================
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/foo.conf
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/foo.conf 2012-01-05 17:09:47 UTC (rev 236)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/foo.conf 2012-01-06 15:50:45 UTC (rev 237)
@@ -103,19 +103,9 @@
# conf.__widget__.vector_param1: orderd_list
+# conf.__constraints__.int_param0, 0<x<1
+# conf.__constraints__.str_param0, (up, down, right, left)
-# conf.__constraints__.int_param0: 0<=x<=150
-# conf.__constraints__.int_param1: 0<=x<=1000
-# conf.__constraints__.double_param0: 0<=x<=100
-# conf.__constraints__.double_param1:
-# conf.__constraints__.str_param0: (default,mode0,mode1)
-# conf.__constraints__.vector_param0: (dog,monky,pheasant,cat)
-# conf.__constraints__.vector_param1: (pita,gora,switch)
-
-conf.__constraints__.int_param0, 0<x<1
-conf.__constraints__.str_param0, (up, down, right, left)
-
-
##============================================================
## Execution context settings
##============================================================
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/foo.conf
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/foo.conf 2012-01-05 17:09:47 UTC (rev 236)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/foo.conf 2012-01-06 15:50:45 UTC (rev 237)
@@ -103,20 +103,10 @@
# conf.__widget__.vector_param1: orderd_list
+# conf.__constraints__.int_param0, 0<x<1
+# conf.__constraints__.str_param0, (up, down, right, left)
+# conf.__constraints__.double_param0, 1.5<=x<=3.2
-# conf.__constraints__.int_param0: 0<=x<=150
-# conf.__constraints__.int_param1: 0<=x<=1000
-# conf.__constraints__.double_param0: 0<=x<=100
-# conf.__constraints__.double_param1:
-# conf.__constraints__.str_param0: (default,mode0,mode1)
-# conf.__constraints__.vector_param0: (dog,monky,pheasant,cat)
-# conf.__constraints__.vector_param1: (pita,gora,switch)
-
-conf.__constraints__.int_param0, 0<x<1
-conf.__constraints__.str_param0, (up, down, right, left)
-conf.__constraints__.double_param0, 1.5<=x<=3.2
-
-
##============================================================
## Execution context settings
##============================================================
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/TemplateHelper.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/TemplateHelper.java 2012-01-05 17:09:47 UTC (rev 236)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/TemplateHelper.java 2012-01-06 15:50:45 UTC (rev 237)
@@ -3,6 +3,7 @@
import java.io.File;
import jp.go.aist.rtm.rtcbuilder.generator.param.ConfigParameterParam;
+import jp.go.aist.rtm.rtcbuilder.generator.param.ConfigSetParam;
import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
import static jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants.*;
@@ -265,4 +266,22 @@
}
return "";
}
+
+ public boolean checkNotWidget(RtcParam param) {
+ for(ConfigSetParam target : param.getConfigParams()) {
+ if( target.getWidget()!=null && 0<target.getWidget().length() ) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ public boolean checkNotConstraint(RtcParam param) {
+ for(ConfigSetParam target : param.getConfigParams()) {
+ if( target.getConstraint()!=null && 0<target.getConstraint().length() ) {
+ return false;
+ }
+ }
+ return true;
+ }
}
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/Component.conf.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/Component.conf.vsl 2012-01-05 17:09:47 UTC (rev 236)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/Component.conf.vsl 2012-01-06 15:50:45 UTC (rev 237)
@@ -93,6 +93,7 @@
${sharp}${sharp} - array: <constraints0>, ,constraints1>, ... for only array value
${sharp}${sharp} - hash: {key0: value0, key1:, value0, ...}
${sharp}${sharp}
+#if(${tmpltHelper.checkNotWidget(${rtcParam})})
${sharp}${sharp} examples:
${sharp} conf.__widget__.int_param0: slider.10
${sharp} conf.__widget__.int_param1: spin
@@ -101,14 +102,16 @@
${sharp} conf.__widget__.str_param0: radio
${sharp} conf.__widget__.vector_param0: checkbox
${sharp} conf.__widget__.vector_param1: orderd_list
-
+#else
#foreach($configParam in ${rtcParam.configParams})
#if( ${configParam.widget.length()} > 0 )
-conf.__widget__.${configParam.name}, ${configParam.widget}#if( ${configParam.step.length()} > 0 ).${configParam.step}#end
+${sharp} conf.__widget__.${configParam.name}, ${configParam.widget}#if( ${configParam.step.length()} > 0 ).${configParam.step}#end
#end
#end
+#end
+#if(${tmpltHelper.checkNotConstraint(${rtcParam})})
${sharp} conf.__constraints__.int_param0: 0<=x<=150
${sharp} conf.__constraints__.int_param1: 0<=x<=1000
${sharp} conf.__constraints__.double_param0: 0<=x<=100
@@ -116,14 +119,14 @@
${sharp} conf.__constraints__.str_param0: (default,mode0,mode1)
${sharp} conf.__constraints__.vector_param0: (dog,monky,pheasant,cat)
${sharp} conf.__constraints__.vector_param1: (pita,gora,switch)
-
+#else
#foreach($configParam in ${rtcParam.configParams})
#if( ${configParam.constraint.length()} > 0 )
-conf.__constraints__.${configParam.name}, ${configParam.constraint}
+${sharp} conf.__constraints__.${configParam.name}, ${configParam.constraint}
#end
#end
+#end
-
${sharp}${sharp}============================================================
${sharp}${sharp} Execution context settings
${sharp}${sharp}============================================================
openrtm-commit メーリングリストの案内