Changeset 67 in flair-src for trunk/lib

Timestamp:

Aug 29, 2016, 4:58:23 PM (8 years ago)

Author:

Sanahuja Guillaume

Message:

corrections bugs checkpoint map

Location:

trunk/lib

Files:

• FlairCore/src/FrameworkManager_impl.cpp (modified) (2 diffs)
• FlairCore/src/Map.cpp (modified) (4 diffs)
• FlairCore/src/Map.h (modified) (1 diff)
• FlairCore/src/Widget.cpp (modified) (2 diffs)
• FlairCore/src/Widget.h (modified) (1 diff)
• FlairSensorActuator/src/NmeaGps.cpp (modified) (1 diff)

trunk/lib/FlairCore/src/FrameworkManager_impl.cpp

@@ -181 +181 @@
     status = UDT::close(com_sock);
     if (status != 0)
-      printf("Error udt::close %s", UDT::getlasterror().getErrorMessage());
+      Printf("Error udt::close %s", UDT::getlasterror().getErrorMessage());
 
     status = UDT::close(file_sock);
     if (status != 0)
-      printf("Error udt::close %s", UDT::getlasterror().getErrorMessage());
+      Printf("Error udt::close %s", UDT::getlasterror().getErrorMessage());
 
     SleepMS(200); // a revoir, sinon UDT::cleanup bloque en RT
@@ -294 +294 @@
         xmlDoc *doc;
         rcv_buf[bytesRead] = 0;
-
+ //Printf("%s\n",rcv_buf);
         doc = xmlReadMemory(rcv_buf, (int)bytesRead, "include.xml",
                             "ISO-8859-1", 0);

trunk/lib/FlairCore/src/Map.cpp

@@ -21 +21 @@
 #include "GeoCoordinate.h"
 #include "FrameworkManager.h"
+#include <cmath>
 #include <string.h>
 #include <sstream>
@@ -80 +81 @@
 void Map::ExtraXmlEvent(void) {
 
-  // attention pas rt safe (creation checkpoint)
+  // attention pas rt safe (creation/destruction checkpoint)
   size_t i = 0;
   while (1) {
-    // printf("test %i\n",i);
     double latitude, longitude;
     double altitude = 0;
@@ -90 +90 @@
     long_prop << "long" << i;
     alt_prop << "alt" << i;
+
     if (GetPersistentXmlProp(lat_prop.str(), latitude) &&
         GetPersistentXmlProp(long_prop.str(), longitude)) {
       GetPersistentXmlProp(alt_prop.str(), altitude);
+
       if (i >= checkpoints.size()) {
+        //add checkpoint
         GeoCoordinate *checkpoint = new GeoCoordinate(
             this, "checkpoint", latitude, longitude, altitude);
         checkpoints.push_back(checkpoint);
-        // printf("add %i\n",i);
+      } else if(isnan(latitude) || isnan(longitude)) {
+        //delete checkpoint
+        removeCheckpoint(i);
+        break;//si delete, la station sol n'envoit que cette info
       } else {
+        //move checkpoint
         checkpoints.at(i)->SetCoordinates(latitude, longitude, altitude);
       }
@@ -107 +114 @@
     i++;
   }
-
+/*
   for (size_t i = 0; i < checkpoints.size(); i++) {
     double latitude, longitude, altitude;
     checkpoints.at(i)->GetCoordinates(&latitude, &longitude, &altitude);
-    // printf("%i %f %f\n",i,latitude,longitude);
+     printf("%i %f %f\n",i,latitude,longitude);
+  }*/
+}
+
+void Map::removeCheckpoint(size_t index) {
+  //left shift
+  for (size_t i = index; i < checkpoints.size()-1; i++) {
+    double latitude, longitude, altitude;
+    checkpoints.at(i+1)->GetCoordinates(&latitude, &longitude, &altitude);
+    checkpoints.at(i)->SetCoordinates(latitude,longitude,altitude);
   }
+
+  //remove last one
+  delete checkpoints.back();
+  checkpoints.pop_back();
+
+  //remove last one in xml
+  ostringstream lat_prop, long_prop, alt_prop;
+  lat_prop << "lat" << checkpoints.size();
+  long_prop << "long" << checkpoints.size();
+  alt_prop << "alt" << checkpoints.size();
+  UnsetPersistentXmlProp(lat_prop.str());
+  UnsetPersistentXmlProp(long_prop.str());
+  UnsetPersistentXmlProp(alt_prop.str());
 }
 

trunk/lib/FlairCore/src/Map.h

@@ -77 +77 @@
   void ExtraXmlEvent(void);
 
+  void removeCheckpoint(size_t index);
+
   std::vector<core::GeoCoordinate *> checkpoints;
   std::vector<const core::GeoCoordinate *> to_draw;

trunk/lib/FlairCore/src/Widget.cpp

@@ -82 +82 @@
   if (GetPersistentXmlProp<double>(prop, tmp)) {
     value = tmp;
+    return true;
+  } else {
+    return false;
+  }
+}
+
+template <>
+bool Widget::GetPersistentXmlProp(std::string prop, std::string &value) {
+  xmlChar *result = NULL;
+  result = xmlGetProp(pimpl_->file_node, (xmlChar *)prop.c_str());
+  if (result != NULL) {
+    value = std::string((char *)result);
+    xmlFree(result);
     return true;
   } else {
@@ -208 +221 @@
 }
 
+template <> void Widget::SetPersistentXmlProp(std::string prop, std::string value) {
+  SetVolatileXmlProp(prop, value);
+  SetVolatileXmlProp(prop, value, pimpl_->file_node);
+}
+
+void Widget::UnsetPersistentXmlProp(std::string prop) {
+  xmlUnsetProp(pimpl_->file_node, (xmlChar *)prop.c_str());
+}
+
 void Widget::SendXml(void) { pimpl_->SendXml(); }
 

trunk/lib/FlairCore/src/Widget.h

@@ -143 +143 @@
   virtual void XmlEvent(void){};
 
+  /*!
+   * \brief Unset a persistent xml property
+   * 
+   * Unset an existent property, so it won't be saved.
+   *
+   * \param prop property to set
+   */
+  void UnsetPersistentXmlProp(std::string prop);
+
 private:
   class Widget_impl *pimpl_;

trunk/lib/FlairSensorActuator/src/NmeaGps.cpp

@@ -195 +195 @@
   if (result != 1) {
     Warn("unrecognized nmea sentence: %s\n",frame);
+    return;
   }