Add support for ssd::SystemGeometry (#1456)

Author: lochel

src/OMSimulatorLib/System.cpp

@@ -73,6 +73,9 @@ oms::System::System(const oms::ComRef& cref, oms_system_enu_t type, oms::Model*
 
 oms::System::~System()
 {
+  if (system_geometry)
+    delete system_geometry;
+
   for (const auto& connector : connectors)
     if (connector)
       delete connector;
@@ -671,6 +674,9 @@ oms_status_enu_t oms::System::exportToSSD(pugi::xml_node& node, Snapshot& snapsh
   if (oms_status_ok != element.getGeometry()->exportToSSD(node))
     return logError("export of system ElementGeometry failed");
 
+  if (system_geometry)
+  system_geometry->exportToSSD(node);
+
   // export top level system connectors
   if (connectors.size() > 1)
   {
@@ -804,6 +810,12 @@ oms_status_enu_t oms::System::importFromSnapshot(const pugi::xml_node& node, con
       geometry.importFromSSD(*it);
       setGeometry(geometry);
     }
+    else if (name == oms::ssp::Draft20180219::ssd::system_geometry)
+    {
+      if (!system_geometry)
+        system_geometry = new oms::ssd::SystemGeometry();
+      system_geometry->importFromSSD(*it);
+    }
     else if (name == oms::ssp::Version1_0::ssd::parameter_bindings) // parameter bindings provided either as inline or .ssv files
     {
       Values resources; // create a list of <ssd:ParameterBindings>

src/OMSimulatorLib/System.h

@@ -43,6 +43,7 @@
 #include "ResultWriter.h"
 #include "Snapshot.h"
 #include "ssd/ConnectorGeometry.h"
+#include "ssd/SystemGeometry.h"
 #if !defined(NO_TLM)
 #include "TLMBusConnector.h"
 #endif
@@ -248,6 +249,8 @@ namespace oms
     Values values;  ///< system level connectors, parameters and their start values defined before instantiating the FMU and external inputs defined after initialization
 
     Element element;
+    ssd::SystemGeometry* system_geometry = NULL;
+
     std::vector<Connector*> connectors;  ///< last element is always NULL
     std::vector<oms_element_t*> subelements;  ///< last element is always NULL; don't free it
     std::vector<BusConnector*> busconnectors;

src/OMSimulatorLib/ssd/SystemGeometry.cpp

@@ -31,6 +31,7 @@
 
 #include "SystemGeometry.h"
 #include "../Logging.h"
+#include "Tags.h"
 
 #include <string.h>
 
@@ -74,3 +75,28 @@ oms::ssd::SystemGeometry& oms::ssd::SystemGeometry::operator=(oms::ssd::SystemGe
 
   return *this;
 }
+
+oms_status_enu_t oms::ssd::SystemGeometry::exportToSSD(pugi::xml_node& root) const
+{
+  // export ssd:ElementGeometry
+  if (x1 != 0.0 && y1 != 0.0 && x2 != 0.0 && y2 != 0.0)
+  {
+    pugi::xml_node node = root.append_child(oms::ssp::Draft20180219::ssd::system_geometry);
+    node.append_attribute("x1") = std::to_string(x1).c_str();
+    node.append_attribute("y1") = std::to_string(y1).c_str();
+    node.append_attribute("x2") = std::to_string(x2).c_str();
+    node.append_attribute("y2") = std::to_string(y2).c_str();
+  }
+
+  return oms_status_ok;
+}
+
+oms_status_enu_t oms::ssd::SystemGeometry::importFromSSD(const pugi::xml_node& node)
+{
+  x1 = node.attribute("x1").as_double();
+  y1 = node.attribute("y1").as_double();
+  x2 = node.attribute("x2").as_double();
+  y2 = node.attribute("y2").as_double();
+
+  return oms_status_ok;
+}

src/OMSimulatorLib/ssd/SystemGeometry.h

@@ -34,6 +34,8 @@
 
 #include "OMSimulator/Types.h"
 
+#include <pugixml.hpp>
+
 #include <string>
 
 namespace oms
@@ -55,6 +57,9 @@ namespace oms
       double getY1() const {return y1;}
       double getX2() const {return x2;}
       double getY2() const {return y2;}
+
+      oms_status_enu_t exportToSSD(pugi::xml_node& root) const;
+      oms_status_enu_t importFromSSD(const pugi::xml_node& node);
     };
   }
 }

src/OMSimulatorLib/ssd/Tags.cpp

@@ -55,6 +55,7 @@ const char* oms::ssp::Draft20180219::ssd::elements                     = "ssd:El
 const char* oms::ssp::Draft20180219::ssd::enumerations                 = "ssd:Enumerations";
 const char* oms::ssp::Draft20180219::ssd::simulation_information       = "ssd:SimulationInformation";
 const char* oms::ssp::Draft20180219::ssd::system                       = "ssd:System";
+const char* oms::ssp::Draft20180219::ssd::system_geometry              = "ssd:SystemGeometry";
 const char* oms::ssp::Draft20180219::ssd::system_structure_description = "ssd:SystemStructureDescription";
 const char* oms::ssp::Draft20180219::ssd::units                        = "ssd:Units";
 

src/OMSimulatorLib/ssd/Tags.h

@@ -121,6 +121,7 @@ namespace oms
         extern const char* elements;
         extern const char* enumerations;
         extern const char* simulation_information;
+        extern const char* system_geometry;
         extern const char* system_structure_description;
         extern const char* system;
         extern const char* units;