[Robotflow-cvs] RobotFlow/Behaviors/src MultiSignTracking.cc,1.1,1.2 SignTracking.cc,1.1,1.2

[Dominic L. <ma...@us...>]

Update of /cvsroot/robotflow/RobotFlow/Behaviors/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17744

Modified Files:
	MultiSignTracking.cc SignTracking.cc 
Log Message:
removed dependencies on image width and height

Index: MultiSignTracking.cc
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/MultiSignTracking.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MultiSignTracking.cc	6 Aug 2004 13:24:22 -0000	1.1
--- MultiSignTracking.cc	16 Aug 2004 19:43:43 -0000	1.2
***************
*** 68,81 ****
   * @output_description The minimum size (in pixel) around the blob in the image.
   *
-  * @parameter_name IMAGE_WIDTH
-  * @parameter_type int
-  * @parameter_value 320
-  * @parameter_description The width of the image.
-  *
-  * @parameter_name IMAGE_HEIGHT
-  * @parameter_type int
-  * @parameter_value 240
-  * @parameter_description The height of the image.
-  *
   * @parameter_name MIN_WIDTH
   * @parameter_type int
--- 68,71 ----
***************
*** 138,143 ****
  
       //parameters
-      m_width = dereference_cast<int>(parameters.get("IMAGE_WIDTH"));
-      m_height = dereference_cast<int>(parameters.get("IMAGE_HEIGHT"));
       m_minWidth = dereference_cast<int>(parameters.get("MIN_WIDTH"));
       m_minHeight = dereference_cast<int>(parameters.get("MIN_HEIGHT"));
--- 128,131 ----
***************
*** 162,165 ****
--- 150,156 ----
       ComponentsData &cData = object_cast<ComponentsData>(ComponentsValue);
  
+      m_width = cData.getWidth();
+      m_height = cData.getHeight();
+ 
       //getting probable symbols
       list<pair<CRect*, CRect*> > symbol_list;

Index: SignTracking.cc
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/SignTracking.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SignTracking.cc	6 Aug 2004 13:24:22 -0000	1.1
--- SignTracking.cc	16 Aug 2004 19:43:43 -0000	1.2
***************
*** 80,93 ****
   * @output_description The minimum size (in pixel) around the blob in the image.
   *
-  * @parameter_name IMAGE_WIDTH
-  * @parameter_type int
-  * @parameter_value 320
-  * @parameter_description The width of the image.
-  *
-  * @parameter_name IMAGE_HEIGHT
-  * @parameter_type int
-  * @parameter_value 240
-  * @parameter_description The height of the image.
-  *
   * @parameter_name MIN_WIDTH
   * @parameter_type int
--- 80,83 ----
***************
*** 156,161 ****
  
       //parameters
-      m_width = dereference_cast<int>(parameters.get("IMAGE_WIDTH"));
-      m_height = dereference_cast<int>(parameters.get("IMAGE_HEIGHT"));
       m_minWidth = dereference_cast<int>(parameters.get("MIN_WIDTH"));
       m_minHeight = dereference_cast<int>(parameters.get("MIN_HEIGHT"));
--- 146,149 ----
***************
*** 179,182 ****
--- 167,173 ----
       ComponentsData &cData = object_cast<ComponentsData>(getInput(m_componentsID,count));
  
+      m_width = cData.getWidth();
+      m_height = cData.getHeight();
+ 
       //getting probable symbols
       list<pair<CRect*, CRect*> > symbol_list;