Move deprecated /sample/step parameter in /ecm/sample/step

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/visp-test/trunk@4 34ed3a64-7ca8-49fb-aa6d-0448e8729b54
lagadic · Aug 28, 2015 · e1270ee · e1270ee
1 parent 90e9c91
commit e1270ee
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 27 deletions.
diff --git a/data/model/coke/coke.xml b/data/model/coke/coke.xml
@@ -13,10 +13,10 @@
 			<mu1>0.5</mu1>
 			<mu2>0.5</mu2>
 		</contrast>
+	        <sample>
+		        <step>10</step>
+	        </sample>
 	</ecm>
-	<sample>
-		<step>10</step>
-	</sample>
 	<camera> 
   		<u0>323.4286308</u0> 
   		<v0>232.0963198</v0> 

diff --git a/data/model/cube-and-cylinder/cube-and-cylinder.xml b/data/model/cube-and-cylinder/cube-and-cylinder.xml
@@ -13,11 +13,10 @@
 			<mu1>0.5</mu1>
 			<mu2>0.5</mu2>
 		</contrast>
+	        <sample>
+        		<step>4</step>
+	        </sample>
 	</ecm>
-	<sample>
-		<step>4</step>
-		<nb_sample>250</nb_sample>
-	</sample>
 	<camera>
 		<width>640</width> 
   		<height>480</height> 

diff --git a/data/model/cube/cube.xml b/data/model/cube/cube.xml
@@ -13,11 +13,10 @@
 			<mu1>0.5</mu1>
 			<mu2>0.5</mu2>
 		</contrast>
-	</ecm>
-	<sample>
+	        <sample>
 		<step>4</step>
-		<nb_sample>250</nb_sample>
-	</sample>
+	        </sample>
+	</ecm>
 	<camera>
 		<width>640</width> 
   		<height>480</height> 

diff --git a/data/model/ravioli-box-rotx/ravioli-box-rotx.xml b/data/model/ravioli-box-rotx/ravioli-box-rotx.xml
@@ -13,11 +13,10 @@
       <mu1>0.5</mu1>
       <mu2>0.5</mu2>
     </contrast>
+    <sample>
+      <step>5</step>
+    </sample>
   </ecm>
-  <sample>
-    <step>5</step>
-    <nb_sample>500</nb_sample>
-  </sample>
   <camera>
     <u0>649.3</u0> 
     <v0>463.3</v0> 

diff --git a/data/model/ravioli-box/ravioli-box.xml b/data/model/ravioli-box/ravioli-box.xml
@@ -13,11 +13,10 @@
       <mu1>0.5</mu1>
       <mu2>0.5</mu2>
     </contrast>
+    <sample>
+      <step>2</step>
+    </sample>
   </ecm>
-  <sample>
-    <step>2</step>
-    <nb_sample>500</nb_sample>
-  </sample>
   <camera>
     <u0>649.3</u0> 
     <v0>463.3</v0> 

diff --git a/data/model/square-and-circle1/square-and-circle1.xml b/data/model/square-and-circle1/square-and-circle1.xml
@@ -13,11 +13,10 @@
       <mu1>0.5</mu1>
       <mu2>0.5</mu2>
     </contrast>
+    <sample>
+      <step>10</step>
+    </sample>
   </ecm>
-  <sample>
-    <step>10</step>
-    <nb_sample>250</nb_sample>
-  </sample>
   <camera>
     <u0>305.9</u0> 
     <v0>235.5</v0> 

diff --git a/data/model/square-and-circle2/square-and-circle2.xml b/data/model/square-and-circle2/square-and-circle2.xml
@@ -13,11 +13,10 @@
       <mu1>0.5</mu1>
       <mu2>0.5</mu2>
     </contrast>
+    <sample>
+      <step>10</step>
+    </sample>
   </ecm>
-  <sample>
-    <step>10</step>
-    <nb_sample>250</nb_sample>
-  </sample>
   <camera>
     <u0>305.9</u0> 
     <v0>235.5</v0>