Menu
▾
▴
robotflow-cvs — CVS changes are sent to this mailing list.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(59) |
Jun
(40) |
Jul
(59) |
Aug
(81) |
Sep
(14) |
Oct
(9) |
Nov
(22) |
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(25) |
Feb
(3) |
Mar
(27) |
Apr
(14) |
May
(15) |
Jun
(112) |
Jul
(44) |
Aug
(7) |
Sep
(18) |
Oct
(34) |
Nov
(17) |
Dec
(20) |
| 2006 |
Jan
(12) |
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
(3) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(11) |
|
From: Dominic L. <ma...@us...> - 2005-06-28 20:40:42
|
Update of /cvsroot/robotflow/RobotFlow/MARIE/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15813 Modified Files: newMarieCommandCamera.cpp Log Message: removed improper input tag Index: newMarieCommandCamera.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieCommandCamera.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** newMarieCommandCamera.cpp 29 Mar 2005 15:20:43 -0000 1.4 --- newMarieCommandCamera.cpp 28 Jun 2005 20:40:32 -0000 1.5 *************** *** 38,45 **** * @description Create MARIE DataCamera object * - * @input_name COMMAND_CAMERA - * @input_type Input MarieCommandCamera - * @input_description input CommandCamera, nilObject if not used - * * @input_name REL_BRIGHTNESS * @input_type int --- 38,41 ---- |
|
From: Dominic L. <ma...@us...> - 2005-06-28 19:32:06
|
Update of /cvsroot/robotflow/RobotFlow/Devices/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11102 Modified Files: SNCRZ30RS232.cc Log Message: added REL_ZOOM input Index: SNCRZ30RS232.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Devices/src/SNCRZ30RS232.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SNCRZ30RS232.cc 30 Mar 2005 19:11:00 -0000 1.1 --- SNCRZ30RS232.cc 28 Jun 2005 19:31:57 -0000 1.2 *************** *** 83,90 **** * @parameter_value /dev/ttyS1 * ! * @input_name ZOOM * @input_type int * @input_description Absolute Zoom of the camera 0 (1X) to 16384 (24X) * * @output_name PAN_POSITION * @output_type int --- 83,94 ---- * @parameter_value /dev/ttyS1 * ! * @input_name ZOOM_ABS_POS * @input_type int * @input_description Absolute Zoom of the camera 0 (1X) to 16384 (24X) * + * @input_name ZOOM_REL_POS + * @input_type int + * @input_description Relative Zoom according to the actual zoom position + * * @output_name PAN_POSITION * @output_type int *************** *** 115,119 **** int panAbsolutePosition; int tiltAbsolutePosition; ! int zoomPosition; int panRelativePosition; int tiltRelativePosition; --- 119,124 ---- int panAbsolutePosition; int tiltAbsolutePosition; ! int zoomAbsolutePosition; ! int zoomRelativePosition; int panRelativePosition; int tiltRelativePosition; *************** *** 254,259 **** panAbsolutePosition= addInput("PAN_ABS_POS"); tiltAbsolutePosition = addInput("TILT_ABS_POS"); ! zoomPosition = addInput("ZOOM"); ! panRelativePosition = addInput("PAN_REL_POS"); tiltRelativePosition = addInput("TILT_REL_POS"); --- 259,264 ---- panAbsolutePosition= addInput("PAN_ABS_POS"); tiltAbsolutePosition = addInput("TILT_ABS_POS"); ! zoomAbsolutePosition = addInput("ZOOM_ABS_POS"); ! zoomRelativePosition = addInput("ZOOM_REL_POS"); panRelativePosition = addInput("PAN_REL_POS"); tiltRelativePosition = addInput("TILT_REL_POS"); *************** *** 654,658 **** ObjectRef panRelativePositionValue = getInput(panRelativePosition,count); ObjectRef tiltRelativePositionValue = getInput(tiltRelativePosition,count); ! ObjectRef zoomPositionValue = getInput(zoomPosition,count); if ((!panAbsolutePositionValue->isNil()) && (!tiltAbsolutePositionValue->isNil())) --- 659,664 ---- ObjectRef panRelativePositionValue = getInput(panRelativePosition,count); ObjectRef tiltRelativePositionValue = getInput(tiltRelativePosition,count); ! ObjectRef zoomAbsolutePositionValue = getInput(zoomAbsolutePosition,count); ! ObjectRef zoomRelativePositionValue = getInput(zoomRelativePosition,count); if ((!panAbsolutePositionValue->isNil()) && (!tiltAbsolutePositionValue->isNil())) *************** *** 709,719 **** ! if (!zoomPositionValue->isNil()) { ! //zoom ! int zoomPos = dereference_cast<int>(zoomPositionValue); ! Zoom(zoomPos); } - inquiry_pan_tilt(); --- 715,731 ---- ! if (!zoomAbsolutePositionValue->isNil() && !zoomRelativePositionValue->isNil()) { ! //zoom ! int zoom = dereference_cast<int>(zoomAbsolutePositionValue) + dereference_cast<int>(zoomRelativePositionValue); ! Zoom(zoom); ! } ! else if (!zoomAbsolutePositionValue->isNil()) { ! int zoom = dereference_cast<int>(zoomAbsolutePositionValue); ! Zoom(zoom); ! } else if (!zoomRelativePositionValue->isNil()) { ! int zoom = m_zoom_position + dereference_cast<int>(zoomRelativePositionValue); ! Zoom(zoom); } inquiry_pan_tilt(); |
|
From: Dominic L. <ma...@us...> - 2005-06-28 14:24:34
|
Update of /cvsroot/robotflow/RobotFlow/Vision/n-files In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11006 Modified Files: ChallengeVision.n Log Message: testing for text detection before doing text extraction Index: ChallengeVision.n =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/n-files/ChallengeVision.n,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ChallengeVision.n 28 Jun 2005 12:54:17 -0000 1.4 --- ChallengeVision.n 28 Jun 2005 14:24:22 -0000 1.5 *************** *** 143,146 **** --- 143,150 ---- <Node name="node_isNil_5" type="isNil" x="801.000000" y="498.000000"/> <Node name="node_NOT_3" type="NOT" x="885.000000" y="497.000000"/> + <Node name="node_NOP_11" type="NOP" x="-8.000000" y="585.000000"/> + <Node name="node_AND_1" type="AND" x="279.000000" y="580.000000"> + <Parameter name="PULL_ANYWAY" type="bool" value="false" description="Pull on INPUT2 even if INPUT1 is false"/> + </Node> <Link from="node_NOP_1" output="OUTPUT" to="node_CvFaceDetection_1" input="IN_IMAGE">17 122 117 122 117 167 438 167.5 </Link> <Link from="node_NOP_1" output="OUTPUT" to="node_MultiIntegralCuesPFTracker_1" input="IMAGE_IN">17 122 116 122 116 -82 839 -82.5 </Link> *************** *** 196,199 **** --- 200,206 ---- <Link from="node_isNil_5" output="OUTPUT" to="node_NOT_3" input="INPUT"/> <Link from="node_SkinColorGMMSegm_1" output="SEGMENTED_IMAGE" to="node_isNil_5" input="INPUT"/> + <Link from="node_NOP_4" output="OUTPUT" to="node_AND_1" input="INPUT1"/> + <Link from="node_NOP_11" output="OUTPUT" to="node_AND_1" input="INPUT2"/> + <Link from="node_AND_1" output="OUTPUT" to="node_READv2_1" input="SIGN_TRACKING_ACTIVATED"/> <NetInput name="NNET" node="node_READv2_1" terminal="NNET" object_type="any" description="No description available"/> <NetInput name="DICT" node="node_READv2_1" terminal="DICT" object_type="any" description="No description available"/> *************** *** 213,217 **** <NetInput name="SKIN_DETECT_ACTIVATION" node="node_NOP_5" terminal="INPUT" object_type="any" description="The input"/> <NetInput name="FACE_DETECT_ACTIVATION" node="node_NOP_6" terminal="INPUT" object_type="any" description="The input"/> - <NetInput name="TEXT_EXTRACTION_ACTIVATED" node="node_READv2_1" terminal="SIGN_TRACKING_ACTIVATED" object_type="any" description="No description available"/> <NetInput name="TEXT_TRACKING_ACTIVATED" node="node_NOP_7" terminal="INPUT" object_type="any" description="The input"/> <NetInput name="FACE_TRACKING_ACTIVATED" node="node_NOP_8" terminal="INPUT" object_type="any" description="The input"/> --- 220,223 ---- *************** *** 222,225 **** --- 228,232 ---- <NetOutput name="CURRENT_TRACKING_ROI" node="node_NOP_10" terminal="OUTPUT" object_type="any" description="The output = The input"/> <NetOutput name="SKIN_DETECTED" node="node_NOT_3" terminal="OUTPUT" object_type="bool" description="Boolean output"/> + <NetInput name="TEXT_EXTRACTION_ACTIVATED" node="node_NOP_11" terminal="INPUT" object_type="any" description="The input"/> <Note x="0" y="0" visible="0" text="Created with FlowDesigner 0.8.2"/> </Network> |
|
From: Dominic L. <ma...@us...> - 2005-06-28 12:54:27
|
Update of /cvsroot/robotflow/RobotFlow/Vision/n-files In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31549 Modified Files: ChallengeVision.n Log Message: added skin detected output Index: ChallengeVision.n =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/n-files/ChallengeVision.n,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ChallengeVision.n 28 Jun 2005 12:50:46 -0000 1.3 --- ChallengeVision.n 28 Jun 2005 12:54:17 -0000 1.4 *************** *** 141,144 **** --- 141,146 ---- <Node name="node_NOT_2" type="NOT" x="947.000000" y="365.000000"/> <Node name="node_NOP_10" type="NOP" x="1804.000000" y="453.000000"/> + <Node name="node_isNil_5" type="isNil" x="801.000000" y="498.000000"/> + <Node name="node_NOT_3" type="NOT" x="885.000000" y="497.000000"/> <Link from="node_NOP_1" output="OUTPUT" to="node_CvFaceDetection_1" input="IN_IMAGE">17 122 117 122 117 167 438 167.5 </Link> <Link from="node_NOP_1" output="OUTPUT" to="node_MultiIntegralCuesPFTracker_1" input="IMAGE_IN">17 122 116 122 116 -82 839 -82.5 </Link> *************** *** 192,195 **** --- 194,199 ---- <Link from="node_TextSignDetect_1" output="OUT_ROI" to="node_isNil_4" input="INPUT"/> <Link from="node_Subsumption_1" output="OUTPUT" to="node_NOP_10" input="INPUT">1701 115 1702 453 1785 453 </Link> + <Link from="node_isNil_5" output="OUTPUT" to="node_NOT_3" input="INPUT"/> + <Link from="node_SkinColorGMMSegm_1" output="SEGMENTED_IMAGE" to="node_isNil_5" input="INPUT"/> <NetInput name="NNET" node="node_READv2_1" terminal="NNET" object_type="any" description="No description available"/> <NetInput name="DICT" node="node_READv2_1" terminal="DICT" object_type="any" description="No description available"/> *************** *** 217,220 **** --- 221,225 ---- <NetOutput name="TEXT_DETECTED" node="node_NOT_2" terminal="OUTPUT" object_type="bool" description="Boolean output"/> <NetOutput name="CURRENT_TRACKING_ROI" node="node_NOP_10" terminal="OUTPUT" object_type="any" description="The output = The input"/> + <NetOutput name="SKIN_DETECTED" node="node_NOT_3" terminal="OUTPUT" object_type="bool" description="Boolean output"/> <Note x="0" y="0" visible="0" text="Created with FlowDesigner 0.8.2"/> </Network> |
|
From: Dominic L. <ma...@us...> - 2005-06-28 12:50:56
|
Update of /cvsroot/robotflow/RobotFlow/Vision/n-files In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29804 Modified Files: ChallengeVision.n Log Message: added face_detected, text_detected, ROI outputs Index: ChallengeVision.n =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/n-files/ChallengeVision.n,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ChallengeVision.n 27 Jun 2005 21:07:29 -0000 1.2 --- ChallengeVision.n 28 Jun 2005 12:50:46 -0000 1.3 *************** *** 121,125 **** <Parameter name="SKIN_SCORE_THRESHOLD" type="float" value="5.3" description="Threshold for skin model score to consider a pixel as skin."/> </Node> ! <Node name="node_Constant_13" type="Constant" x="629.000000" y="-22.000000"> <Parameter name="VALUE" type="string" value="TextTrackingFrame" description="The value"/> </Node> --- 121,125 ---- <Parameter name="SKIN_SCORE_THRESHOLD" type="float" value="5.3" description="Threshold for skin model score to consider a pixel as skin."/> </Node> ! <Node name="node_Constant_13" type="Constant" x="628.000000" y="-22.000000"> <Parameter name="VALUE" type="string" value="TextTrackingFrame" description="The value"/> </Node> *************** *** 136,139 **** --- 136,144 ---- <Node name="node_NOP_8" type="NOP" x="-3.000000" y="351.000000"/> <Node name="node_NOP_9" type="NOP" x="-3.000000" y="-38.000000"/> + <Node name="node_isNil_3" type="isNil" x="800.000000" y="445.000000"/> + <Node name="node_NOT_1" type="NOT" x="884.000000" y="444.000000"/> + <Node name="node_isNil_4" type="isNil" x="863.000000" y="366.000000"/> + <Node name="node_NOT_2" type="NOT" x="947.000000" y="365.000000"/> + <Node name="node_NOP_10" type="NOP" x="1804.000000" y="453.000000"/> <Link from="node_NOP_1" output="OUTPUT" to="node_CvFaceDetection_1" input="IN_IMAGE">17 122 117 122 117 167 438 167.5 </Link> <Link from="node_NOP_1" output="OUTPUT" to="node_MultiIntegralCuesPFTracker_1" input="IMAGE_IN">17 122 116 122 116 -82 839 -82.5 </Link> *************** *** 182,185 **** --- 187,195 ---- <Link from="node_NOP_9" output="OUTPUT" to="node_MultiIntegralCuesPFTracker_2" input="SHOW_TRACKED_ROI">16 -38 686 -39 687 170 839 169.5 </Link> <Link from="node_NOP_9" output="OUTPUT" to="node_MultiIntegralCuesPFTracker_1" input="SHOW_TRACKED_ROI"/> + <Link from="node_CvFaceDetection_1" output="OUT_ROI" to="node_isNil_3" input="INPUT"/> + <Link from="node_isNil_3" output="OUTPUT" to="node_NOT_1" input="INPUT"/> + <Link from="node_isNil_4" output="OUTPUT" to="node_NOT_2" input="INPUT"/> + <Link from="node_TextSignDetect_1" output="OUT_ROI" to="node_isNil_4" input="INPUT"/> + <Link from="node_Subsumption_1" output="OUTPUT" to="node_NOP_10" input="INPUT">1701 115 1702 453 1785 453 </Link> <NetInput name="NNET" node="node_READv2_1" terminal="NNET" object_type="any" description="No description available"/> <NetInput name="DICT" node="node_READv2_1" terminal="DICT" object_type="any" description="No description available"/> *************** *** 204,207 **** --- 214,220 ---- <NetInput name="SHOW_TRACKED_ROI" node="node_NOP_9" terminal="INPUT" object_type="any" description="The input"/> <NetOutput name="RGB24_320x240Out" node="node_Subsumption_2" terminal="OUTPUT" object_type="any" description="No description available"/> + <NetOutput name="FACE_DETECTED" node="node_NOT_1" terminal="OUTPUT" object_type="bool" description="Boolean output"/> + <NetOutput name="TEXT_DETECTED" node="node_NOT_2" terminal="OUTPUT" object_type="bool" description="Boolean output"/> + <NetOutput name="CURRENT_TRACKING_ROI" node="node_NOP_10" terminal="OUTPUT" object_type="any" description="The output = The input"/> <Note x="0" y="0" visible="0" text="Created with FlowDesigner 0.8.2"/> </Network> |
|
From: Carle C. <car...@us...> - 2005-06-28 00:44:58
|
Update of /cvsroot/robotflow/RobotFlow/MARIE/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2454/MARIE/include Modified Files: Makefile.am Log Message: install missing includes Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/Makefile.am,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Makefile.am 27 Jun 2005 17:43:08 -0000 1.12 --- Makefile.am 28 Jun 2005 00:44:48 -0000 1.13 *************** *** 4,8 **** MarieCommandMotor.h \ MarieDataLaser.h \ - MarieDataLocalisation.h \ MarieDataIR.h \ MarieDataBumper.h \ --- 4,7 ---- *************** *** 22,25 **** MarieRequestSystem.h ! include_HEADERS = MarieObject.h --- 21,25 ---- MarieRequestSystem.h ! include_HEADERS = MarieObject.h \ ! MarieDataLocalisation.h |
|
From: Carle C. <car...@us...> - 2005-06-27 22:44:21
|
Update of /cvsroot/robotflow/RobotFlow/Audio/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6188/Audio/src Modified Files: SourceInfo.cpp Log Message: add age Index: SourceInfo.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Audio/src/SourceInfo.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SourceInfo.cpp 27 Jun 2005 17:49:57 -0000 1.1 --- SourceInfo.cpp 27 Jun 2005 22:44:01 -0000 1.2 *************** *** 13,16 **** --- 13,17 ---- out << "<x " << x[0] << " " << x[1] << " " << x[2] << " >" << std::endl; out << "<strength " << strength << " >" << std::endl; + out << "<age " << age << " >" << std::endl; out << "<source_id " << source_id << " >" << std::endl; out << ">" << std::endl; |
|
From: Carle C. <car...@us...> - 2005-06-27 22:44:12
|
Update of /cvsroot/robotflow/RobotFlow/Audio/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6188/Audio/include Modified Files: SourceInfo.h Log Message: add age Index: SourceInfo.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Audio/include/SourceInfo.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SourceInfo.h 27 Jun 2005 17:49:55 -0000 1.1 --- SourceInfo.h 27 Jun 2005 22:44:00 -0000 1.2 *************** *** 10,13 **** --- 10,14 ---- float x[3]; float strength; + int age; int interval; int eval_count; |
|
From: Carle C. <car...@us...> - 2005-06-27 22:43:57
|
Update of /cvsroot/robotflow/RobotFlow/MARIE/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6039/MARIE/src Modified Files: extractMarieDataLocalisation.cpp MarieDataLocalisation.cpp newMarieDataLocalisation.cpp Log Message: add age Index: newMarieDataLocalisation.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieDataLocalisation.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** newMarieDataLocalisation.cpp 27 Jun 2005 17:43:22 -0000 1.1 --- newMarieDataLocalisation.cpp 27 Jun 2005 22:43:36 -0000 1.2 *************** *** 103,106 **** --- 103,107 ---- sourceStr->z = sourceInfoData->x[2]; sourceStr->strength = sourceInfoData->strength; + sourceStr->age = sourceInfoData->age; sourceStr->id = sourceInfoData->source_id; Index: extractMarieDataLocalisation.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieDataLocalisation.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** extractMarieDataLocalisation.cpp 27 Jun 2005 17:43:20 -0000 1.1 --- extractMarieDataLocalisation.cpp 27 Jun 2005 22:43:35 -0000 1.2 *************** *** 110,113 **** --- 110,114 ---- sourceInfo->x[2] = source->z; sourceInfo->strength = source->strength; + sourceInfo->age = source->age; sourceInfo->source_id = source->id; Index: MarieDataLocalisation.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataLocalisation.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieDataLocalisation.cpp 27 Jun 2005 17:43:20 -0000 1.4 --- MarieDataLocalisation.cpp 27 Jun 2005 22:43:35 -0000 1.5 *************** *** 127,130 **** --- 127,131 ---- sourceInfo->x[2] = source->z; sourceInfo->strength = source->strength; + sourceInfo->age = source->age; sourceInfo->source_id = source->id; *************** *** 153,156 **** --- 154,158 ---- sourceStr->z = sourceInfoData->x[2]; sourceStr->strength = sourceInfoData->strength; + sourceStr->age = sourceInfoData->age; sourceStr->id = sourceInfoData->source_id; |
|
From: Pierre M. <sid...@us...> - 2005-06-27 21:13:33
|
Update of /cvsroot/robotflow/RobotFlow/Vision/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2041 Modified Files: CvFaceDetection.cc MultiIntegralCuesPFTracker.cc SkinColorGMMSegm.cc TextSignDetect.cc Log Message: Removed all cout and process time computations. Index: SkinColorGMMSegm.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/SkinColorGMMSegm.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SkinColorGMMSegm.cc 23 Jun 2005 20:48:45 -0000 1.1 --- SkinColorGMMSegm.cc 27 Jun 2005 21:12:34 -0000 1.2 *************** *** 122,126 **** } ! struct timeb t1, t2; RCPtr<Image> imageRef = getInput(m_imageInID, count); --- 122,126 ---- } ! //struct timeb t1, t2; RCPtr<Image> imageRef = getInput(m_imageInID, count); *************** *** 135,139 **** // Start timer ! ftime(&t1); // Apply skin model --- 135,139 ---- // Start timer ! //ftime(&t1); // Apply skin model *************** *** 141,149 **** // End timer ! ftime(&t2); // Display time used ! double timeDiff=(t2.time-t1.time)+((t2.millitm-t1.millitm)/1000.0); ! cout << "SkinColorGMMSegm::Total run time (sec): " << timeDiff << endl; m_sumMask /= 255; --- 141,149 ---- // End timer ! //ftime(&t2); // Display time used ! //double timeDiff=(t2.time-t1.time)+((t2.millitm-t1.millitm)/1000.0); ! //cout << "SkinColorGMMSegm::Total run time (sec): " << timeDiff << endl; m_sumMask /= 255; Index: MultiIntegralCuesPFTracker.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/MultiIntegralCuesPFTracker.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MultiIntegralCuesPFTracker.cc 23 Jun 2005 20:43:40 -0000 1.4 --- MultiIntegralCuesPFTracker.cc 27 Jun 2005 21:12:34 -0000 1.5 *************** *** 485,489 **** // Start timer ! ftime(&m_t1); if (!m_refTarget->IsValid()) { --- 485,489 ---- // Start timer ! //ftime(&m_t1); if (!m_refTarget->IsValid()) { *************** *** 609,613 **** //float likelihood = exp(m_lSigma*(sim-1.f)); ! cout << "Similarity = " << sim << endl; bool targetMatch = (sim >= m_targetMatchThres); --- 609,613 ---- //float likelihood = exp(m_lSigma*(sim-1.f)); ! //cout << "Similarity = " << sim << endl; bool targetMatch = (sim >= m_targetMatchThres); *************** *** 703,711 **** // End timer ! ftime(&m_t2); // Display time used ! double timeDiff=(m_t2.time-m_t1.time)+((m_t2.millitm-m_t1.millitm)/1000.0); ! cout << "Total run time (sec): " << timeDiff << endl; } catch (BaseException *e) { --- 703,711 ---- // End timer ! //ftime(&m_t2); // Display time used ! //double timeDiff=(m_t2.time-m_t1.time)+((m_t2.millitm-m_t1.millitm)/1000.0); ! //cout << "Total run time (sec): " << timeDiff << endl; } catch (BaseException *e) { Index: TextSignDetect.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/TextSignDetect.cc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** TextSignDetect.cc 23 Jun 2005 20:46:51 -0000 1.7 --- TextSignDetect.cc 27 Jun 2005 21:12:34 -0000 1.8 *************** *** 247,251 **** ! struct timeb t1, t2; int b, l, p, r; --- 247,251 ---- ! //struct timeb t1, t2; int b, l, p, r; *************** *** 267,271 **** // Start timer ! ftime(&t1); if (m_numChannels == 1) { --- 267,271 ---- // Start timer ! //ftime(&t1); if (m_numChannels == 1) { *************** *** 667,675 **** // End timer ! ftime(&t2); // Display time used ! double timeDiff=(t2.time-t1.time)+((t2.millitm-t1.millitm)/1000.0); ! cout << "Total run time (sec): " << timeDiff << endl; // --- 667,675 ---- // End timer ! //ftime(&t2); // Display time used ! //double timeDiff=(t2.time-t1.time)+((t2.millitm-t1.millitm)/1000.0); ! //cout << "Total run time (sec): " << timeDiff << endl; // Index: CvFaceDetection.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/CvFaceDetection.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CvFaceDetection.cc 23 Jun 2005 20:42:15 -0000 1.4 --- CvFaceDetection.cc 27 Jun 2005 21:12:34 -0000 1.5 *************** *** 140,144 **** ! struct timeb t1, t2; bool foundFace = false; RCPtr<Image> imageRef = getInput(m_imageInID, count); --- 140,144 ---- ! //struct timeb t1, t2; bool foundFace = false; RCPtr<Image> imageRef = getInput(m_imageInID, count); *************** *** 155,159 **** // Start timer ! ftime(&t1); // Get IN_TRACKED_ROI --- 155,159 ---- // Start timer ! //ftime(&t1); // Get IN_TRACKED_ROI *************** *** 193,201 **** } // End timer ! ftime(&t2); // Display time used ! double timeDiff=(t2.time-t1.time)+((t2.millitm-t1.millitm)/1000.0); ! cout << "Total run time (sec): " << timeDiff << " found face=" << foundFace << endl; --- 193,201 ---- } // End timer ! //ftime(&t2); // Display time used ! //double timeDiff=(t2.time-t1.time)+((t2.millitm-t1.millitm)/1000.0); ! //cout << "Total run time (sec): " << timeDiff << " found face=" << foundFace << endl; |
|
From: Pierre M. <sid...@us...> - 2005-06-27 21:07:52
|
Update of /cvsroot/robotflow/RobotFlow/Vision/n-files In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32584 Modified Files: ChallengeVision.n Log Message: Fixed number of orientations for text detection. Index: ChallengeVision.n =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/n-files/ChallengeVision.n,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ChallengeVision.n 27 Jun 2005 20:51:36 -0000 1.1 --- ChallengeVision.n 27 Jun 2005 21:07:29 -0000 1.2 *************** *** 39,43 **** <Parameter name="FRAME_HEIGHT" type="int" value="240" description="Video frame height."/> <Parameter name="NUM_CHANNELS" type="int" value="3" description="Video frame number of channels."/> ! <Parameter name="NUM_ORIENTATIONS" type="int" value="6" description="Number of bins for the local edge histogram."/> <Parameter name="EDGES_STRENGTH_THRESHOLD" type="float" value="50.0" description="Threshold to remove noisy/weak edges."/> <Parameter name="TEXT_ROI_MIN_WIDTH" type="int" value="10" description="Minimal width of a potential region of interest to consider it as text."/> --- 39,43 ---- <Parameter name="FRAME_HEIGHT" type="int" value="240" description="Video frame height."/> <Parameter name="NUM_CHANNELS" type="int" value="3" description="Video frame number of channels."/> ! <Parameter name="NUM_ORIENTATIONS" type="int" value="8" description="Number of bins for the local edge histogram."/> <Parameter name="EDGES_STRENGTH_THRESHOLD" type="float" value="50.0" description="Threshold to remove noisy/weak edges."/> <Parameter name="TEXT_ROI_MIN_WIDTH" type="int" value="10" description="Minimal width of a potential region of interest to consider it as text."/> |
|
From: Dominic L. <ma...@us...> - 2005-06-27 20:56:51
|
Update of /cvsroot/robotflow/RobotFlow/Vision/n-files In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28036 Modified Files: Makefile.am Log Message: inserting challenge vision stuff Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Vision/n-files/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.am 6 Jun 2005 20:55:17 -0000 1.2 --- Makefile.am 27 Jun 2005 20:56:22 -0000 1.3 *************** *** 3,7 **** toolboxdir = $(prefix) ! toolbox_DATA = READ.n READv2.n EXTRA_DIST = $(toolbox_DATA) --- 3,7 ---- toolboxdir = $(prefix) ! toolbox_DATA = READ.n READv2.n ChallengeVision.n EXTRA_DIST = $(toolbox_DATA) |
|
From: Dominic L. <ma...@us...> - 2005-06-27 20:51:48
|
Update of /cvsroot/robotflow/RobotFlow/Vision/n-files In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26146 Added Files: ChallengeVision.n Log Message: first draft --- NEW FILE: ChallengeVision.n --- #!/usr/bin/env batchflow <?xml version="1.0"?> <Document category="RobotFlow:LABORIUS"> <Network type="subnet" name="MAIN"> <Node name="node_CvFaceDetection_1" type="CvFaceDetection" x="606.000000" y="190.000000"> <Parameter name="FRAME_WIDTH" type="int" value="320" description="Video frame width."/> <Parameter name="FRAME_HEIGHT" type="int" value="240" description="Video frame height."/> <Parameter name="MAX_NUM_SKIN_REGIONS" type="int" value="20" description="Maximum number of skin regions to search for faces in a frame."/> <Parameter name="MIN_SKIN_ROI_WIDTH" type="int" value="24" description="Minimum width of a skin region to consider for face detection."/> <Parameter name="MIN_SKIN_ROI_HEIGHT" type="int" value="24" description="Minimum height of a skin region to consider for face detection."/> </Node> <Node name="node_MultiIntegralCuesPFTracker_1" type="MultiIntegralCuesPFTracker" x="1069.000000" y="-60.000000"> <Parameter name="FRAME_WIDTH" type="int" value="320" description="Video frame width."/> <Parameter name="FRAME_HEIGHT" type="int" value="240" description="Video frame height."/> <Parameter name="NUM_CHANNELS" type="int" value="3" description="Number of channels in video frame."/> <Parameter name="TARGET_MATCH_THRES" type="float" value="0.8" description="Minimum confidence to assume a target match."/> <Parameter name="TARGET_ADAPT_THRES" type="float" value="0.95" description="Adaptation treshold for each target cue model."/> <Parameter name="TARGET_ADAPT_RATE" type="float" value="0.1" description="Adaptation rate for each target cue model."/> <Parameter name="CUE_ADAPT_RATE" type="float" value="0.2" description="Adaptation rate for each cue weight."/> <Parameter name="LIKELIHOOD_SIGMA" type="float" value="300.0" description="Exponential sigma value to discriminate likelihood."/> <Parameter name="NUM_HORI_RECT" type="int" value="3" description="Number of horizontal rectangle to use for integral features."/> <Parameter name="NUM_VERT_RECT" type="int" value="3" description="Number of vertical rectangle to use for integral features."/> <Parameter name="USE_RECT_DIFF" type="bool" value="true" description="Features are differences between rectangle regions."/> <Parameter name="USE_COLOR_BOUNDARY" type="bool" value="true" description="Flag indicating to detect a color boundary for a better scale adaptation."/> <Parameter name="BOUNDARY_DIFF_THRESH" type="float" value="25.0" description="Minimum difference between boundary and ROI rectangle mean values."/> <Parameter name="NUM_ORIENTATIONS" type="int" value="8" description="Number of edge orientations."/> <Parameter name="MIN_EDGES_STRENGTH" type="float" value="100.0" description="Threshold to remove noisy/weak edges."/> <Parameter name="MAX_EDGES_STRENGTH" type="float" value="1000.0" description="Limit on the edge strength."/> <Parameter name="NUM_PARTICLES" type="int" value="1500" description="Number of particles (samples) to use."/> <Parameter name="PARTICLE_STATE_SIZE" type="int" value="4" description="Particle state size."/> <Parameter name="COLOR_CUE_WEIGHT" type="float" value="0.6" description="Color features weight."/> <Parameter name="EDGES_CUE_WEIGHT" type="float" value="0.2" description="Color features weight."/> <Parameter name="LBP_CUE_WEIGHT" type="float" value="0.2" description="Color features weight."/> <Parameter name="REDETECTION_FREQUENCY" type="int" value="5" description="Frequency of application of redetection of current tracked region (in number of frames)."/> </Node> <Node name="node_NOP_1" type="NOP" x="-2.000000" y="122.000000"/> <Node name="node_TextSignDetect_1" type="TextSignDetect" x="472.000000" y="67.000000"> <Parameter name="FRAME_WIDTH" type="int" value="320" description="Video frame width."/> <Parameter name="FRAME_HEIGHT" type="int" value="240" description="Video frame height."/> <Parameter name="NUM_CHANNELS" type="int" value="3" description="Video frame number of channels."/> <Parameter name="NUM_ORIENTATIONS" type="int" value="6" description="Number of bins for the local edge histogram."/> <Parameter name="EDGES_STRENGTH_THRESHOLD" type="float" value="50.0" description="Threshold to remove noisy/weak edges."/> <Parameter name="TEXT_ROI_MIN_WIDTH" type="int" value="10" description="Minimal width of a potential region of interest to consider it as text."/> <Parameter name="TEXT_ROI_MIN_HEIGHT" type="int" value="4" description="Minimal height of a potential region of interest to consider it as text."/> <Parameter name="TEXT_ROI_MAX_WIDTH" type="int" value="320" description="Maximal width of a potential region of interest to consider it as text."/> <Parameter name="TEXT_ROI_MAX_HEIGHT" type="int" value="80" description="Maximal height of a potential region of interest to consider it as text."/> <Parameter name="MAX_STD_ORIENTATION_BINS" type="float" value="0.75" description="Maximal standard deviation of the local edge orientation histogram bins heightEdges orientation histogram of a potential region of interest to consider it as text."/> <Parameter name="MAX_NUM_TEXT_ROI" type="int" value="100" description="Maximum number of text region of interest to use."/> <Parameter name="MAX_STD" type="float" value="0" description="Low threshold used for edge searching."/> <Parameter name="MIN_DIST" type="float" value="60" description="High threshold used for edge searching."/> <Parameter name="HORIZONTAL_SYMMETRY_THRESHOLD" type="float" value="80.0" description="Horizontal edge orientation symmetry treshold. Text region should have lower values than threshold."/> <Parameter name="VERTICAL_SYMMETRY_THRESHOLD" type="float" value="80.0" description="Vertical edge orientation symmetry treshold. Text region should have lower values than threshold."/> </Node> <Node name="node_MultiIntegralCuesPFTracker_2" type="MultiIntegralCuesPFTracker" x="1069.000000" y="147.000000"> <Parameter name="FRAME_WIDTH" type="int" value="320" description="Video frame width."/> <Parameter name="FRAME_HEIGHT" type="int" value="240" description="Video frame height."/> <Parameter name="NUM_CHANNELS" type="int" value="3" description="Number of channels in video frame."/> <Parameter name="TARGET_MATCH_THRES" type="float" value="0.8" description="Minimum confidence to assume a target match."/> <Parameter name="TARGET_ADAPT_THRES" type="float" value="0.95" description="Adaptation treshold for each target cue model."/> <Parameter name="TARGET_ADAPT_RATE" type="float" value="0.15" description="Adaptation rate for each target cue model."/> <Parameter name="CUE_ADAPT_RATE" type="float" value="0.2" description="Adaptation rate for each cue weight."/> <Parameter name="LIKELIHOOD_SIGMA" type="float" value="150.0" description="Exponential sigma value to discriminate likelihood."/> <Parameter name="NUM_HORI_RECT" type="int" value="3" description="Number of horizontal rectangle to use for integral features."/> <Parameter name="NUM_VERT_RECT" type="int" value="3" description="Number of vertical rectangle to use for integral features."/> <Parameter name="USE_RECT_DIFF" type="bool" value="true" description="Features are differences between rectangle regions."/> <Parameter name="USE_COLOR_BOUNDARY" type="bool" value="true" description="Flag indicating to detect a color boundary for a better scale adaptation."/> <Parameter name="BOUNDARY_DIFF_THRESH" type="float" value="20.0" description="Minimum difference between boundary and ROI rectangle mean values."/> <Parameter name="NUM_ORIENTATIONS" type="int" value="8" description="Number of edge orientations."/> <Parameter name="MIN_EDGES_STRENGTH" type="float" value="100.0" description="Threshold to remove noisy/weak edges."/> <Parameter name="MAX_EDGES_STRENGTH" type="float" value="1000.0" description="Limit on the edge strength."/> <Parameter name="NUM_PARTICLES" type="int" value="1000" description="Number of particles (samples) to use."/> <Parameter name="PARTICLE_STATE_SIZE" type="int" value="4" description="Particle state size."/> <Parameter name="COLOR_CUE_WEIGHT" type="float" value="0.4" description="Color features weight."/> <Parameter name="EDGES_CUE_WEIGHT" type="float" value="0.3" description="Color features weight."/> <Parameter name="LBP_CUE_WEIGHT" type="float" value="0.3" description="Color features weight."/> <Parameter name="REDETECTION_FREQUENCY" type="int" value="30" description="Frequency of application of redetection of current tracked region (in number of frames)."/> </Node> <Node name="node_Constant_2" type="Constant" x="490.000000" y="-114.000000"> <Parameter name="VALUE" type="object" value="<Vector<float> 0.1 0.1 0.05 0.05>" description="The value"/> </Node> <Node name="node_Constant_4" type="Constant" x="593.000000" y="-99.000000"> <Parameter name="VALUE" type="object" value="<Vector<float> 0.1 0.1 0.1 0.1>" description="The value"/> </Node> <Node name="node_READv2_1" type="READv2" x="1357.000000" y="581.000000"> <Parameter name="MIN_SYMBOL_HEIGHT" type="int" value="30" description="No description available"/> <Parameter name="MIN_SYMBOL_WIDTH" type="int" value="5" description="No description available"/> <Parameter name="MIN_DICT_SCORE" type="float" value="0.5" description="No description available"/> <Parameter name="MIN_DIGIT_SCORE" type="float" value="0.8" description="No description available"/> <Parameter name="DICT_ONLY" type="bool" value="true" description="No description available"/> <Parameter name="VERTICAL_TOLERANCE" type="float" value="0.8" description="No description available"/> <Parameter name="HORIZONTAL_TOLERANCE" type="float" value="0.8" description="No description available"/> </Node> <Node name="node_CAMERA_CTRL_1" type="CAMERA_CTRL" x="1820.000000" y="117.000000"/> <Node name="node_Subsumption_1" type="Subsumption" x="1653.000000" y="117.000000"/> <Node name="node_Subsumption_2" type="Subsumption" x="2174.000000" y="-90.000000"/> <Node name="node_IF_1" type="IF" x="2113.000000" y="-5.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_isNil_1" type="isNil" x="1768.000000" y="-19.000000"/> <Node name="node_NilObject_2" type="NilObject" x="1827.000000" y="10.000000"/> <Node name="node_IF_2" type="IF" x="1903.000000" y="357.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_isNil_2" type="isNil" x="1777.000000" y="341.000000"/> <Node name="node_Constant_10" type="Constant" x="1679.000000" y="356.000000"> <Parameter name="VALUE" type="subnet_param" value="DEFAULT_ABS_PAN_COMMAND" description="The value"/> </Node> <Node name="node_NilObject_3" type="NilObject" x="1604.000000" y="371.000000"/> <Node name="node_Constant_12" type="Constant" x="1908.000000" y="-6.000000"> <Parameter name="VALUE" type="subnet_param" value="DEFAULT_ABS_TILT_COMMAND" description="The value"/> </Node> <Node name="node_Add_1" type="Add" x="2052.000000" y="196.000000"/> <Node name="node_Max_1" type="Max" x="2156.000000" y="293.000000"/> <Node name="node_Constant_1" type="Constant" x="1917.000000" y="300.000000"> <Parameter name="VALUE" type="int" value="0" description="The value"/> </Node> <Node name="node_SkinColorGMMSegm_1" type="SkinColorGMMSegm" x="307.000000" y="195.000000"> <Parameter name="FRAME_WIDTH" type="int" value="320" description="Width of video frames."/> <Parameter name="FRAME_HEIGHT" type="int" value="240" description="Height of video frames."/> <Parameter name="SKIN_GMM_FILENAME" type="string" value="./ColorGMMSkin.txt" description="Filename (including path) of the skin GMM model file."/> <Parameter name="SKIN_SCORE_THRESHOLD" type="float" value="5.3" description="Threshold for skin model score to consider a pixel as skin."/> </Node> <Node name="node_Constant_13" type="Constant" x="629.000000" y="-22.000000"> <Parameter name="VALUE" type="string" value="TextTrackingFrame" description="The value"/> </Node> <Node name="node_Constant_14" type="Constant" x="633.000000" y="258.000000"> <Parameter name="VALUE" type="string" value="FaceTrackingFrame" description="The value"/> </Node> <Node name="node_Subsumption_3" type="Subsumption" x="1638.000000" y="-173.000000"/> <Node name="node_NOP_2" type="NOP" x="2105.000000" y="-173.000000"/> <Node name="node_NOP_3" type="NOP" x="1787.000000" y="205.000000"/> <Node name="node_NOP_4" type="NOP" x="1.000000" y="82.000000"/> <Node name="node_NOP_5" type="NOP" x="-2.000000" y="202.000000"/> <Node name="node_NOP_6" type="NOP" x="-2.000000" y="248.000000"/> <Node name="node_NOP_7" type="NOP" x="-3.000000" y="-5.000000"/> <Node name="node_NOP_8" type="NOP" x="-3.000000" y="351.000000"/> <Node name="node_NOP_9" type="NOP" x="-3.000000" y="-38.000000"/> <Link from="node_NOP_1" output="OUTPUT" to="node_CvFaceDetection_1" input="IN_IMAGE">17 122 117 122 117 167 438 167.5 </Link> <Link from="node_NOP_1" output="OUTPUT" to="node_MultiIntegralCuesPFTracker_1" input="IMAGE_IN">17 122 116 122 116 -82 839 -82.5 </Link> <Link from="node_NOP_1" output="OUTPUT" to="node_TextSignDetect_1" input="IN_IMAGE">17 122 116 122 115 52 309 52 </Link> <Link from="node_TextSignDetect_1" output="OUT_ROI" to="node_MultiIntegralCuesPFTracker_1" input="DETECTED_ROI">664 67 757 68 756 -67 840 -67.5 </Link> <Link from="node_Constant_2" output="VALUE" to="node_MultiIntegralCuesPFTracker_1" input="INIT_VARIANCE"/> <Link from="node_Constant_4" output="VALUE" to="node_MultiIntegralCuesPFTracker_1" input="NOISE_VARIANCE"/> <Link from="node_Constant_2" output="VALUE" to="node_MultiIntegralCuesPFTracker_2" input="INIT_VARIANCE">524 -114 745 -113 745 96 839 94.5 </Link> <Link from="node_Constant_4" output="VALUE" to="node_MultiIntegralCuesPFTracker_2" input="NOISE_VARIANCE">627 -99 727 -98 726 110 839 109.5 </Link> <Link from="node_NOP_1" output="OUTPUT" to="node_MultiIntegralCuesPFTracker_2" input="IMAGE_IN"/> <Link from="node_TextSignDetect_1" output="TEXT_ROI_IMG" to="node_READv2_1" input="RGB15_BINARIZED">664 52 710 53 710 610 1153 611 </Link> <Link from="node_Subsumption_1" output="OUTPUT" to="node_CAMERA_CTRL_1" input="IN_ROI"/> <Link from="node_MultiIntegralCuesPFTracker_1" output="CURRENT_ROI" to="node_Subsumption_1" input="HIGH_PRIORITY">1293 -82.5 1461 -84 1462 109 1506.5 109.5 </Link> <Link from="node_MultiIntegralCuesPFTracker_2" output="CURRENT_ROI" to="node_Subsumption_1" input="LOW_PRIORITY"/> <Link from="node_MultiIntegralCuesPFTracker_2" output="IMAGE_OUT" to="node_Subsumption_2" input="LOW_PRIORITY">1294 109.5 1426 110 1427 -80 2027.5 -82.5 </Link> <Link from="node_MultiIntegralCuesPFTracker_1" output="IMAGE_OUT" to="node_Subsumption_2" input="HIGH_PRIORITY"/> <Link from="node_isNil_1" output="OUTPUT" to="node_IF_1" input="COND"/> <Link from="node_NilObject_2" output="VALUE" to="node_IF_1" input="ELSE"/> <Link from="node_isNil_2" output="OUTPUT" to="node_IF_2" input="COND"/> <Link from="node_Constant_10" output="VALUE" to="node_IF_2" input="THEN"/> <Link from="node_NilObject_3" output="VALUE" to="node_IF_2" input="ELSE"/> <Link from="node_Subsumption_1" output="OUTPUT" to="node_isNil_2" input="INPUT">1700.5 117 1728 116 1729 341 1759 341 </Link> <Link from="node_Subsumption_1" output="OUTPUT" to="node_isNil_1" input="INPUT">1700.5 117 1728 116 1727 -18 1750 -19 </Link> <Link from="node_Constant_12" output="VALUE" to="node_IF_1" input="THEN"/> <Link from="node_MultiIntegralCuesPFTracker_2" output="ROI_FOR_DETECTION" to="node_CvFaceDetection_1" input="IN_TRACKED_ROI">1294 169.5 1344 171 1344 238 409 237 409 198 438 197.5 </Link> <Link from="node_Add_1" output="OUTPUT" to="node_Max_1" input="INPUT1">2069.5 196 2075 196 2074 284 2084 285.5 </Link> <Link from="node_Constant_1" output="VALUE" to="node_Max_1" input="INPUT2"/> <Link from="node_NOP_1" output="OUTPUT" to="node_SkinColorGMMSegm_1" input="IN_IMAGE">17 122 116 123 117 188 157 187.5 </Link> <Link from="node_SkinColorGMMSegm_1" output="SEGMENTED_IMAGE" to="node_CvFaceDetection_1" input="IN_SKIN_MASK">377 195 396 194 396 183 438.5 182.5 </Link> <Link from="node_CvFaceDetection_1" output="OUT_ROI" to="node_MultiIntegralCuesPFTracker_2" input="DETECTED_ROI">665 190 754 190 753 140 839 139.5 </Link> <Link from="node_TextSignDetect_1" output="EDGES_ORI_SUM_IMG" to="node_MultiIntegralCuesPFTracker_2" input="EDGES_ORI_SUM_IMG">665 82 774 83 774 153 839 154.5 </Link> <Link from="node_TextSignDetect_1" output="EDGES_ORI_SUM_IMG" to="node_MultiIntegralCuesPFTracker_1" input="EDGES_ORI_SUM_IMG">664 82 774 83 775 -53 840 -52.5 </Link> <Link from="node_Constant_13" output="VALUE" to="node_MultiIntegralCuesPFTracker_1" input="FRAME_BASENAME"/> <Link from="node_Constant_14" output="VALUE" to="node_MultiIntegralCuesPFTracker_2" input="FRAME_BASENAME">667 258 774 259 774 184 839 184.5 </Link> <Link from="node_MultiIntegralCuesPFTracker_2" output="FRAME_FILENAME" to="node_Subsumption_3" input="LOW_PRIORITY">1294 184.5 1318 185 1319 -165 1491.5 -165.5 </Link> <Link from="node_MultiIntegralCuesPFTracker_1" output="FRAME_FILENAME" to="node_Subsumption_3" input="HIGH_PRIORITY">1293 -22.5 1308 -21 1306 -180 1491.5 -180.5 </Link> <Link from="node_Subsumption_3" output="OUTPUT" to="node_NOP_2" input="INPUT"/> <Link from="node_MultiIntegralCuesPFTracker_1" output="ROI_FOR_DETECTION" to="node_TextSignDetect_1" input="IN_TRACKED_ROI">1294 -37 1329 -36 1328 17 284 18 284 68 310 67 </Link> <Link from="node_CAMERA_CTRL_1" output="REL_ZOOM" to="node_Add_1" input="INPUT1"/> <Link from="node_NOP_3" output="OUTPUT" to="node_Add_1" input="INPUT2"/> <Link from="node_NOP_4" output="OUTPUT" to="node_TextSignDetect_1" input="ACTIVATION"/> <Link from="node_NOP_5" output="OUTPUT" to="node_SkinColorGMMSegm_1" input="ACTIVATION"/> <Link from="node_NOP_6" output="OUTPUT" to="node_CvFaceDetection_1" input="ACTIVATION">17 248 266 247 438 212.5 </Link> <Link from="node_NOP_7" output="OUTPUT" to="node_MultiIntegralCuesPFTracker_1" input="ACTIVATION"/> <Link from="node_NOP_8" output="OUTPUT" to="node_MultiIntegralCuesPFTracker_2" input="ACTIVATION">16 351 801 352 839 199.5 </Link> <Link from="node_NOP_9" output="OUTPUT" to="node_MultiIntegralCuesPFTracker_2" input="SHOW_TRACKED_ROI">16 -38 686 -39 687 170 839 169.5 </Link> <Link from="node_NOP_9" output="OUTPUT" to="node_MultiIntegralCuesPFTracker_1" input="SHOW_TRACKED_ROI"/> <NetInput name="NNET" node="node_READv2_1" terminal="NNET" object_type="any" description="No description available"/> <NetInput name="DICT" node="node_READv2_1" terminal="DICT" object_type="any" description="No description available"/> <NetInput name="BLACK_WHITE_LOOKUP" node="node_READv2_1" terminal="BLACK_WHITE_LOOKUP" object_type="any" description="No description available"/> <NetOutput name="FRAME_FILENAME" node="node_NOP_2" terminal="OUTPUT" object_type="any" description="The output = The input"/> <NetInput name="RGB24_320x240In" node="node_NOP_1" terminal="INPUT" object_type="any" description="The input"/> <NetOutput name="TEXT" node="node_READv2_1" terminal="SENTENCE" object_type="any" description="No description available"/> <NetOutput name="ORIGINAL_TEXT" node="node_READv2_1" terminal="ORIGINAL_TEXT" object_type="any" description="No description available"/> <NetOutput name="ABS_TILT" node="node_IF_1" terminal="OUTPUT" object_type="any" description="The object from THEN or ELSE depending on COND"/> <NetOutput name="REL_PAN" node="node_CAMERA_CTRL_1" terminal="REL_PAN" object_type="any" description="The output = The input"/> <NetOutput name="REL_TILT" node="node_CAMERA_CTRL_1" terminal="REL_TILT" object_type="any" description="The output = The input"/> <NetOutput name="REL_ZOOM" node="node_CAMERA_CTRL_1" terminal="REL_ZOOM" object_type="any" description="The output = The input"/> <NetOutput name="ABS_PAN" node="node_IF_2" terminal="OUTPUT" object_type="any" description="The object from THEN or ELSE depending on COND"/> <NetOutput name="ABS_ZOOM" node="node_Max_1" terminal="OUTPUT" object_type="any" description="The maximum value between INPUT1 and INPUT2"/> <NetInput name="CURRENT_ABS_ZOOM" node="node_NOP_3" terminal="INPUT" object_type="any" description="The input"/> <NetInput name="TEXT_DETECT_ACTIVATED" node="node_NOP_4" terminal="INPUT" object_type="any" description="The input"/> <NetInput name="SKIN_DETECT_ACTIVATION" node="node_NOP_5" terminal="INPUT" object_type="any" description="The input"/> <NetInput name="FACE_DETECT_ACTIVATION" node="node_NOP_6" terminal="INPUT" object_type="any" description="The input"/> <NetInput name="TEXT_EXTRACTION_ACTIVATED" node="node_READv2_1" terminal="SIGN_TRACKING_ACTIVATED" object_type="any" description="No description available"/> <NetInput name="TEXT_TRACKING_ACTIVATED" node="node_NOP_7" terminal="INPUT" object_type="any" description="The input"/> <NetInput name="FACE_TRACKING_ACTIVATED" node="node_NOP_8" terminal="INPUT" object_type="any" description="The input"/> <NetInput name="SHOW_TRACKED_ROI" node="node_NOP_9" terminal="INPUT" object_type="any" description="The input"/> <NetOutput name="RGB24_320x240Out" node="node_Subsumption_2" terminal="OUTPUT" object_type="any" description="No description available"/> <Note x="0" y="0" visible="0" text="Created with FlowDesigner 0.8.2"/> </Network> <Network type="subnet" name="CAMERA_CTRL"> <Node name="node_NOP_1" type="NOP" x="-1068.000000" y="-125.000000"/> <Node name="node_GetVisualROIParam_1" type="GetVisualROIParam" x="-960.000000" y="-125.000000"/> <Node name="node_IF_1" type="IF" x="-263.000000" y="-306.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_isNil_1" type="isNil" x="-537.000000" y="-320.000000"/> <Node name="node_Constant_1" type="Constant" x="-674.000000" y="-307.000000"> <Parameter name="VALUE" type="float" value="0.0" description="The value"/> </Node> <Node name="node_IF_2" type="IF" x="-267.000000" y="-191.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_isNil_2" type="isNil" x="-541.000000" y="-206.000000"/> <Node name="node_Constant_2" type="Constant" x="-679.000000" y="-191.000000"> <Parameter name="VALUE" type="float" value="0.0" description="The value"/> </Node> <Node name="node_GenericPID_1" type="GenericPID" x="42.000000" y="-300.000000"> <Parameter name="P_GAIN" type="float" value="0.25" description="Proportionnal gain."/> <Parameter name="I_GAIN" type="float" value="0.0" description="Integral gain."/> <Parameter name="D_GAIN" type="float" value="0.0" description="Derivative gain."/> <Parameter name="I_MAX" type="float" value="100" description="The maximum Integral value."/> </Node> <Node name="node_Constant_3" type="Constant" x="-679.000000" y="-153.000000"> <Parameter name="VALUE" type="int" value="120" description="The value"/> </Node> <Node name="node_Constant_4" type="Constant" x="-673.000000" y="-263.000000"> <Parameter name="VALUE" type="int" value="160" description="The value"/> </Node> <Node name="node_Constant_5" type="Constant" x="-115.000000" y="-292.000000"> <Parameter name="VALUE" type="bool" value="false" description="The value"/> </Node> <Node name="node_GenericPID_2" type="GenericPID" x="45.000000" y="-184.000000"> <Parameter name="P_GAIN" type="float" value="-0.25" description="Proportionnal gain."/> <Parameter name="I_GAIN" type="float" value="0.0" description="Integral gain."/> <Parameter name="D_GAIN" type="float" value="0.0" description="Derivative gain."/> <Parameter name="I_MAX" type="float" value="100" description="The maximum Integral value."/> </Node> <Node name="node_Constant_6" type="Constant" x="-112.000000" y="-176.000000"> <Parameter name="VALUE" type="bool" value="false" description="The value"/> </Node> <Node name="node_NOP_2" type="NOP" x="186.000000" y="-301.000000"/> <Node name="node_NOP_3" type="NOP" x="187.000000" y="-185.000000"/> <Node name="node_ToInt_1" type="ToInt" x="119.000000" y="-300.000000"/> <Node name="node_ToInt_2" type="ToInt" x="122.000000" y="-185.000000"/> <Node name="node_ToFloat_1" type="ToFloat" x="-406.000000" y="-272.000000"/> <Node name="node_ToFloat_2" type="ToFloat" x="-414.000000" y="-160.000000"/> <Node name="node_Sub_1" type="Sub" x="-485.000000" y="-272.000000"/> <Node name="node_Sub_2" type="Sub" x="-490.000000" y="-160.000000"/> <Node name="node_IF_4" type="IF" x="794.000000" y="119.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_Constant_10" type="Constant" x="576.000000" y="74.000000"> <Parameter name="VALUE" type="int" value="0" description="The value"/> </Node> <Node name="node_IF_5" type="IF" x="666.000000" y="135.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_AND_1" type="AND" x="283.000000" y="128.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="false" description="Pull on INPUT2 even if INPUT1 is false"/> </Node> <Node name="node_Smaller_1" type="Smaller" x="136.000000" y="119.000000"/> <Node name="node_NOP_4" type="NOP" x="-171.000000" y="114.000000"/> <Node name="node_NOP_5" type="NOP" x="-199.000000" y="172.000000"/> <Node name="node_NOP_6" type="NOP" x="-107.000000" y="26.000000"/> <Node name="node_Constant_11" type="Constant" x="-33.000000" y="127.000000"> <Parameter name="VALUE" type="float" value="25" description="The value"/> </Node> <Node name="node_Smaller_2" type="Smaller" x="135.000000" y="180.000000"/> <Node name="node_AND_2" type="AND" x="439.000000" y="120.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="false" description="Pull on INPUT2 even if INPUT1 is false"/> </Node> <Node name="node_Greater_3" type="Greater" x="271.000000" y="56.000000"/> <Node name="node_Constant_12" type="Constant" x="-116.000000" y="62.000000"> <Parameter name="VALUE" type="int" value="25" description="The value"/> </Node> <Node name="node_Constant_13" type="Constant" x="178.000000" y="264.000000"> <Parameter name="VALUE" type="int" value="-50" description="The value"/> </Node> <Node name="node_IF_6" type="IF" x="425.000000" y="250.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_Constant_14" type="Constant" x="279.000000" y="250.000000"> <Parameter name="VALUE" type="int" value="0" description="The value"/> </Node> <Node name="node_Constant_15" type="Constant" x="509.000000" y="134.000000"> <Parameter name="VALUE" type="int" value="50" description="The value"/> </Node> <Node name="node_ABS_1" type="ABS" x="-113.000000" y="112.000000"/> <Node name="node_ABS_2" type="ABS" x="-108.000000" y="172.000000"/> <Node name="node_isNil_3" type="isNil" x="665.000000" y="-91.000000"/> <Node name="node_Add_1" type="Add" x="-637.000000" y="7.000000"/> <Node name="node_Add_2" type="Add" x="-639.000000" y="100.000000"/> <Node name="node_Sub_3" type="Sub" x="-637.000000" y="-35.000000"/> <Node name="node_Sub_4" type="Sub" x="-636.000000" y="54.000000"/> <Node name="node_Min_1" type="Min" x="-519.000000" y="-11.000000"/> <Node name="node_Min_2" type="Min" x="-519.000000" y="76.000000"/> <Node name="node_Min_3" type="Min" x="-400.000000" y="26.000000"/> <Node name="node_NOP_7" type="NOP" x="926.000000" y="119.000000"/> <Node name="node_ToInt_3" type="ToInt" x="857.000000" y="118.000000"/> <Link from="node_isNil_1" output="OUTPUT" to="node_IF_1" input="COND"/> <Link from="node_Constant_1" output="VALUE" to="node_IF_1" input="THEN"/> <Link from="node_isNil_2" output="OUTPUT" to="node_IF_2" input="COND"/> <Link from="node_Constant_2" output="VALUE" to="node_IF_2" input="THEN"/> <Link from="node_GetVisualROIParam_1" output="CENTER_Y" to="node_isNil_2" input="INPUT">-802.5 -140 -747 -139 -746 -205 -559 -206 </Link> <Link from="node_Constant_5" output="VALUE" to="node_GenericPID_1" input="RESET"/> <Link from="node_Constant_6" output="VALUE" to="node_GenericPID_2" input="RESET"/> <Link from="node_GenericPID_1" output="OUTPUT" to="node_ToInt_1" input="INPUT"/> <Link from="node_GenericPID_2" output="OUTPUT" to="node_ToInt_2" input="INPUT"/> <Link from="node_ToInt_2" output="OUTPUT" to="node_NOP_3" input="INPUT"/> <Link from="node_NOP_1" output="OUTPUT" to="node_GetVisualROIParam_1" input="IN_ROI"/> <Link from="node_GetVisualROIParam_1" output="CENTER_X" to="node_isNil_1" input="INPUT">-802.5 -155 -766 -154 -765 -320 -555 -320 </Link> <Link from="node_ToFloat_1" output="OUTPUT" to="node_IF_1" input="ELSE">-379 -272 -340 -272 -340 -290 -318 -291 </Link> <Link from="node_ToFloat_2" output="OUTPUT" to="node_IF_2" input="ELSE">-387 -160 -341 -161 -342 -175 -322 -176 </Link> <Link from="node_ToInt_1" output="OUTPUT" to="node_NOP_2" input="INPUT"/> <Link from="node_Sub_1" output="OUTPUT" to="node_ToFloat_1" input="INPUT"/> <Link from="node_Constant_4" output="VALUE" to="node_Sub_1" input="INPUT2"/> <Link from="node_GetVisualROIParam_1" output="CENTER_X" to="node_Sub_1" input="INPUT1">-802.5 -155 -763 -154 -764 -280 -556.5 -279.5 </Link> <Link from="node_Constant_3" output="VALUE" to="node_Sub_2" input="INPUT2"/> <Link from="node_Sub_2" output="OUTPUT" to="node_ToFloat_2" input="INPUT"/> <Link from="node_GetVisualROIParam_1" output="CENTER_Y" to="node_Sub_2" input="INPUT1">-802.5 -140 -746 -139 -747 -166 -561.5 -167.5 </Link> <Link from="node_AND_2" output="OUTPUT" to="node_IF_5" input="COND"/> <Link from="node_Constant_15" output="VALUE" to="node_IF_5" input="THEN"/> <Link from="node_IF_6" output="OUTPUT" to="node_IF_5" input="ELSE">435 250 575 250 574 151 611 150 </Link> <Link from="node_Smaller_1" output="OUTPUT" to="node_AND_1" input="INPUT1"/> <Link from="node_Smaller_2" output="OUTPUT" to="node_AND_1" input="INPUT2">164.5 180 191 179 190 136 209.5 135.5 </Link> <Link from="node_Constant_11" output="VALUE" to="node_Smaller_1" input="INPUT2"/> <Link from="node_Constant_11" output="VALUE" to="node_Smaller_2" input="INPUT2">1 127 1 187 51.5 187.5 </Link> <Link from="node_Greater_3" output="OUTPUT" to="node_AND_2" input="INPUT1">300.5 56 326 56 327 113 365.5 112.5 </Link> <Link from="node_AND_1" output="OUTPUT" to="node_AND_2" input="INPUT2"/> <Link from="node_NOP_6" output="OUTPUT" to="node_Greater_3" input="INPUT1">-88 26 105 27 104 47 187.5 48.5 </Link> <Link from="node_Constant_12" output="VALUE" to="node_Greater_3" input="INPUT2"/> <Link from="node_Greater_3" output="OUTPUT" to="node_IF_6" input="COND">300.5 56 327 55 327 234 370 235 </Link> <Link from="node_Constant_14" output="VALUE" to="node_IF_6" input="THEN"/> <Link from="node_Constant_13" output="VALUE" to="node_IF_6" input="ELSE"/> <Link from="node_NOP_5" output="OUTPUT" to="node_ABS_2" input="INPUT"/> <Link from="node_NOP_4" output="OUTPUT" to="node_ABS_1" input="INPUT"/> <Link from="node_ABS_1" output="OUTPUT" to="node_Smaller_1" input="INPUT1"/> <Link from="node_ABS_2" output="OUTPUT" to="node_Smaller_2" input="INPUT1"/> <Link from="node_GetVisualROIParam_1" output="CENTER_X" to="node_isNil_3" input="INPUT">-802.5 -155 -763 -154 -764 -90 102 -89 102 -90 647 -91 </Link> <Link from="node_IF_1" output="OUTPUT" to="node_NOP_4" input="INPUT">-253 -306 -225 -307 -224 113 -190 114 </Link> <Link from="node_IF_2" output="OUTPUT" to="node_NOP_5" input="INPUT">-257 -191 -235 -191 -234 171 -218 172 </Link> <Link from="node_GetVisualROIParam_1" output="CENTER_X" to="node_Sub_3" input="INPUT1">-802.5 -155 -764 -154 -763 -44 -708.5 -42.5 </Link> <Link from="node_GetVisualROIParam_1" output="CENTER_X" to="node_Add_1" input="INPUT1">-802.5 -155 -764 -154 -764 0 -708.5 -0.5 </Link> <Link from="node_GetVisualROIParam_1" output="HALF_WIDTH" to="node_Add_1" input="INPUT2">-802.5 -125 -774 -125 -773 14 -708.5 14.5 </Link> <Link from="node_Sub_3" output="OUTPUT" to="node_Min_1" input="INPUT1">-619.5 -35 -608 -35 -607 -21 -589 -18.5 </Link> <Link from="node_Add_1" output="OUTPUT" to="node_Min_1" input="INPUT2">-619.5 7 -607 6 -607 -5 -589 -3.5 </Link> <Link from="node_GetVisualROIParam_1" output="CENTER_Y" to="node_Sub_4" input="INPUT1">-802.5 -140 -747 -139 -746 47 -707.5 46.5 </Link> <Link from="node_GetVisualROIParam_1" output="HALF_HEIGHT" to="node_Sub_4" input="INPUT2">-802.5 -110 -787 -109 -787 60 -707.5 61.5 </Link> <Link from="node_GetVisualROIParam_1" output="CENTER_Y" to="node_Add_2" input="INPUT1">-802.5 -140 -747 -139 -746 91 -710.5 92.5 </Link> <Link from="node_GetVisualROIParam_1" output="HALF_HEIGHT" to="node_Add_2" input="INPUT2">-802.5 -110 -788 -109 -787 109 -710.5 107.5 </Link> <Link from="node_Sub_4" output="OUTPUT" to="node_Min_2" input="INPUT1">-618.5 54 -606 53 -605 69 -589 68.5 </Link> <Link from="node_Add_2" output="OUTPUT" to="node_Min_2" input="INPUT2">-621.5 100 -604 100 -604 86 -589 83.5 </Link> <Link from="node_Min_1" output="OUTPUT" to="node_Min_3" input="INPUT1">-503 -11 -492 -11 -491 19 -470 18.5 </Link> <Link from="node_Min_2" output="OUTPUT" to="node_Min_3" input="INPUT2">-503 76 -489 75 -489 34 -470 33.5 </Link> <Link from="node_Min_3" output="OUTPUT" to="node_NOP_6" input="INPUT"/> <Link from="node_IF_5" output="OUTPUT" to="node_IF_4" input="ELSE"/> <Link from="node_IF_4" output="OUTPUT" to="node_ToInt_3" input="INPUT"/> <Link from="node_ToInt_3" output="OUTPUT" to="node_NOP_7" input="INPUT"/> <Link from="node_IF_1" output="OUTPUT" to="node_GenericPID_1" input="EPSILON"/> <Link from="node_IF_2" output="OUTPUT" to="node_GenericPID_2" input="EPSILON"/> <Link from="node_GetVisualROIParam_1" output="HALF_WIDTH" to="node_Sub_3" input="INPUT2">-801 -126 -774 -125 -773 -28 -708.5 -27.5 </Link> <Link from="node_isNil_3" output="OUTPUT" to="node_IF_4" input="COND">683 -91 711 -91 711 104 739 104 </Link> <Link from="node_Constant_10" output="VALUE" to="node_IF_4" input="THEN"/> <NetInput name="IN_ROI" node="node_NOP_1" terminal="INPUT" object_type="any" description="The input"/> <NetOutput name="REL_PAN" node="node_NOP_2" terminal="OUTPUT" object_type="any" description="The output = The input"/> <NetOutput name="REL_TILT" node="node_NOP_3" terminal="OUTPUT" object_type="any" description="The output = The input"/> <NetOutput name="REL_ZOOM" node="node_NOP_7" terminal="OUTPUT" object_type="any" description="The output = The input"/> <Note x="0" y="0" visible="0" text="Created with FlowDesigner 0.9.0"/> </Network> <Network type="subnet" name="ABS"> <Node name="node_IF_1" type="IF" x="-231.000000" y="-8.000000"> <Parameter name="PULL_ANYWAY" type="bool" value="" description="If true, the IF statement pulls also on the branch not taken"/> </Node> <Node name="node_Mul_1" type="Mul" x="-387.000000" y="-9.000000"/> <Node name="node_Constant_1" type="Constant" x="-593.000000" y="-1.000000"> <Parameter name="VALUE" type="float" value="-1" description="The value"/> </Node> <Node name="node_NOP_1" type="NOP" x="-901.000000" y="-99.000000"/> <Node name="node_Smaller_1" type="Smaller" x="-379.000000" y="-90.000000"/> <Node name="node_Constant_2" type="Constant" x="-594.000000" y="-81.000000"> <Parameter name="VALUE" type="float" value="0" description="The value"/> </Node> <Link from="node_Smaller_1" output="OUTPUT" to="node_IF_1" input="COND"/> <Link from="node_Mul_1" output="OUTPUT" to="node_IF_1" input="THEN"/> <Link from="node_NOP_1" output="OUTPUT" to="node_IF_1" input="ELSE">-882 -99 -816 61 -456 61 -286 7 </Link> <Link from="node_NOP_1" output="OUTPUT" to="node_Mul_1" input="INPUT1"/> <Link from="node_Constant_1" output="VALUE" to="node_Mul_1" input="INPUT2"/> <Link from="node_NOP_1" output="OUTPUT" to="node_Smaller_1" input="INPUT1"/> <Link from="node_Constant_2" output="VALUE" to="node_Smaller_1" input="INPUT2"/> <NetInput name="INPUT" node="node_NOP_1" terminal="INPUT" object_type="any" description="The input"/> <NetOutput name="OUTPUT" node="node_IF_1" terminal="OUTPUT" object_type="any" description="The object from THEN or ELSE depending on COND"/> <Note x="0" y="0" visible="0" text="Created with FlowDesigner 0.9.0"/> </Network> <Network type="subnet" name="AUTO_SCALE"> <Node name="node_NOP_2" type="NOP" x="-736.000000" y="-90.000000"/> <Node name="node_Power_1" type="Power" x="-273.000000" y="-85.000000"/> <Node name="node_Mul_1" type="Mul" x="-422.000000" y="-76.000000"/> <Node name="node_Constant_1" type="Constant" x="-588.000000" y="26.000000"> <Parameter name="VALUE" type="float" value="-1" description="The value"/> </Node> <Node name="node_NOP_3" type="NOP" x="102.000000" y="-140.000000"/> <Node name="node_Constant_2" type="Constant" x="-436.000000" y="-126.000000"> <Parameter name="VALUE" type="float" value="1.1" description="The value"/> </Node> <Node name="node_Mul_2" type="Mul" x="-56.000000" y="-140.000000"/> <Node name="node_Sub_1" type="Sub" x="-561.000000" y="-82.000000"/> <Node name="node_Constant_3" type="Constant" x="-720.000000" y="-50.000000"> <Parameter name="VALUE" type="float" value="1" description="The value"/> </Node> <Node name="node_Div_1" type="Div" x="-336.000000" y="-251.000000"/> <Node name="node_Constant_4" type="Constant" x="-450.000000" y="-217.000000"> <Parameter name="VALUE" type="float" value="683" description="The value"/> </Node> <Node name="node_Add_1" type="Add" x="-227.000000" y="-259.000000"/> <Node name="node_Constant_5" type="Constant" x="-383.000000" y="-311.000000"> <Parameter name="VALUE" type="float" value="1.0" description="The value"/> </Node> <Link from="node_Constant_2" output="VALUE" to="node_Power_1" input="BASE"/> <Link from="node_Mul_1" output="OUTPUT" to="node_Power_1" input="EXP"/> <Link from="node_Sub_1" output="OUTPUT" to="node_Mul_1" input="INPUT1"/> <Link from="node_Constant_1" output="VALUE" to="node_Mul_1" input="INPUT2"/> <Link from="node_Mul_2" output="OUTPUT" to="node_NOP_3" input="INPUT"/> <Link from="node_Power_1" output="OUTPUT" to="node_Mul_2" input="INPUT2"/> <Link from="node_NOP_2" output="OUTPUT" to="node_Sub_1" input="INPUT1"/> <Link from="node_Constant_3" output="VALUE" to="node_Sub_1" input="INPUT2"/> <Link from="node_Constant_4" output="VALUE" to="node_Div_1" input="DEN"/> <Link from="node_Constant_5" output="VALUE" to="node_Add_1" input="INPUT1"/> <Link from="node_Div_1" output="OUTPUT" to="node_Add_1" input="INPUT2"/> <Link from="node_Add_1" output="OUTPUT" to="node_Mul_2" input="INPUT1"/> <NetOutput name="OUTPUT" node="node_NOP_3" terminal="OUTPUT" object_type="any" description="The output = The input"/> <NetInput name="INPUT" node="node_Div_1" terminal="NUM" object_type="any" description="The numerator"/> <NetInput name="ABS_ZOOM" node="node_NOP_2" terminal="INPUT" object_type="any" description="The input"/> <Note x="0" y="0" visible="0" text="Created with FlowDesigner 0.9.0"/> </Network> <Parameter name="DEFAULT_ABS_PAN_COMMAND" type="int" value="0"/> <Parameter name="DEFAULT_ABS_TILT_COMMAND" type="int" value="-300"/> </Document> |
|
From: Carle C. <car...@us...> - 2005-06-27 17:50:05
|
Update of /cvsroot/robotflow/RobotFlow/Audio/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12059/Audio/src Added Files: Makefile.am SourceInfo.cpp Log Message: added --- NEW FILE: Makefile.am --- ## Process this file with automake to produce Makefile.in. -*-Makefile-*- # Disable automatic dependency tracking if using other tools than gcc and gmake #AUTOMAKE_OPTIONS = no-dependencies INCLUDES = -I../include $(OVERFLOW_INCLUDE) lib_LTLIBRARIES = libAudio.la libAudio_la_SOURCES = SourceInfo.cpp install-data-local: echo "Installing libAudio FlowDesigner toolbox in $(libdir)" mkdir -p $(libdir) (perl $(OVERFLOW_BIN)/info2def.pl $(libAudio_la_SOURCES) > $(prefix)/Audio.def) (cd $(libdir); rm -f Audio.tlb; ln -s libAudio.so Audio.tlb) libAudio_la_LDFLAGS = -release $(LT_RELEASE) $(OVERFLOW_LIB) --- NEW FILE: SourceInfo.cpp --- // Copyright (C) 2002-2004 Jean-Marc Valin #include "SourceInfo.h" #include "Vector.h" using namespace FD; DECLARE_TYPE(SourceInfo); DECLARE_TYPE(Vector<SourceInfo>); void SourceInfo::printOn(std::ostream &out) const { out << "<SourceInfo " << std::endl; out << "<x " << x[0] << " " << x[1] << " " << x[2] << " >" << std::endl; out << "<strength " << strength << " >" << std::endl; out << "<source_id " << source_id << " >" << std::endl; out << ">" << std::endl; } |
|
From: Carle C. <car...@us...> - 2005-06-27 17:50:04
|
Update of /cvsroot/robotflow/RobotFlow/Audio/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12059/Audio/include Added Files: Makefile.am SourceInfo.h Log Message: added --- NEW FILE: Makefile.am --- AUTOMAKE_OPTIONS = no-dependencies include_HEADERS = SourceInfo.h --- NEW FILE: SourceInfo.h --- #include "Object.h" #include "ObjectParser.h" #include <cmath> #include "misc.h" class SourceInfo : public FD::Object { public: float delta[7]; float x[3]; float strength; int interval; int eval_count; int start_time; int source_id; double remaining; float angle(const float *y) const { float prod = x[0]*y[0] + x[1]*y[1] + x[2]*y[2]; if (prod < -1) prod=-1; if (prod>1) prod = 1; return std::acos(prod); } float angle(const SourceInfo &s) const {return std::acos(x[0]*s.x[0] + x[1]*s.x[1] + x[2]*s.x[2]);} void printOn(std::ostream &out=std::cout) const; FD::ObjectRef clone() { return FD::ObjectRef(new SourceInfo(*this)); } void readFrom(std::istream &in) { } friend std::istream &operator >> (std::istream &in, SourceInfo &cell); }; inline std::istream &operator >> (std::istream &in, SourceInfo &src) { if (!FD::isValidType(in, "SourceInfo")) return in; src.readFrom(in); return in; } |
|
From: Carle C. <car...@us...> - 2005-06-27 17:50:04
|
Update of /cvsroot/robotflow/RobotFlow/Audio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12059/Audio Added Files: Makefile.am Log Message: added --- NEW FILE: Makefile.am --- ## Process this file with automake to produce Makefile.in. -*-Makefile-*- # Disable automatic dependency tracking if using other tools than gcc and gmake #AUTOMAKE_OPTIONS = no-dependencies SUBDIRS = src include |
|
From: Carle C. <car...@us...> - 2005-06-27 17:49:19
|
Update of /cvsroot/robotflow/RobotFlow/Audio/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11666/Audio/src Log Message: Directory /cvsroot/robotflow/RobotFlow/Audio/src added to the repository |
|
From: Carle C. <car...@us...> - 2005-06-27 17:49:11
|
Update of /cvsroot/robotflow/RobotFlow/Audio/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11666/Audio/include Log Message: Directory /cvsroot/robotflow/RobotFlow/Audio/include added to the repository |
|
From: Carle C. <car...@us...> - 2005-06-27 17:48:59
|
Update of /cvsroot/robotflow/RobotFlow/Audio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11512/Audio Log Message: Directory /cvsroot/robotflow/RobotFlow/Audio added to the repository |
|
From: Carle C. <car...@us...> - 2005-06-27 17:46:47
|
Update of /cvsroot/robotflow/RobotFlow In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10472 Modified Files: configure.in Makefile.am Log Message: add audio directory Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Makefile.am,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Makefile.am 23 Jul 2004 17:20:51 -0000 1.19 --- Makefile.am 27 Jun 2005 17:46:36 -0000 1.20 *************** *** 12,16 **** EXTRA_DIST = RobotFlow.spec RobotFlow.spec.in ! SUBDIRS = Pioneer2 Generic Behaviors Vision Control Devices Probes FSM $(PLAYER_DIR) $(MARIE_DIR) rpm: dist --- 12,16 ---- EXTRA_DIST = RobotFlow.spec RobotFlow.spec.in ! SUBDIRS = Pioneer2 Generic Behaviors Audio Vision Control Devices Probes FSM $(PLAYER_DIR) $(MARIE_DIR) rpm: dist Index: configure.in =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/configure.in,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** configure.in 12 Apr 2005 19:22:51 -0000 1.50 --- configure.in 27 Jun 2005 17:46:34 -0000 1.51 *************** *** 283,287 **** Behaviors/include/Makefile \ Behaviors/src/Makefile \ ! Vision/Makefile \ Vision/include/Makefile \ Vision/src/Makefile \ --- 283,290 ---- Behaviors/include/Makefile \ Behaviors/src/Makefile \ ! Audio/Makefile \ ! Audio/include/Makefile \ ! Audio/src/Makefile \ ! Vision/Makefile \ Vision/include/Makefile \ Vision/src/Makefile \ |
|
From: Carle C. <car...@us...> - 2005-06-27 17:44:08
|
Update of /cvsroot/robotflow/RobotFlow/MARIE/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9089/MARIE/include Modified Files: Makefile.am Added Files: MarieDataLocalisation.h Log Message: added --- NEW FILE: MarieDataLocalisation.h --- /* * MARIE - Mobile and Autonomous Robotics Integration Environment * Copyright (C) 2004 Carle Cote * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * You can contact MARIE development team at http://marie.sourceforge.net */ // Prevent Multiple Inclusion #ifndef _MARIE_DATA_LOCALISATION_H_ #define _MARIE_DATA_LOCALISATION_H_ //FlowDesigner include #include "Object.h" #include "MarieObject.h" //MARIE data types include #include "DataLocalisation.h" namespace marie { class MarieDataLocalisation : public MarieObject, public DataLocalisation { public: MarieDataLocalisation(); MarieDataLocalisation(const DataLocalisation &command); //from BufferedNode MarieDataLocalisation(std::string nodeName, FD::ParameterSet params); virtual void calculate(int output_id, int count, FD::Buffer &out); virtual void printOn(std::ostream &out) const; virtual void readFrom(std::istream &in=std::cin); virtual void copyDataAbstract(DataAbstract *data); private: bool m_isNode; //inputs int m_dataInID; int m_vectorInID; //outputs int m_dataOutID; int m_vectorOutID; }; } #endif Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/Makefile.am,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Makefile.am 22 Sep 2004 19:47:06 -0000 1.11 --- Makefile.am 27 Jun 2005 17:43:08 -0000 1.12 *************** *** 4,7 **** --- 4,8 ---- MarieCommandMotor.h \ MarieDataLaser.h \ + MarieDataLocalisation.h \ MarieDataIR.h \ MarieDataBumper.h \ *************** *** 19,23 **** MarieCommandJoystick.h \ MarieDataMap.h \ ! MarieRequestSystem.h include_HEADERS = MarieObject.h --- 20,24 ---- MarieCommandJoystick.h \ MarieDataMap.h \ ! MarieRequestSystem.h include_HEADERS = MarieObject.h |
|
From: Carle C. <car...@us...> - 2005-06-27 17:43:36
|
Update of /cvsroot/robotflow/RobotFlow/MARIE/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9089/MARIE/src Modified Files: Makefile.am Added Files: extractMarieDataLocalisation.cpp MarieDataLocalisation.cpp newMarieDataLocalisation.cpp Log Message: added --- NEW FILE: newMarieDataLocalisation.cpp --- /* * MARIE - Mobile and Autonomous Robotics Integration Environment * Copyright (C) 2004 Dominic Letourneau / Carle Cote * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * You can contact MARIE development team at http://marie.sourceforge.net */ #include <sstream> #include <string> #include "MarieDataLocalisation.h" #include "MarieXMLDataFactory.h" #include "Behavior.h" #include "Vector.h" #include "MarieDataNull.h" #include "SourceInfo.h" using namespace std; using namespace FD; namespace marie { //forward declaration class newMarieDataLocalisation; DECLARE_NODE(newMarieDataLocalisation) /*Node * * @name newMarieDataLocalisation * @category RobotFlow:MARIE:DATA * @description Create an object of type MarieDataLocalisation * * @input_name SOURCES_INFO_VECTOR * @input_type Vector<ObjectRef> * @input_description input X, nilObject if not used * * @output_name DATA_LOCALISATION * @output_type MarieDataLocalisation * @output_description MarieDataLocalisation object * END*/ using namespace std; using namespace FD; class newMarieDataLocalisation : public BufferedNode { private: //inputs int m_sourcesInfoVectorID; //outputs int m_dataLocalisationID; public: newMarieDataLocalisation(string nodeName, ParameterSet params) : BufferedNode(nodeName,params) { //inputs m_sourcesInfoVectorID = addInput("SOURCES_INFO_VECTOR"); //outputs m_dataLocalisationID = addOutput("DATA_LOCALISATION"); } void calculate(int output_id, int count, Buffer &out) { MarieDataLocalisation *data = NULL; //get all inputs ObjectRef vectorInValue = getInput(m_sourcesInfoVectorID,count); if (!vectorInValue->isNil()) { RCPtr<FD::Vector<FD::ObjectRef> > inputData = vectorInValue; data = new MarieDataLocalisation(); for(int i = 0; i < inputData->size(); i++) { RCPtr<SourceInfo> sourceInfoData = inputData->getIndex(i); DataLocalisation::SourceStruct* sourceStr = new DataLocalisation::SourceStruct(); sourceStr->x = sourceInfoData->x[0]; sourceStr->y = sourceInfoData->x[1]; sourceStr->z = sourceInfoData->x[2]; sourceStr->strength = sourceInfoData->strength; sourceStr->id = sourceInfoData->source_id; data->addSource(sourceStr); } } if(data != 0) { //output values (*outputs[m_dataLocalisationID].buffer)[count] = ObjectRef(data); } } };//class newMarieDataLocalisation }//namespace marie --- NEW FILE: extractMarieDataLocalisation.cpp --- /* * MARIE - Mobile and Autonomous Robotics Integration Environment * Copyright (C) 2004 Dominic Letourneau / Carle Cote * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * You can contact MARIE development team at http://marie.sourceforge.net */ #include <sstream> #include <string> #include "MarieDataLocalisation.h" #include "MarieXMLDataFactory.h" #include "Behavior.h" #include "Vector.h" #include "MarieDataNull.h" #include "SourceInfo.h" using namespace std; using namespace FD; namespace marie { //forward declaration class extractMarieDataLocalisation; DECLARE_NODE(extractMarieDataLocalisation) /*Node * * @name extractMarieDataLocalisation * @category RobotFlow:MARIE:DATA * @description Extract data in the FlowDesigner format from MarieDataLocalisation * * @input_name DATA_LOCALISATION * @input_type MarieDataLocalisation * @input_description MarieDataLocalisation object * * @output_name SOURCES_INFO_VECTOR * @output_type Vector<ObjectRef> * @output_description output X * END*/ using namespace std; class extractMarieDataLocalisation : public BufferedNode { private: //intputs int m_dataLocalisationID; //outputs int m_sourcesInfoVectorID; public: extractMarieDataLocalisation(string nodeName, ParameterSet params) : BufferedNode(nodeName,params) { //inputs m_dataLocalisationID = addInput("DATA_LOCALISATION"); //outputs m_sourcesInfoVectorID = addOutput("SOURCES_INFO_VECTOR"); } void calculate(int output_id, int count, Buffer &out) { Vector<ObjectRef>* vector = NULL; //get all inputs ObjectRef dataInValue = getInput(m_dataLocalisationID,count); //create command object if (!dataInValue->isNil()) { RCPtr<MarieDataLocalisation> dataIn = dataInValue; const std::map<int, DataLocalisation::SourceStruct*> sourcesMap = dataIn->getSources(); std::map<int, DataLocalisation::SourceStruct*>::const_iterator iter; int size = sourcesMap.size(); vector = Vector<ObjectRef>::alloc(size); int i = 0; for(iter = sourcesMap.begin(); iter != sourcesMap.end(); iter++) { DataLocalisation::SourceStruct* source = (*iter).second; SourceInfo* sourceInfo = new SourceInfo(); sourceInfo->x[0] = source->x; sourceInfo->x[1] = source->y; sourceInfo->x[2] = source->z; sourceInfo->strength = source->strength; sourceInfo->source_id = source->id; vector->setIndex(i++, ObjectRef(sourceInfo)); } } if (vector != 0) { //output values (*outputs[m_sourcesInfoVectorID].buffer)[count] = ObjectRef(vector); } else { //output values (*outputs[m_sourcesInfoVectorID].buffer)[count] = nilObject; } } };//class extractMarieDataLocalisation }//namespace marie Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/Makefile.am,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** Makefile.am 30 Mar 2005 15:29:20 -0000 1.24 --- Makefile.am 27 Jun 2005 17:43:20 -0000 1.25 *************** *** 3,7 **** #AUTOMAKE_OPTIONS = no-dependencies ! INCLUDES = -I../include -I../../Behaviors/include \ $(OVERFLOW_INCLUDE) $(MARIE_INCLUDES) $(XML2_INCLUDE) --- 3,7 ---- #AUTOMAKE_OPTIONS = no-dependencies ! INCLUDES = -I../include -I../../Behaviors/include -I../../Audio/include \ $(OVERFLOW_INCLUDE) $(MARIE_INCLUDES) $(XML2_INCLUDE) *************** *** 15,18 **** --- 15,19 ---- MariePeek.cpp \ MarieDataLaser.cpp \ + MarieDataLocalisation.cpp \ MarieDataSonar.cpp \ MarieDataCamera.cpp \ *************** *** 29,32 **** --- 30,34 ---- MarieRequestSystem.cpp \ newMarieDataLaser.cpp \ + newMarieDataLocalisation.cpp \ newMarieDataSonar.cpp \ newMarieDataCamera.cpp \ *************** *** 42,45 **** --- 44,48 ---- newMarieCommandJoystick.cpp \ extractMarieDataLaser.cpp \ + extractMarieDataLocalisation.cpp \ extractMarieDataSonar.cpp \ extractMarieDataCamera.cpp \ *************** *** 55,58 **** --- 58,62 ---- extractMarieCommandJoystick.cpp \ isMarieDataNull.cpp + install-data-local: --- NEW FILE: MarieDataLocalisation.cpp --- /* * MARIE - Mobile and Autonomous Robotics Integration Environment * Copyright (C) 2004 Carle Cote * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * You can contact MARIE development team at http://marie.sourceforge.net */ #include "MarieDataLocalisation.h" #include <sstream> #include <string> #include "Vector.h" #include "SourceInfo.h" #include "MarieXMLDataFactory.h" class MarieDataLocalisation; using namespace std; using namespace FD; namespace marie { DECLARE_NODE(MarieDataLocalisation) /*Node * * @name MarieDataLocalisation * @category RobotFlow:MARIE:zdeprecated * @description Read & Create MarieDataLocalisation data object * * @input_name DATA_LOCALISATION * @input_type Input MarieDataLocalisation * @input_description input DataLocalisation, nilObject if not used * * @input_name SourceInfoVector * @input_type Vector<ObjectRef> * @input_description input X, nilObject if not used * * @output_name DATA_LOCALISATION * @output_type MarieDataLocalisation * @output_description Output DataLocalisation * * @output_name SourceInfoVector * @output_type Vector<ObjectRef> * @output_description output X * END*/ using namespace std; DECLARE_TYPE2(DataLocalisation::ID,MarieDataLocalisation) MarieDataLocalisation::MarieDataLocalisation() : MarieObject("MarieDataLocalisation",ParameterSet()), m_isNode(false) { } MarieDataLocalisation::MarieDataLocalisation (const DataLocalisation &command) : MarieObject("MarieDataLocalisation",ParameterSet()), DataLocalisation(command), m_isNode(false) { } MarieDataLocalisation::MarieDataLocalisation(std::string nodeName, FD::ParameterSet params) : MarieObject(nodeName,params), m_isNode(true) { //used as a BufferedNode, create inputs & outputs //inputs m_dataInID = addInput("DATA_LOCALISATION"); m_vectorInID = addInput("SourceInfoVector"); //outputs m_dataOutID = addOutput("DATA_LOCALISATION"); m_vectorOutID = addOutput("SourceInfoVector"); } void MarieDataLocalisation::calculate(int output_id, int count, FD::Buffer &out) { if (m_isNode) { MarieDataLocalisation *data = NULL; Vector<ObjectRef>* vector = NULL; //get all inputs ObjectRef dataInValue = getInput(m_dataInID,count); ObjectRef vectorInValue = getInput(m_vectorInID,count); //create command object if (!dataInValue->isNil()) { RCPtr<MarieDataLocalisation> inputData = dataInValue; //copy input command data = new MarieDataLocalisation(*inputData); const std::map<int, DataLocalisation::SourceStruct*> sourcesMap = data->getSources(); std::map<int, DataLocalisation::SourceStruct*>::const_iterator iter; int size = sourcesMap.size(); vector = Vector<ObjectRef>::alloc(size); int i = 0; for(iter = sourcesMap.begin(); iter != sourcesMap.end(); iter++) { SourceStruct* source = (*iter).second; SourceInfo* sourceInfo = new SourceInfo(); sourceInfo->x[0] = source->x; sourceInfo->x[1] = source->y; sourceInfo->x[2] = source->z; sourceInfo->strength = source->strength; sourceInfo->source_id = source->id; vector->setIndex(i++, ObjectRef(sourceInfo)); } } else { if (!vectorInValue->isNil()) { RCPtr<Vector<ObjectRef> > inputData = vectorInValue; data = new MarieDataLocalisation(); vector = new Vector<ObjectRef>(*inputData); for(int i = 0; i < vector->size(); i++) { RCPtr<SourceInfo> sourceInfoData = vector->getIndex(i); SourceStruct* sourceStr = new SourceStruct(); sourceStr->x = sourceInfoData->x[0]; sourceStr->y = sourceInfoData->x[1]; sourceStr->z = sourceInfoData->x[2]; sourceStr->strength = sourceInfoData->strength; sourceStr->id = sourceInfoData->source_id; data->addSource(sourceStr); } } } if (data) { //output values (*outputs[m_dataOutID].buffer)[count] = ObjectRef(data); (*outputs[m_vectorOutID].buffer)[count] = ObjectRef(vector); } else { //output values (*outputs[m_vectorOutID].buffer)[count] = nilObject; (*outputs[m_dataOutID].buffer)[count] = nilObject; } } else { out[count] = nilObject; } } void MarieDataLocalisation::printOn(std::ostream &out) const { MarieXMLDataFactory factory; //writing XML data string value = factory.toString((DataLocalisation&) (*this)); out.write(value.c_str(), value.size()); } void MarieDataLocalisation::readFrom(std::istream &in) { throw new GeneralException("readFrom not supported. Use the MarieLoad Node to read data from the stream.",__FILE__,__LINE__); } void MarieDataLocalisation::copyDataAbstract(DataAbstract *data) { if (data) { DataLocalisation *dataL = dynamic_cast<DataLocalisation*>(data); if (dataL) { //((DataLocalisation*)this)->operator=(*command); this->DataLocalisation::operator=(*dataL); } else { throw new GeneralException(string("Unable to cast into DataLocalisation Abstract : ") + data->getID(),__FILE__,__LINE__); } } } } |
|
From: Carle C. <car...@us...> - 2005-06-27 16:12:00
|
Update of /cvsroot/robotflow/RobotFlow/MARIE/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32133/MARIE/src Modified Files: extractMarieDataRaw.cpp Log Message: remove unused output Index: extractMarieDataRaw.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieDataRaw.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** extractMarieDataRaw.cpp 29 Mar 2005 15:20:43 -0000 1.3 --- extractMarieDataRaw.cpp 27 Jun 2005 16:11:52 -0000 1.4 *************** *** 51,58 **** * @output_type any * - * @output_name DATA_RAW - * @output_description Range contained in the MarieDataRaw object - * @output_type MarieDataRaw - * * @output_name CUSTOM_ID * @output_description Range contained in the MarieDataRaw object --- 51,54 ---- |
|
From: Pierre M. <sid...@us...> - 2005-06-27 13:47:35
|
Update of /cvsroot/robotflow/RobotFlow/Vision/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27253 Added Files: GetVisualROIParam.cc Log Message: Node to access a VisualROI object member data. --- NEW FILE: GetVisualROIParam.cc --- /* Copyright (C) 2005 Pierre Moisan (Pie...@US...) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef _GETVISUALROIPARAM_CC_ #define _GETVISUALROIPARAM_CC_ #include "BufferedNode.h" #include "VisualROI.h" #include "Image.h" using namespace std; using namespace FD; namespace RobotFlow { class GetVisualROIParam; DECLARE_NODE(GetVisualROIParam) /*Node * * @name GetVisualROIParam * @category RobotFlow:Vision:Tracking * @description Interface to get the member data of a VisualROI. * * @input_name IN_ROI * @input_type VisualROI * @input_description Current region of interest. * * @output_name CENTER_X * @output_type Int * @output_description Center position (X). * * @output_name CENTER_Y * @output_type Int * @output_description Center position (Y). * * @output_name HALF_WIDTH * @output_type Int * @output_description Region half width. * * @output_name HALF_HEIGHT * @output_type Int * @output_description Region half height. * * @output_name ANGLE * @output_type Int * @output_description Region angle (in degrees). * END*/ class GetVisualROIParam : public BufferedNode { public: GetVisualROIParam::GetVisualROIParam(string nodeName, ParameterSet params) : BufferedNode(nodeName, params) { m_roiInID = addInput("IN_ROI"); m_xCenOutID = addOutput("CENTER_X"); m_yCenOutID = addOutput("CENTER_Y"); m_hsxOutID = addOutput("HALF_WIDTH"); m_hsyOutID = addOutput("HALF_HEIGHT"); m_angleOutID = addOutput("ANGLE"); } virtual GetVisualROIParam::~GetVisualROIParam() { } void GetVisualROIParam::calculate(int output_id, int count, Buffer &out) { try { // Get current region to convert ObjectRef roiObjRef = getInput(m_roiInID, count); if (!roiObjRef->isNil()) { RCPtr<VisualROI> roiRef = RCPtr<VisualROI>(roiObjRef); // Output region's data (*outputs[m_xCenOutID].buffer)[count] = ObjectRef(Int::alloc(roiRef->GetXCen())); (*outputs[m_yCenOutID].buffer)[count] = ObjectRef(Int::alloc(roiRef->GetYCen())); (*outputs[m_hsxOutID].buffer)[count] = ObjectRef(Int::alloc(roiRef->GetHSX())); (*outputs[m_hsyOutID].buffer)[count] = ObjectRef(Int::alloc(roiRef->GetHSY())); (*outputs[m_angleOutID].buffer)[count] = ObjectRef(Int::alloc(roiRef->GetAngle())); } else { // No region, output nilObjects (*outputs[m_xCenOutID].buffer)[count] = nilObject; (*outputs[m_yCenOutID].buffer)[count] = nilObject; (*outputs[m_hsxOutID].buffer)[count] = nilObject; (*outputs[m_hsyOutID].buffer)[count] = nilObject; (*outputs[m_angleOutID].buffer)[count] = nilObject; } } catch (BaseException *e) { throw e->add(new GeneralException("Exception in GetVisualROIParam::calculate:",__FILE__,__LINE__)); } } private: // Input IDs int m_imageInID; int m_roiInID; // Output IDs int m_xCenOutID; int m_yCenOutID; int m_hsxOutID; int m_hsyOutID; int m_angleOutID; }; } #endif |
|
From: Dominic L. <ma...@us...> - 2005-06-27 12:54:41
|
Update of /cvsroot/robotflow/RobotFlow/Generic/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv749 Modified Files: TimeStamp.cc Log Message: little change in the time stamp format Index: TimeStamp.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Generic/src/TimeStamp.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TimeStamp.cc 29 Mar 2005 15:20:41 -0000 1.3 --- TimeStamp.cc 27 Jun 2005 12:54:32 -0000 1.4 *************** *** 54,58 **** char message[256]; ! sprintf(message,"%2.2i/%2.2i/%4.4i %2.2i:%2.2i:%2.2i.%3.3i",time_val.tm_mday, time_val.tm_mon + 1,time_val.tm_year + 1900, time_val.tm_hour, time_val.tm_min,time_val.tm_sec, l_tNow.tv_usec / 1000); --- 54,58 ---- char message[256]; ! sprintf(message,"%2.2i-%2.2i-%4.4i_%2.2i-%2.2i-%2.2i-%3.3i",time_val.tm_mday, time_val.tm_mon + 1,time_val.tm_year + 1900, time_val.tm_hour, time_val.tm_min,time_val.tm_sec, l_tNow.tv_usec / 1000); |
