Revision 54:be4ea8da9057, committed 2016-05-04

Comitter:

IceTeam

Date:

Wed May 04 16:25:54 2016 +0000

Parent:

53:bef06d5e827d

Child:

55:dfeee9e5c0af

Commit message:

Correction bug cout + ajout d'obstacles;

Changed in this revision

--- a/Map/map.cpp	Wed May 04 16:21:48 2016 +0000
+++ b/Map/map.cpp	Wed May 04 16:25:54 2016 +0000
@@ -3,39 +3,39 @@
 map::map (Odometry* nodo) : Codo(nodo) {
 }
 
-void map::Build (int start_type) {
-    m.addObs(obsCarr (800, 100, 100, 15));
-    m.addObs(obsCarr (2200, 100, 100, 15));
+void map::Build (int couleur, int formation) {
+    addObs(obsCarr (800, 100, 100, 15));
+    addObs(obsCarr (2200, 100, 100, 15));
     
-    m.addObs(obsCarr (1500, 750, 1100, 15));
-    m.addObs(obsCarr (1500, 1050, 20, 300));
+    addObs(obsCarr (1500, 750, 1100, 15));
+    addObs(obsCarr (1500, 1050, 20, 300));
     
     if (start_type == MAP_RIGHTSIDE) { 
-        m.addObs(obsCarr (0, 2000, 250, 150));  // Coté haut droite
-        m.addObs(obsCarr (200, 2000, 200, 50));
+        addObs(obsCarr (0, 2000, 250, 150));  // Coté haut droite
+        addObs(obsCarr (200, 2000, 200, 50));
         
-        m.addObs(obsCarr (3000, 2000, 250, 150));     // Coté bas droite
-        m.addObs(obsCarr (2800, 2000, 200, 50));
+        addObs(obsCarr (3000, 2000, 250, 150));     // Coté bas droite
+        addObs(obsCarr (2800, 2000, 200, 50));
         
-        m.addObs(obsCarr (200, 2000-450, 40, 40));   // Coquillages du haut droit
-        m.addObs(obsCarr (200, 2000-750, 40, 40));
+        addObs(obsCarr (200, 2000-450, 40, 40));   // Coquillages du haut droit
+        addObs(obsCarr (200, 2000-750, 40, 40));
         
-        m.addObs(obsCarr (900, 2000-550, 40, 40));
-        m.addObs(obsCarr (1200, 2000-350, 40, 40)); // Coquillages du milieu/haut
+        addObs(obsCarr (900, 2000-550, 40, 40));
+        addObs(obsCarr (1200, 2000-350, 40, 40)); // Coquillages du milieu/haut
         
-        m.addObs(obsCarr (1500, 2000-550, 40, 40));
-        m.addObs(obsCarr (1500, 2000-350, 40, 40)); 
+        addObs(obsCarr (1500, 2000-550, 40, 40));
+        addObs(obsCarr (1500, 2000-350, 40, 40)); 
         
-        m.addObs(obsCarr (3000-900, 2000-550, 40, 40));
-        m.addObs(obsCarr (3000-1200, 2000-350, 40, 40));   
+        addObs(obsCarr (3000-900, 2000-550, 40, 40));
+        addObs(obsCarr (3000-1200, 2000-350, 40, 40));   
         
-        m.addObs(obsCarr (3000-200, 2000-450, 40, 40));   // Coquillages du bas droite
-        m.addObs(obsCarr (3000-200, 2000-750, 40, 40));
+        addObs(obsCarr (3000-200, 2000-450, 40, 40));   // Coquillages du bas droite
+        addObs(obsCarr (3000-200, 2000-750, 40, 40));
     }
     else {
-        m.addObs(obsCarr (1250, 1000, 220, 220));
-        m.addObs(obsCarr (1500, 750, 220, 220));
-        m.addObs(obsCarr (1500, 1250, 220, 220));   
+        addObs(obsCarr (1250, 1000, 220, 220));
+        addObs(obsCarr (1500, 750, 220, 220));
+        addObs(obsCarr (1500, 1250, 220, 220));   
     }
 }
 

--- a/Map/nVector.h	Wed May 04 16:21:48 2016 +0000
+++ b/Map/nVector.h	Wed May 04 16:25:54 2016 +0000
@@ -122,13 +122,14 @@
         return curr->getVal ();
     }
 
+/*
     void show () {
         for (int i = 0; i < VectorSize; ++i) {
             setCurrIndex (i);
             std::cout << "(" << curr << ") Element " << i + 1 << " pere : " << curr->gprev() << ", fils " << curr->gNext () << std::endl;
         }
     }
-    
+    */
     void clear () {
         while (VectorSize != 0) {
             erase (0);

--- a/main.cpp	Wed May 04 16:21:48 2016 +0000
+++ b/main.cpp	Wed May 04 16:25:54 2016 +0000
@@ -58,9 +58,9 @@
 /* Debut du programme */
 int main(void)
 {
-<<<<<<< local
     logger.printf("Depart homologation !\n\r");
     homologation();
+    
     /*drapeau = 0;
     init();
 
@@ -69,13 +69,11 @@
     m.addObs(obsCarr (1500, 750, 220, 220));
     m.addObs(obsCarr (1500, 1250, 220, 220));
 
-=======
     init();    
     
     int cote = MAP_RIGHTSIDE;
     /*map m(&odo);
     m.Build(cote);
->>>>>>> other
     m.Execute(1000,1000);
     m.Execute(1500,1000);
     m.Execute(1500,1500);