[Robotflow-cvs] RobotFlow/demo/SymbolRecog/n-files SymbolTracking.n,1.5,1.6

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/robotflow/RobotFlow/demo/SymbolRecog/n-files
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23006

Modified Files:
	SymbolTracking.n 
Log Message:
fixed demo'


Index: SymbolTracking.n
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/demo/SymbolRecog/n-files/SymbolTracking.n,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SymbolTracking.n	26 Aug 2004 13:04:02 -0000	1.5
--- SymbolTracking.n	26 Aug 2004 15:13:26 -0000	1.6
***************
*** 38,42 ****
        <Parameter name="VALUE" type="bool" value="true" description="The value"/>
      </Node>
!     <Node name="node_SNCRZ30_1" type="SNCRZ30" x="-849.000000" y="187.000000">
        <Parameter name="PAN_SPEED" type="int" value="24" description="Pan speed 0-24"/>
        <Parameter name="TILT_SPEED" type="int" value="20" description="Tilt speed 0-20"/>
--- 38,42 ----
        <Parameter name="VALUE" type="bool" value="true" description="The value"/>
      </Node>
!     <Node name="node_SNCRZ30_1" type="SNCRZ30" x="-847.000000" y="183.000000">
        <Parameter name="PAN_SPEED" type="int" value="24" description="Pan speed 0-24"/>
        <Parameter name="TILT_SPEED" type="int" value="20" description="Tilt speed 0-20"/>
***************
*** 46,59 ****
      </Node>
      <Node name="node_RGB242RGB15_1" type="RGB242RGB15" x="-525.000000" y="245.000000"/>
!     <Node name="node_NilObject_1" type="NilObject" x="-1091.000000" y="172.000000"/>
!     <Node name="node_Feedback_1" type="Feedback" x="161.000000" y="245.000000">
        <Parameter name="DELAY" type="int" value="1" description="Number of iteration for the delay"/>
        <Parameter name="BEFORE_LIMIT" type="int" value="0" description="When count - DELAY is smaller or equal to BEFORE_LIMIT, the input is pulled from BEFORE at (DELAY - count + BEFORE_LIMIT)"/>
      </Node>
!     <Node name="node_Feedback_2" type="Feedback" x="158.000000" y="174.000000">
        <Parameter name="DELAY" type="int" value="1" description="Number of iteration for the delay"/>
        <Parameter name="BEFORE_LIMIT" type="int" value="0" description="When count - DELAY is smaller or equal to BEFORE_LIMIT, the input is pulled from BEFORE at (DELAY - count + BEFORE_LIMIT)"/>
      </Node>
!     <Node name="node_Feedback_3" type="Feedback" x="161.000000" y="303.000000">
        <Parameter name="DELAY" type="int" value="1" description="Number of iteration for the delay"/>
        <Parameter name="BEFORE_LIMIT" type="int" value="0" description="When count - DELAY is smaller or equal to BEFORE_LIMIT, the input is pulled from BEFORE at (DELAY - count + BEFORE_LIMIT)"/>
--- 46,59 ----
      </Node>
      <Node name="node_RGB242RGB15_1" type="RGB242RGB15" x="-525.000000" y="245.000000"/>
!     <Node name="node_NilObject_1" type="NilObject" x="-1203.000000" y="137.000000"/>
!     <Node name="node_Feedback_1" type="Feedback" x="260.000000" y="246.000000">
        <Parameter name="DELAY" type="int" value="1" description="Number of iteration for the delay"/>
        <Parameter name="BEFORE_LIMIT" type="int" value="0" description="When count - DELAY is smaller or equal to BEFORE_LIMIT, the input is pulled from BEFORE at (DELAY - count + BEFORE_LIMIT)"/>
      </Node>
!     <Node name="node_Feedback_2" type="Feedback" x="257.000000" y="175.000000">
        <Parameter name="DELAY" type="int" value="1" description="Number of iteration for the delay"/>
        <Parameter name="BEFORE_LIMIT" type="int" value="0" description="When count - DELAY is smaller or equal to BEFORE_LIMIT, the input is pulled from BEFORE at (DELAY - count + BEFORE_LIMIT)"/>
      </Node>
