Updated code. TODO: change the property convertors to one central implementation in ModelToXmlConvertor.

Author: Flaviu Toader

src/CMakeLists.txt

@@ -25,22 +25,31 @@ set(wt_project_source
     main.cpp
 )
 
+set(vanetxml_source 
+    xml/property/abstractpropertyconvertor.cpp
+    xml/property/areapropertyconvertor.cpp
+    xml/property/gmsoutpropertyconvertor.cpp
+    xml/modeltoxmlconverter.cpp
+)
+include_directories(${cmake_source_dir})
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
 
 configure_file(${cmake_source_dir}/general.xml ${EXECUTABLE_OUTPUT_PATH}/general.xml COPYONLY)
-
-add_executable(${wt_project_target} ${wt_project_source})
-target_link_libraries(${wt_project_target} wthttp wt boost_signals)
-include_directories(${cmake_source_dir})
-
 # create the logs directory
 file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/logs)
 file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
 file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/bin/resources)
 # copy themes to resources directory
 file(COPY ../themes/ DESTINATION ${PROJECT_BINARY_DIR}/bin/resources/themes/)
 
+add_library(vanetXml ${vanetxml_source})
+target_link_libraries(vanetXml pugixml wt)
+
+add_executable(${wt_project_target} ${wt_project_source})
+target_link_libraries(${wt_project_target} wthttp wt boost_signals vanetXml)
+
+
 add_subdirectory(client)
 add_subdirectory(xml)
 add_subdirectory(model)

src/client/widgets/dialogs/vanetareapropertyform.cpp

@@ -56,9 +56,8 @@ void VanetAreaPropertyForm::setPreselectedValues(const std::map< std::string, bo
 
 WStandardItem *VanetAreaPropertyForm::treeNode() 
 {
-    WStandardItem *result = new WStandardItem();
+    WStandardItem *result = new WStandardItem(tr("mappropertyeditor.group.general"));
     result->setData(VanetArea);
-    result->setText(tr("mappropertyeditor.group.general").toUTF8());
 
     result->appendRow(propertyRow(std::string("dimx"), tr("mappropertyeditor.group.general.dimx").toUTF8(), boost::lexical_cast<std::string>(dimx_->value())));
     result->appendRow(propertyRow(std::string("dimy"), tr("mappropertyeditor.group.general.dimy").toUTF8(), boost::lexical_cast<std::string>(dimy_->value())));

src/client/widgets/mappropertyeditor.cpp

@@ -26,6 +26,7 @@
 #include "client/mapmakerpage.h"
 #include "client/widgets/dialogs/propertydialog.h"
 #include "client/widgets/dialogs/abstractpropertyform.h"
+#include "xml/modeltoxmlconverter.h"
 
 using namespace Wt;
 
@@ -81,6 +82,7 @@ MapPropertyEditor::MapPropertyEditor(MapMakerPage* mapmaker, WStandardItemModel
 
     validate_ = new WPushButton(tr("mappropertyeditor.button.validate"), buttonTable->elementAt(0, 2));
     validate_->resize(120, 30);
+    validate_->clicked().connect(this, &MapPropertyEditor::validateClicked);
 
     save_ = new WPushButton(tr("button.save"), buttonTable->elementAt(0, 3));
     save_->resize(120, 30);
@@ -140,3 +142,9 @@ void MapPropertyEditor::itemClicked(const WModelIndex& clickedItem)
         removeProperty_->setDisabled(true);
     }
 }
+
+void MapPropertyEditor::validateClicked()
+{
+    ModelToXmlConverter modelToXml(model_);
+    modelToXml.validate();
+}

src/client/widgets/mappropertyeditor.h

@@ -69,6 +69,7 @@ class MapPropertyEditor : public Wt::WContainerWidget
     void itemDoubleClicked(const Wt::WModelIndex &clickedItem);
     void itemClicked(const Wt::WModelIndex &clickedItem);
     void removeSelectedProperty();
+    void validateClicked();
 
     Wt::WPushButton* addProperty_, * removeProperty_, * validate_, * save_;
     Wt::WStandardItemModel* model_;

src/xml/CMakeLists.txt

@@ -1,8 +1,2 @@
-set(vanetxml_source
-    property/areapropertyconvertor.cpp
-    modeltoxmlconverter.cpp
-)
 
-add_library(vanetXml ${vanetxml_source})
-target_link_libraries(vanetXml pugixml wt)
 add_subdirectory(property)

src/xml/modeltoxmlconverter.cpp

@@ -1,4 +1,5 @@
 #include <string>
+#include <boost/any.hpp>
 #include <pugixml/pugixml.hpp>
 
 #include <Wt/WStandardItemModel>
@@ -25,14 +26,27 @@ void ModelToXmlConverter::convertXml()
     for (int i = 0; i < model_->rowCount(); i++)
     {
         WStandardItem* currentItem = model_->item(i);
-        int itemType = boost::any_cast<int>(currentItem->data());
-        AbstractPropertyConvertor* convertor;
-        switch(itemType)
+        try 
         {
-            case VanetArea:
-                convertor = new AreaPropertyConvertor;
-                break;
+            int itemType = boost::any_cast<VanetProperty>(currentItem->data());
+            AbstractPropertyConvertor* convertor;
+            switch(itemType)
+            {
+                case 1:
+                    convertor = new AreaPropertyConvertor;
+                    break;
+            }
+            convertor->appendXml(root_, currentItem);
+        }
+        catch(boost::bad_any_cast e)
+        {
+            Logger::entry("error") << "Bad any cast when getting data from item " << currentItem->text().toUTF8() << ". Exception message: " << e.what();
         }
-        convertor->appendXml(root_, currentItem);
     }
 }
