Revize 1c035e05

Removed positions array and added vertex.position and group.positioin item

sources/src/main/java/cz/zcu/kiv/offscreen/api/GraphExport.java

@@ -22 +22 @@
     private Map<String, List<String>> possibleEnumValues;
 
     private List<Group> groups;
-    private List<Position> positions;
     private List<SideBar> sideBar;
     private int selectedVertex;
     private int selectedEdge;
@@ -38 +37 @@
         this.attributeTypes = new ArrayList<>(graph.getAttributeTypes());
         this.possibleEnumValues = graph.getPossibleEnumValues();
         this.groups = graph.getGraphState().getGroups();
-        this.positions = graph.getGraphState().getPositions();
         this.sideBar = graph.getGraphState().getSideBar();
         this.selectedVertex = graph.getGraphState().getSelectedVertex();
         this.selectedEdge = graph.getGraphState().getSelectedEdge();
@@ -77 +75 @@
         return groups;
     }
 
-    public List<Position> getPositions() {
-        return positions;
-    }
-
     public List<SideBar> getSideBar() {
         return sideBar;
     }

sources/src/main/java/cz/zcu/kiv/offscreen/api/Group.java

@@ -20 +20 @@
     private List<Integer> verticesEdgeFromId;
     /** List of vertices id whose incoming edges are visible. */
     private List<Integer> verticesEdgeToId;
+    /** Relative position in graph */
+    private Position position;
 
     public Group(int groupId, int id, String name){
         this.groupId = groupId;
         this.id = id;
         this.name = name;
-        verticesId = new ArrayList<>();
-        verticesEdgeFromId = new ArrayList<>();
-        verticesEdgeToId = new ArrayList<>();
+        this.verticesId = new ArrayList<>();
+        this.verticesEdgeFromId = new ArrayList<>();
+        this.verticesEdgeToId = new ArrayList<>();
+        this.position = null;
     }
 
     public Group(int groupId, int id, String name, List<Integer> verticesId, List<Integer> verticesEdgeFromId, List<Integer> verticesEdgeToId) {
@@ -37 +40 @@
         this.verticesId = verticesId;
         this.verticesEdgeFromId = verticesEdgeFromId;
         this.verticesEdgeToId = verticesEdgeToId;
+        this.position = null;
     }
 
     public int getGroupId() {
@@ -98 +102 @@
     public void addVetexEdgeFromId(int vertexId){
         this.verticesEdgeFromId.add(vertexId);
     }
+
+    public Position getPosition() {
+        return position;
+    }
+
+    public void setPosition(Position position) {
+        this.position = position;
+    }
 }

sources/src/main/java/cz/zcu/kiv/offscreen/api/Position.java

@@ -5 +5 @@
  */
 public class Position {
 
-    /** Identification number of vertex or group which was generated in application. */
-    private int vertexId;
     /** Relative X position. */
     private float x;
     /** Relative Y position */
     private float y;
 
-    public Position(int vertexId, float x, float y) {
-        this.vertexId = vertexId;
+    public Position(float x, float y) {
         this.x = x;
         this.y = y;
     }
 
-    public int getVertexId() {
-        return vertexId;
-    }
-
-    public void setVertexId(int vertexId) {
-        this.vertexId = vertexId;
-    }
-
     public float getX() {
         return x;
     }

sources/src/main/java/cz/zcu/kiv/offscreen/api/Vertex.java

@@ -9 +9 @@
 
     /** List of all tributes. Every attribute is stored in String array in pair as {attribute name, attribute value}. */
     private List<String[]> attributes;
+    /** Relative position in graph */
+    private Position position;
 
     /**
      * Create new vertex.
@@ -22 +24 @@
     public Vertex(int id, int originalId, String name, int archetypeIndex, String text, List<String[]> attributes) {
         super(id, originalId, name, archetypeIndex, text);
         this.attributes = attributes;
+        this.position = null;
     }
 
     public List<String[]> getAttributes() {
@@ -31 +34 @@
     public void setAttributes(List<String[]> attributes) {
         this.attributes = attributes;
     }
+
+    public Position getPosition() {
+        return position;
+    }
+
+    public void setPosition(Position position) {
+        this.position = position;
+    }
 }

sources/src/main/java/cz/zcu/kiv/offscreen/graph/GraphState.java

@@ -1 +1 @@
 package cz.zcu.kiv.offscreen.graph;
 
 import cz.zcu.kiv.offscreen.api.Group;
-import cz.zcu.kiv.offscreen.api.Position;
 import cz.zcu.kiv.offscreen.api.SideBar;
 
 import java.util.ArrayList;
@@ -11 +10 @@
 public class GraphState {
 
     private List<Group> groups = new ArrayList<>();
-    private List<Position> positions = new ArrayList<>();
     private List<SideBar> sideBar = new ArrayList<>();
     private int selectedVertex;
     private int selectedEdge;
@@ -21 +19 @@
         return groups;
     }
 
-    public List<Position> getPositions() {
-        return positions;
-    }
-
     public List<SideBar> getSideBar() {
         return sideBar;
     }
@@ -41 +35 @@
         this.groups.add(group);
     }
 
-    public void addPosition(Position position){
-        this.positions.add(position);
-    }
-
     public void addSideBar(SideBar sideBar){
         this.sideBar.add(sideBar);
     }
@@ -53 +43 @@
         this.groups.addAll(collection);
     }
 
-    public void addPositionsAll(Collection<Position> collection){
-        this.positions.addAll(collection);
-    }
-
     public void addSideBarsAll(Collection<SideBar> collection){
         this.sideBar.addAll(collection);
     }