Merge branch 'master' into itools_sort_themes

itesla · Sep 14, 2016 · cdfb799 · cdfb799
2 parents 88ea2ba + c4dfa89
commit cdfb799
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/iidm-xml-import-export/src/main/java/eu/itesla_project/iidm/xml/BusbarSectionXml.java b/iidm-xml-import-export/src/main/java/eu/itesla_project/iidm/xml/BusbarSectionXml.java
@@ -6,6 +6,7 @@
  */
 package eu.itesla_project.iidm.xml;
 
+import eu.itesla_project.iidm.network.Bus;
 import eu.itesla_project.iidm.network.BusbarSection;
 import eu.itesla_project.iidm.network.BusbarSectionAdder;
 import eu.itesla_project.iidm.network.VoltageLevel;
@@ -37,6 +38,8 @@ protected boolean hasSubElements(BusbarSection bs) {
     @Override
     protected void writeRootElementAttributes(BusbarSection bs, VoltageLevel vl, XmlWriterContext context) throws XMLStreamException {
         XmlUtil.writeInt("node", bs.getTerminal().getNodeBreakerView().getNode(), context.getWriter());
+        XmlUtil.writeFloat("v", bs.getV(), context.getWriter());
+        XmlUtil.writeFloat("angle", bs.getAngle(), context.getWriter());
     }
 
     @Override
@@ -51,8 +54,17 @@ protected BusbarSectionAdder createAdder(VoltageLevel vl) {
     @Override
     protected BusbarSection readRootElementAttributes(BusbarSectionAdder adder, XMLStreamReader reader, List<Runnable> endTasks) {
         int node = XmlUtil.readIntAttribute(reader, "node");
-        return adder.setNode(node)
+        float v = XmlUtil.readOptionalFloatAttribute(reader, "v");
+        float angle = XmlUtil.readOptionalFloatAttribute(reader, "angle");
+        BusbarSection bbs = adder.setNode(node)
                 .add();
+        endTasks.add(() -> {
+            Bus b = bbs.getTerminal().getBusView().getBus();
+            if (b != null) {
+                b.setV(v).setAngle(angle);
+            }
+        });
+        return bbs;
     }
 
     @Override

diff --git a/iidm-xml-import-export/src/main/resources/xsd/iidm.xsd b/iidm-xml-import-export/src/main/resources/xsd/iidm.xsd
@@ -126,6 +126,8 @@
         <xs:complexContent>
             <xs:extension base="iidm:Identifiable">
                 <xs:attribute name="node" use="required" type="xs:int"/>
+                <xs:attribute name="v" use="optional" type="xs:float"/>
+                <xs:attribute name="angle" use="optional" type="xs:float"/>
             </xs:extension>
         </xs:complexContent>
     </xs:complexType>