Revize bf8bbb48

Added default groups creating on backend side.

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

@@ -1 +1 @@
 package cz.zcu.kiv.offscreen.api;
 
-import cz.zcu.kiv.offscreen.graph.EdgeArchetype;
-import cz.zcu.kiv.offscreen.graph.Graph;
-import cz.zcu.kiv.offscreen.graph.VertexArchetype;
-import cz.zcu.kiv.offscreen.graph.AttributeType;
+import cz.zcu.kiv.offscreen.graph.*;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -35 +32 @@
 
     public GraphExport(Graph graph) {
         logger.trace("ENTRY");
-        this.vertices = new ArrayList<Vertex>(graph.getVertices().values());
-        this.edges = new ArrayList<Edge>(graph.getEdges());
-        this.vertexArchetypes = new ArrayList<VertexArchetype>(graph.getVertexArchetypes());
-        this.edgeArchetypes = new ArrayList<EdgeArchetype>(graph.getEdgeArchetypes());
+        this.vertices = new ArrayList<>(graph.getVertices().values());
+        this.edges = new ArrayList<>(graph.getEdges());
+        this.vertexArchetypes = new ArrayList<>(graph.getVertexArchetypes());
+        this.edgeArchetypes = new ArrayList<>(graph.getEdgeArchetypes());
         this.attributeTypes = new ArrayList<>(graph.getAttributeTypes());
         this.possibleEnumValues = graph.getPossibleEnumValues();
         this.archetypeIcons = graph.getArchetypeIcons();
+        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();
         logger.trace("EXIT");
     }
 

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

@@ -1 +1 @@
 package cz.zcu.kiv.offscreen.api;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -20 +21 @@
     /** List of vertices id whose incoming edges are visible. */
     private List<Integer> verticesEdgeToId;
 
+    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<>();
+    }
+
     public Group(int groupId, int id, String name, List<Integer> verticesId, List<Integer> verticesEdgeFromId, List<Integer> verticesEdgeToId) {
         this.groupId = groupId;
         this.id = id;
@@ -76 +86 @@
     public void setVerticesEdgeToId(List<Integer> verticesEdgeToId) {
         this.verticesEdgeToId = verticesEdgeToId;
     }
+
+    public void addVertexId(int vertexId){
+        this.verticesId.add(vertexId);
+    }
+
+    public void addVetexEdgeToId(int vertexId){
+        this.verticesEdgeToId.add(vertexId);
+    }
+
+    public void addVetexEdgeFromId(int vertexId){
+        this.verticesEdgeFromId.add(vertexId);
+    }
 }

sources/src/cz/zcu/kiv/offscreen/graph/Graph.java

@@ -21 +21 @@
     private List<AttributeType> attributeTypes;
     private Map<String, List<String>> possibleEnumValues;
     private List<String> defaultGroupArchetypes;
-
     private Map<String, String> archetypeIcons;
+
+    private GraphState graphState;
+
     private Logger logger = Logger.getLogger(Graph.class);
 
     public Graph() {
@@ -106 +108 @@
         this.vertices.put(name, vertex);
         logger.trace("EXIT");
     }
+
+    public GraphState getGraphState() {
+        return graphState;
+    }
+
+    public void setGraphState(GraphState graphState) {
+        this.graphState = graphState;
+    }
 }

sources/src/cz/zcu/kiv/offscreen/graph/GraphManager.java

@@ -1 +1 @@
 package cz.zcu.kiv.offscreen.graph;
 
 import cz.zcu.kiv.offscreen.api.Edge;
+import cz.zcu.kiv.offscreen.api.Group;
 import cz.zcu.kiv.offscreen.api.SubedgeInfo;
 import cz.zcu.kiv.offscreen.api.Vertex;
 import cz.zcu.kiv.offscreen.graph.filter.*;
@@ -37 +38 @@
         }
     }
 
+    private int lastVertexOrGroupId = 1;
+
     public List<VertexArchetype> vertexArchetypes = new ArrayList<>();
     public List<EdgeArchetype> edgeArchetypes = new ArrayList<>();
     public List<AttributeType> attributeTypes = new ArrayList<>();
@@ -291 +294 @@
         graph.setAttributeTypes(attributeTypes);
         graph.setPossibleEnumValues(possibleEnumValues);
 
