Added GraphViewer

Author: g-batalhao-a

.idea/.gitignore

@@ -2,5 +2,12 @@ cmake_minimum_required(VERSION 3.15)
 project(Entrega_II)
 
 set(CMAKE_CXX_STANDARD 14)
+# The line below is necessary if you are under Windows only
+# Comment the line below if you are under Linux or Mac OS
+link_libraries(ws2_32 wsock32)
+include_directories(src)
+include_directories(Mapas-20200420)
 
-add_executable(Entrega_II main.cpp src/Graph.h src/menus.cpp src/menus.h src/utils.cpp src/utils.h src/Prisoner.cpp src/Prisoner.h src/Graph.cpp)
+add_executable(Entrega_II main.cpp src/graph/Graph.h src/menu/menus.cpp src/util/utils.cpp src/prison/Prisoner.cpp
+        src/graphviewer/connection.cpp src/graphviewer/edgetype.h src/graphviewer/graphviewer.cpp
+        src/util/Parser.cpp src/gui/GUI.cpp)

.idea/.name

@@ -1,6 +1,9 @@
 #include <iostream>
 
-#include "src/menus.h"
+#include "menu/menus.h"
+#include "graph/Graph.h"
+#include "src/util/Parser.h"
+#include "src/gui/GUI.h"
 
 using namespace std;
 
@@ -10,6 +13,10 @@ int main() {
     vector<Prisoner*> vec;
     int op;
     int num = 0;
+    Graph<coord> graph = parseMap("../Mapas-20200420/GridGraphs/GridGraphs/4x4/nodes.txt", "../Mapas-20200420/GridGraphs/GridGraphs/4x4/edges.txt");
+
+    GUI gui = GUI(graph, 600, 600);
+    gui.show();
 
     while ((op = mainMenu()) != 0) {
         switch (op) {
@@ -33,5 +40,6 @@ int main() {
         }
     }
 
+
     return 0;
 }

.idea/MeatWagons.iml

@@ -9,38 +9,49 @@
  * Class Vertex
  * ================================================================================================
  */
+/*
+template<class T>
+Vertex<T>::Vertex(int id): id(id) {}
 
-Vertex::Vertex(int id): id(id) {
-}
-
-Edge * Vertex::addEdge(Vertex *dest, double w) {
-    Edge * e = new Edge(this, dest, w);
+template<class T>
+Edge<T>* Vertex<T>::addEdge(Vertex<T> *dest, double w) {
+    Edge<T> * e = new Edge<T>(this, dest, w);
     this->outgoing.push_back(e);
     dest->incoming.push_back(e);
     return e;
 }
 
-int Vertex::getID() const {
+template<class T>
+int Vertex<T>::getID() const {
     return this->id;
 }
 
-vector<Edge *> Vertex::getAdj() const {
+template<class T>
+vector<Edge<T> *> Vertex<T>::getAdj() const {
     return this->outgoing;
 }
 
+template<class T>
+T Vertex<T>::getInfo() const {
+    return this->info;
+}
+
 
 /* ================================================================================================
  * Class Edge
  * ================================================================================================
  */
+/*
+template<class T>
+Edge<T>::Edge(Vertex<T> *o, Vertex<T> *d, double w): orig(o), dest(d), weight(w){}
 
-Edge::Edge(Vertex *o, Vertex *d, double w): orig(o), dest(d), weight(w){}
-
-double Edge::getWeight() const {
+template<class T>
+double Edge<T>::getWeight() const {
     return weight;
 }
 
-Vertex* Edge::getDest() const {
+template<class T>
+Vertex<T>* Edge<T>::getDest() const {
     return dest;
 }
 
@@ -49,17 +60,19 @@ Vertex* Edge::getDest() const {
  * Class Graph
  * ================================================================================================
  */
-
-Vertex * Graph::addVertex(const int &id) {
-    Vertex *v = findVertex(id);
+/*
+template<class T>
+Vertex<T> * Graph<T>::addVertex(const T &id) {
+    Vertex<T> *v = findVertex(id);
     if (v != nullptr)
         return v;
-    v = new Vertex(id);
+    v = new Vertex<T>(id);
     vertexSet.push_back(v);
     return v;
 }
 
-Edge * Graph::addEdge(const int &sourc, const int &dest, double w) {
+template<class T>
+Edge<T> * Graph<T>::addEdge(const int &sourc, const int &dest, double w) {
     auto s = findVertex(sourc);
     auto d = findVertex(dest);
     if (s == nullptr || d == nullptr)
@@ -68,15 +81,17 @@ Edge * Graph::addEdge(const int &sourc, const int &dest, double w) {
         return s->addEdge(d, w);
 }
 
-Vertex* Graph::findVertex(const int & id) const {
+template<class T>
+Vertex<T>* Graph<T>::findVertex(const int & id) const {
     for (auto v : vertexSet)
         if (v->id == id)
             return v;
     return nullptr;
 }
 
-vector<Vertex *> Graph::getVertexSet() const {
+template<class T>
+vector<Vertex<T> *> Graph<T>::getVertexSet() const {
     return vertexSet;
 }
-
+*/