+
+void ModelToXmlConverter::validate()
+{
+    doc_.save_file("test.xml");
+}
+

src/xml/modeltoxmlconverter.h

@@ -1,16 +1,18 @@
 #ifndef MODELTOXMLCONVERTER_H
 #define MODELTOXMLCONVERTER_H
 
+#include <pugixml/pugixml.hpp>
+
 namespace Wt
 {
     class WStandardItemModel;
 }
 
-namespace pugi
-{
-    class xml_document;
-    class xml_node;
-}
+// namespace pugi
+// {
+//     class xml_document;
+//     class xml_node;
+// }
 
 class ModelToXmlConverter
 {

src/xml/property/abstractpropertyconvertor.cpp

@@ -1,6 +1,7 @@
 #include <string>
 #include <vector>
 #include <Wt/WStandardItem>
+#include <Wt/WString>
 
 #include "abstractpropertyconvertor.h"
 
@@ -13,15 +14,15 @@ std::vector< WStandardItem* > AbstractPropertyConvertor::propertyRow(const strin
     WStandardItem *item;
 
     // tree column 0: property name
-    item = new WStandardItem(propertyName);
+    item = new WStandardItem(WString::fromUTF8(propertyName));
     propertyItems.push_back(item);
 
     // tree column 1: property value
-    item = new WStandardItem(propertyValue);
+    item = new WStandardItem(WString::fromUTF8(propertyValue));
     propertyItems.push_back(item);
 
     // tree column 2: property id (hidden column)
-    item = new WStandardItem(propertyId);
+    item = new WStandardItem(WString::fromUTF8(propertyId));
     propertyItems.push_back(item);
 
     return propertyItems;

src/xml/property/areapropertyconvertor.cpp

@@ -1,9 +1,9 @@
-#include <vector>
 #include <string>
 #include <pugixml/pugixml.hpp>
 
 #include <Wt/WStandardItem>
 #include <Wt/WString>
+#include <boost/concept_check.hpp>
 
 #include "areapropertyconvertor.h"
 #include "abstractpropertyconvertor.h"
@@ -41,10 +41,16 @@ WStandardItem* AreaPropertyConvertor::treeNode(const pugi::xml_node& root)
     for(pugi::xml_node_iterator it = root.begin(); it != root.end(); ++it)
     {
         pugi::xml_node currentNode = *it;
-        if (currentNode.name() == "dimx")
+        if (currentNode.name() == "dimx") 
+        {
             dimxval = string(currentNode.value());
+            continue;
+        }
         if (currentNode.name() == "dimy")
+        {
             dimyval = string(currentNode.value());
+            continue;
+        }
         if (!dimxval.empty() && !dimyval.empty())
             break;
     }

src/xml/property/gmsoutpropertyconvertor.cpp

@@ -0,0 +1,33 @@
+#include <string>
+#include <map>
+#include <pugixml/pugixml.hpp>
+
+#include <Wt/WStandardItem>
+#include <Wt/WString>
+
+#include "gmsoutpropertyconvertor.h"
+#include "abstractpropertyconvertor.h"
+#include "logger.h"
+#include "client/widgets/dialogs/abstractpropertyform.h"
+
+using namespace Wt;
+using namespace std;
+
+const char* const GmsOutPropertyConvertor::TREENODE_NAME = "mappropertyeditor.group.gmsout";
+
+Wt::WStandardItem* GmsOutPropertyConvertor::treeNode(const pugi::xml_node& root)
+{
+    WStandardItem* result = new WStandardItem(WString::tr(TREENODE_NAME));
+    map< string, string > values;
+    for(pugi::xml_node_iterator it = root.begin(); it != root.end(); ++it)
+    {
+        string currentName = it->name();
+        
+    }
+}
+
+void GmsOutPropertyConvertor::appendXml(pugi::xml_node& root, Wt::WStandardItem* treeNode)
+{
+
+}
+

src/xml/property/gmsoutpropertyconvertor.h

@@ -0,0 +1,16 @@
+#ifndef GMSOUTPROPERTYCONVERTOR_H
+#define GMSOUTPROPERTYCONVERTOR_H
+
+#include <../../home/flaviu/projects/vanetizer-c--/src/xml/property/abstractpropertyconvertor.h>
+
+
+class GmsOutPropertyConvertor : public AbstractPropertyConvertor
+{
+
+public:
+    static const char* const TREENODE_NAME;
+    virtual Wt::WStandardItem* treeNode(const pugi::xml_node& root);
+    virtual void appendXml(pugi::xml_node& root, Wt::WStandardItem* treeNode);
+};
+
+#endif // GMSOUTPROPERTYCONVERTOR_H

vanetizer.kdev4

@@ -1,4 +1,4 @@
 [Project]
-Name=vanetizer
 Manager=KDevCMakeManager
+Name=vanetizer-c--
 VersionControl=kdevgit