+        graph.setGraphState(createGraphState(graph));
+
         return graph;
     }
 
@@ -498 +503 @@
      * @param resultVertices - List of vertices to add to the graph.
      */
     private void addVerticesToGraph(Graph graph, Set<VertexImpl> resultVertices) {
-        int idCounter = 1;
         for (VertexImpl vertexImpl : resultVertices) {
 
             VertexArchetype archetype = vertexArchetypes.get(vertexImpl.getArchetype());
             String title = archetype.name + ":" + vertexImpl.getTitle();
             List<String[]> attributes = getAttributesAsArray(vertexImpl.getSortedAttributes());
 
-            Vertex vertex = new Vertex(idCounter++, vertexImpl.getOriginalId(), title, vertexImpl.getArchetype(), vertexImpl.getText(), attributes);
+            Vertex vertex = new Vertex(lastVertexOrGroupId++, vertexImpl.getOriginalId(), title, vertexImpl.getArchetype(), vertexImpl.getText(), attributes);
 
             graph.addVertex("" + vertexImpl.getId(), vertex);
         }
@@ -556 +560 @@
         }
         return attrValue;
     }
+
+    /**
+     * Method is used for initialization of default graph status based on input graph.
+     *
+     * @param graph graph where are set vertices, defaultGroupArchetypes and vertexArchetypes.
+     * @return instance of created GraphState
+     */
+    private GraphState createGraphState(Graph graph) {
+        GraphState state = new GraphState();
+
+        state.addGroupsAll(createDefaultGroups(graph));
+
+
+        return state;
+    }
+
+    /**
+     * Method create list of groups based on defaultGroupArchetypes whose are defined in graph. Vertices are taken
+     * from graph too.
+     *
+     * @param graph graph from which are groups created.
+     * @return created list of groups or empty list.
+     */
+    private Collection<Group> createDefaultGroups(Graph graph){
+
+        Map<Integer, Group> groups = new HashMap<>();
+        int groupId = 1;
+
+        // find index of vertex archetypes names
+        int index = 0;
+        for(VertexArchetype archetype : graph.getVertexArchetypes()){
+            if(graph.getDefaultGroupArchetypes().contains(archetype.name)){
+                groups.put(index, new Group(groupId++, lastVertexOrGroupId++, archetype.name));
+            }
+            index++;
+        }
+
+        // find vertices with founded vertex archetypes indices
+        for (Vertex vertex : graph.getVertices().values()){
+            if(groups.keySet().contains(vertex.getArchetype())){
+                groups.get(vertex.getArchetype()).addVertexId(vertex.getId());
+            }
+        }
+
+        // remove groups without vertices
+        List<Group> groupList = new ArrayList<>();
+        for(Group group : groups.values()){
+            if (!group.getVerticesId().isEmpty()){
+                groupList.add(group);
+            }
+        }
+
+        return groupList;
+    }
 }

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

@@ +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;
+import java.util.Collection;
+import java.util.List;
+
+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;
+
+
+    public List<Group> getGroups() {
+        return groups;
+    }
+
+    public List<Position> getPositions() {
+        return positions;
+    }
+
+    public List<SideBar> getSideBar() {
+        return sideBar;
+    }
+
+    public int getSelectedVertex() {
+        return selectedVertex;
+    }
+
+    public int getSelectedEdge() {
+        return selectedEdge;
+    }
+
+    public void addGroup(Group group){
+        this.groups.add(group);
+    }
+
+    public void addPosition(Position position){
+        this.positions.add(position);
+    }
+
+    public void addSideBar(SideBar sideBar){
+        this.sideBar.add(sideBar);
+    }
+
+    public void addGroupsAll(Collection<Group> collection){
+        this.groups.addAll(collection);
+    }
+
+    public void addPositionsAll(Collection<Position> collection){
+        this.positions.addAll(collection);
+    }
+
+    public void addSideBarsAll(Collection<SideBar> collection){
+        this.sideBar.addAll(collection);
+    }
+
+    public void setSelectedVertex(int selectedVertex) {
+        this.selectedVertex = selectedVertex;
+    }
+
+    public void setSelectedEdge(int selectedEdge) {
+        this.selectedEdge = selectedEdge;
+    }
+}