!     <Node name="node_Feedback_3" type="Feedback" x="260.000000" y="304.000000">
        <Parameter name="DELAY" type="int" value="1" description="Number of iteration for the delay"/>
        <Parameter name="BEFORE_LIMIT" type="int" value="0" description="When count - DELAY is smaller or equal to BEFORE_LIMIT, the input is pulled from BEFORE at (DELAY - count + BEFORE_LIMIT)"/>
***************
*** 72,102 ****
        <Parameter name="PROBE_NAME" type="string" value="ORIGINAL_TEXT" description="Name (title) of the probe"/>
      </Node>
!     <Node name="node_NOP_1" type="NOP" x="4.000000" y="164.000000"/>
!     <Node name="node_NOP_2" type="NOP" x="4.000000" y="198.000000"/>
!     <Node name="node_NOP_3" type="NOP" x="8.000000" y="229.000000"/>
      <Node name="node_ImageProbeSDL_1" type="ImageProbeSDL" x="-637.000000" y="314.000000">
        <Parameter name="HEIGHT" type="int" value="240" description="The height of the image"/>
        <Parameter name="WIDTH" type="int" value="320" description="The width of the image"/>
      </Node>
      <Link from="node_SNCRZ30_1" output="ZOOM_POSITION" to="node_READ_1" input="CURRENT_ABS_ZOOM"/>
      <Link from="node_NilObject_1" output="VALUE" to="node_SNCRZ30_1" input="TILT_ABS_POS"/>
      <Link from="node_NilObject_1" output="VALUE" to="node_SNCRZ30_1" input="PAN_ABS_POS"/>
-     <Link from="node_NilObject_2" output="VALUE" to="node_Feedback_2" input="BEFORE"/>
      <Link from="node_NilObject_2" output="VALUE" to="node_Feedback_1" input="BEFORE"/>
      <Link from="node_NilObject_2" output="VALUE" to="node_Feedback_3" input="BEFORE"/>
      <Link from="node_READ_1" output="SENTENCE" to="node_TextProbe_1" input="INPUT"/>
      <Link from="node_READ_1" output="ORIGINAL_TEXT" to="node_TextProbe_2" input="INPUT"/>
!     <Link from="node_Feedback_2" output="DELAY" to="node_SNCRZ30_1" input="PAN_REL_POS">252 181.5 494 181 494 583 -1226 582 -1226 187 -980 187 </Link>
!     <Link from="node_Feedback_1" output="DELAY" to="node_SNCRZ30_1" input="TILT_REL_POS">255 252.5 447 254 447 503 -1106 504 -1106 202 -980 202 </Link>
!     <Link from="node_Feedback_3" output="DELAY" to="node_SNCRZ30_1" input="ZOOM">255 310.5 388 311 389 469 -1060 469 -1061 217 -980 217 </Link>
!     <Link from="node_NOP_1" output="OUTPUT" to="node_Feedback_2" input="INPUT"/>
!     <Link from="node_READ_1" output="REL_PAN_COMMAND" to="node_NOP_1" input="INPUT"/>
!     <Link from="node_NOP_2" output="OUTPUT" to="node_Feedback_1" input="INPUT"/>
!     <Link from="node_READ_1" output="REL_TILT_COMMAND" to="node_NOP_2" input="INPUT"/>
!     <Link from="node_NOP_3" output="OUTPUT" to="node_Feedback_3" input="INPUT"/>
!     <Link from="node_READ_1" output="ABS_ZOOM_COMMAND" to="node_NOP_3" input="INPUT"/>
      <Link from="node_RGB242RGB15_1" output="RGB15_IMAGE" to="node_READ_1" input="RGB15_IMAGE"/>
      <Link from="node_ImageProbeSDL_1" output="OUTPUT" to="node_RGB242RGB15_1" input="RGB24_IMAGE"/>
      <Link from="node_SNCRZ30_1" output="IMAGE" to="node_ImageProbeSDL_1" input="INPUT"/>
      <NetCondition name="CONDITION" node="node_Constant_1" terminal="VALUE"/>
      <NetInput name="BLACK_WHITE_LOOKUP" node="node_READ_1" terminal="BLACK_WHITE_LOOKUP" object_type="any" description="No description available"/>
--- 72,115 ----
        <Parameter name="PROBE_NAME" type="string" value="ORIGINAL_TEXT" description="Name (title) of the probe"/>
      </Node>
!     <Node name="node_NOP_1" type="NOP" x="103.000000" y="169.000000"/>
!     <Node name="node_NOP_2" type="NOP" x="102.000000" y="239.000000"/>
!     <Node name="node_NOP_3" type="NOP" x="101.000000" y="295.000000"/>
      <Node name="node_ImageProbeSDL_1" type="ImageProbeSDL" x="-637.000000" y="314.000000">
        <Parameter name="HEIGHT" type="int" value="240" description="The height of the image"/>
        <Parameter name="WIDTH" type="int" value="320" description="The width of the image"/>
      </Node>
+     <Node name="node_SKIP_N_1" type="SKIP_N" x="7.000000" y="158.000000">
+       <Parameter name="SKIP_N" type="int" value="15" description="The value"/>
+     </Node>
+     <Node name="node_SKIP_N_2" type="SKIP_N" x="8.000000" y="199.000000">
+       <Parameter name="SKIP_N" type="int" value="15" description="The value"/>
+     </Node>
+     <Node name="node_SKIP_N_3" type="SKIP_N" x="8.000000" y="240.000000">
+       <Parameter name="SKIP_N" type="int" value="15" description="The value"/>
+     </Node>
      <Link from="node_SNCRZ30_1" output="ZOOM_POSITION" to="node_READ_1" input="CURRENT_ABS_ZOOM"/>
      <Link from="node_NilObject_1" output="VALUE" to="node_SNCRZ30_1" input="TILT_ABS_POS"/>
      <Link from="node_NilObject_1" output="VALUE" to="node_SNCRZ30_1" input="PAN_ABS_POS"/>
      <Link from="node_NilObject_2" output="VALUE" to="node_Feedback_1" input="BEFORE"/>
      <Link from="node_NilObject_2" output="VALUE" to="node_Feedback_3" input="BEFORE"/>
      <Link from="node_READ_1" output="SENTENCE" to="node_TextProbe_1" input="INPUT"/>
      <Link from="node_READ_1" output="ORIGINAL_TEXT" to="node_TextProbe_2" input="INPUT"/>
!     <Link from="node_Feedback_1" output="DELAY" to="node_SNCRZ30_1" input="TILT_REL_POS">354 253.5 447 254 447 503 -1106 504 -1106 191 -991 190.5 </Link>
      <Link from="node_RGB242RGB15_1" output="RGB15_IMAGE" to="node_READ_1" input="RGB15_IMAGE"/>
      <Link from="node_ImageProbeSDL_1" output="OUTPUT" to="node_RGB242RGB15_1" input="RGB24_IMAGE"/>
      <Link from="node_SNCRZ30_1" output="IMAGE" to="node_ImageProbeSDL_1" input="INPUT"/>
+     <Link from="node_Feedback_3" output="DELAY" to="node_SNCRZ30_1" input="ZOOM_ABS_POS">354 311.5 396 311 396 431 -1067 431 -1068 209 -991 205.5 </Link>
+     <Link from="node_NilObject_1" output="VALUE" to="node_SNCRZ30_1" input="ZOOM_REL_POS"/>
+     <Link from="node_Feedback_2" output="DELAY" to="node_SNCRZ30_1" input="PAN_REL_POS">351 182.5 531 182 531 576 -1176 577 -1175 175 -991 175.5 </Link>
+     <Link from="node_NOP_1" output="OUTPUT" to="node_Feedback_2" input="INPUT"/>
+     <Link from="node_SKIP_N_1" output="OUTPUT" to="node_NOP_1" input="INPUT"/>
+     <Link from="node_NOP_2" output="OUTPUT" to="node_Feedback_1" input="INPUT"/>
+     <Link from="node_SKIP_N_2" output="OUTPUT" to="node_NOP_2" input="INPUT"/>
+     <Link from="node_NilObject_2" output="VALUE" to="node_Feedback_2" input="BEFORE"/>
+     <Link from="node_NOP_3" output="OUTPUT" to="node_Feedback_3" input="INPUT"/>
+     <Link from="node_SKIP_N_3" output="OUTPUT" to="node_NOP_3" input="INPUT"/>
+     <Link from="node_READ_1" output="REL_PAN_COMMAND" to="node_SKIP_N_1" input="INPUT"/>
+     <Link from="node_READ_1" output="REL_TILT_COMMAND" to="node_SKIP_N_2" input="INPUT"/>
+     <Link from="node_READ_1" output="ABS_ZOOM_COMMAND" to="node_SKIP_N_3" input="INPUT"/>
      <NetCondition name="CONDITION" node="node_Constant_1" terminal="VALUE"/>
      <NetInput name="BLACK_WHITE_LOOKUP" node="node_READ_1" terminal="BLACK_WHITE_LOOKUP" object_type="any" description="No description available"/>
***************
*** 112,115 ****
--- 125,152 ----
      <Note x="0" y="0" visible="0" text="Created with FlowDesigner 0.8.1"/>
    </Network>
+   <Network type="subnet" name="SKIP_N">
+     <Node name="node_IF_1" type="IF" x="901.000000" y="-14.000000">
+       <Parameter name="PULL_ANYWAY" type="bool" value="true" description="If true, the IF statement pulls also on the branch not taken"/>
+     </Node>
+     <Node name="node_Equal_1" type="Equal" x="779.000000" y="-43.000000"/>
+     <Node name="node_Constant_1" type="Constant" x="611.000000" y="-26.000000">
+       <Parameter name="VALUE" type="int" value="0" description="The value"/>
+     </Node>
+     <Node name="node_IterCount_1" type="IterCount" x="303.000000" y="-67.000000"/>
+     <Node name="node_Modulo_1" type="Modulo" x="620.000000" y="-59.000000"/>
+     <Node name="node_Constant_2" type="Constant" x="408.000000" y="-52.000000">
+       <Parameter name="VALUE" type="subnet_param" value="SKIP_N" description="The value"/>
+     </Node>
+     <Node name="node_NilObject_1" type="NilObject" x="743.000000" y="65.000000"/>
+     <Link from="node_Equal_1" output="OUTPUT" to="node_IF_1" input="COND"/>
+     <Link from="node_NilObject_1" output="VALUE" to="node_IF_1" input="ELSE"/>
+     <Link from="node_Modulo_1" output="REMAINDER" to="node_Equal_1" input="INPUT1"/>
+     <Link from="node_Constant_1" output="VALUE" to="node_Equal_1" input="INPUT2"/>
+     <Link from="node_IterCount_1" output="OUTPUT" to="node_Modulo_1" input="DIVIDEND"/>
+     <Link from="node_Constant_2" output="VALUE" to="node_Modulo_1" input="DIVISOR"/>
+     <NetOutput name="OUTPUT" node="node_IF_1" terminal="OUTPUT" object_type="any" description="The object from THEN or ELSE depending on COND"/>
+     <NetInput name="INPUT" node="node_IF_1" terminal="THEN" object_type="any" description="What to do if the condition is true"/>
+     <Note x="0" y="0" visible="0" text="Created with FlowDesigner 0.8.1"/>
+   </Network>
    <Parameter name="BLACK_WHITE_LOOKUP_FILE" type="string" value="../color_lookup/black_white.data"/>
    <Parameter name="NNET_FILE" type="string" value="../neural_networks/net_172_7_36.nnet"/>