From f324c47a3b0af92ea46047777401f4a125eae27f Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Mon, 20 Jul 2015 10:53:39 +0200
Subject: [PATCH 01/53] Waypoints and landmarks are back in. Changed the
 process of editing lines

---
 src/GraphicView.cpp | 164 ++++++++++++++++++++++++++++----------------
 src/GraphicView.h   |   1 +
 src/datamanager.cpp |  12 ++--
 3 files changed, 113 insertions(+), 64 deletions(-)

diff --git a/src/GraphicView.cpp b/src/GraphicView.cpp
index b98f0cc..ccecbaa 100644
--- a/src/GraphicView.cpp
+++ b/src/GraphicView.cpp
@@ -68,6 +68,7 @@ jpsGraphicsView::jpsGraphicsView(QWidget* parent):QGraphicsView(parent)
     this->scale(1/gl_scale_f,-1/gl_scale_f);
     _currentTrackedPoint=nullptr;
     _statLineEdit=false;
+    intersection_point=nullptr;
 
     lines_collided=false;
     _assoDef=false;
@@ -241,7 +242,13 @@ void jpsGraphicsView::mousePressEvent(QMouseEvent *mouseEvent)
 void jpsGraphicsView::mouseDoubleClickEvent(QMouseEvent *event)
 {
     if (event->button()==Qt::LeftButton)
+    {   /// To avoid deleting of edited line
+        if (line_tracked==1)
+        {
+            current_line=nullptr;
+        }
         emit no_drawing();
+    }
 
 }
 
@@ -495,6 +502,13 @@ void jpsGraphicsView::catch_points()
         // range chosen: 10 (-5:5) (has to be changed soon)
         if (line_vector[i]->get_line()->line().x1()>=(translated_pos.x()-catch_radius) && line_vector[i]->get_line()->line().x1()<=(translated_pos.x()+catch_radius) && line_vector[i]->get_line()->line().y1()>=(translated_pos.y()-catch_radius) && line_vector[i]->get_line()->line().y1()<=(translated_pos.y()+catch_radius)){
             /// in this case the cursor is working with global coordinates. So the method 'mapToGlobal' must be used
+
+            ///to avoid the tracking of the coords of an edited line
+            if (line_vector[i]->get_line()==current_line)
+            {
+                continue;
+            }
+
             translated_pos.setX(line_vector[i]->get_line()->line().x1());
             translated_pos.setY(line_vector[i]->get_line()->line().y1());
             //cursor.setPos(mapToGlobal(QPoint(translate_back_x(line_vector[i].x1()),translate_back_y(line_vector[i].y1()))));
@@ -512,6 +526,14 @@ void jpsGraphicsView::catch_points()
         ///Searching for endpoints of all lines near the current cursor position
         else if (line_vector[i]->get_line()->line().x2()>=(translated_pos.x()-catch_radius) && line_vector[i]->get_line()->line().x2()<=(translated_pos.x()+catch_radius) && line_vector[i]->get_line()->line().y2()>=(translated_pos.y()-catch_radius) && line_vector[i]->get_line()->line().y2()<=(translated_pos.y()+catch_radius)){
             // see above
+
+            ///to avoid the tracking of the coords of an edited line
+            if (line_vector[i]->get_line()==current_line)
+            {
+                continue;
+            }
+
+
             translated_pos.setX(line_vector[i]->get_line()->line().x2());
             translated_pos.setY(line_vector[i]->get_line()->line().y2());
             //cursor.setPos(mapToGlobal(QPoint(translate_back_x(line_vector[i].x2()),translate_back_y(line_vector[i].y2()))));
@@ -572,18 +594,18 @@ void jpsGraphicsView::catch_lines()
     line_tracked=-1;
     if (currentSelectRect->rect().width()<0)
     {
-    for (auto &item:line_vector)
-    {
-        if (currentSelectRect->contains(item->get_line()->line().p1())
-                && currentSelectRect->contains(item->get_line()->line().p2()))
+        for (auto &item:line_vector)
         {
-            select_line(item);
-            line_tracked=1;
+            if (currentSelectRect->contains(item->get_line()->line().p1())
+                    && currentSelectRect->contains(item->get_line()->line().p2()))
+            {
+                select_line(item);
+                line_tracked=1;
 
 
+            }
         }
     }
-    }
     /// if current rect was build up moving the cursor to the right ->
     /// throwing the select rect only over a part of a line is sufficent to select it
     else if (currentSelectRect->rect().width()>0)
@@ -617,37 +639,43 @@ void jpsGraphicsView::drawLine()
     // if the mouse was pressed secondly of two times
     else
     {
-        jpsLineItem* lineItem= new jpsLineItem(current_line);
-
-        // if there is already a drawn line
-        if (line_vector.size()>=1)
-        {
-            // Searching for intersection of the current line with all already drawn lines
-            for (int i=0; i<line_vector.size(); i++)
-            {
-                // locate possible intersection between lines
-                // if there are some, intersectionPoint will be added to container
-                locate_intersection(lineItem,line_vector[i]);
-            }
-        }
-
-        lineItem->set_type(statWall,statDoor,statExit);
-        line_vector.push_back(lineItem);
-
-        ///reset pointer
-        current_line=nullptr;
-
+        /// If line is edited currently
         if (_statLineEdit)
         {
 
-            select_line(lineItem);
+            //select_line(lineItem);
+            current_line=nullptr;
             _statLineEdit=false;
             line_tracked=1;
             emit no_drawing();
         }
+
         else
+        {
+
+            jpsLineItem* lineItem= new jpsLineItem(current_line);
+
+            // if there is already a drawn line
+            if (line_vector.size()>=1)
+            {
+                // Searching for intersection of the current line with all already drawn lines
+                for (int i=0; i<line_vector.size(); i++)
+                {
+                    // locate possible intersection between lines
+                    // if there are some, intersectionPoint will be added to container
+                    locate_intersection(lineItem,line_vector[i]);
+                }
+            }
+
+            lineItem->set_type(statWall,statDoor,statExit);
+            line_vector.push_back(lineItem);
+
+            ///reset pointer
+            current_line=nullptr;
+
             drawLine();
 
+        }
 
     }
 
@@ -797,19 +825,29 @@ void jpsGraphicsView::EditLine(QPointF* point)
     if (marked_lines.size()==1)
     {
 
+        delete current_rect;
+        current_rect=nullptr;
+
+        point_tracked=false;
+
         if (marked_lines.first()->get_line()->line().p1()==*point)
         {
-            current_line=Scene->addLine(marked_lines[0]->get_line()->line().p2().x(),
-                    marked_lines[0]->get_line()->line().p2().y(),translated_pos.x(),translated_pos.y(),QPen(Qt::red,0));
-            current_line->setTransform(QTransform::fromTranslate(translation_x,translation_y), true);
+            current_line=marked_lines[0]->get_line();
+            marked_lines[0]->get_line()->setLine(marked_lines[0]->get_line()->line().x2(),marked_lines[0]->get_line()->line().y2(),translated_pos.x(),translated_pos.y());
+            //current_line=Scene->addLine(marked_lines[0]->get_line()->line().p2().x(),
+             //       marked_lines[0]->get_line()->line().p2().y(),translated_pos.x(),translated_pos.y(),QPen(Qt::red,0));
+            //current_line->setTransform(QTransform::fromTranslate(translation_x,translation_y), true);
             emit set_focus_textedit();
         }
 
         else if (marked_lines.first()->get_line()->line().p2()==*point)
         {
-            current_line=Scene->addLine(marked_lines[0]->get_line()->line().p1().x(),
-                    marked_lines[0]->get_line()->line().p1().y(),translated_pos.x(),translated_pos.y(),QPen(Qt::red,0));
-            current_line->setTransform(QTransform::fromTranslate(translation_x,translation_y), true);
+            current_line=marked_lines[0]->get_line();
+            marked_lines[0]->get_line()->setLine(marked_lines[0]->get_line()->line().x1(),marked_lines[0]->get_line()->line().y1(),translated_pos.x(),translated_pos.y());
+
+                    //->get_line()->line().p1().x(),
+                    //marked_lines[0]->get_line()->line().p1().y(),translated_pos.x(),translated_pos.y(),QPen(Qt::red,0);
+            //current_line->setTransform(QTransform::fromTranslate(translation_x,translation_y), true);
             emit set_focus_textedit();
         }
 
@@ -817,8 +855,9 @@ void jpsGraphicsView::EditLine(QPointF* point)
             return;
 
         //line_tracked=1;
+        RemoveIntersections(marked_lines.first());
         _statLineEdit=true;
-        delete_marked_lines();
+        //delete_marked_lines();
         en_disableWall();
 
     }
@@ -1019,6 +1058,11 @@ void jpsGraphicsView::translations(QPointF old_pos)
     for (int i=0; i<line_vector.size(); ++i)
     {
         //line_vector[i]->get_line()->translate(pos.x()-old_pos.x(),pos.y()-old_pos.y());
+        /// To avoid double sized translation of edited line
+        if (current_line==line_vector[i]->get_line())
+        {
+            continue;
+        }
         line_vector[i]->get_line()->setTransform(QTransform::fromTranslate(pos.x()-old_pos.x(),pos.y()-old_pos.y()), true);
 
     }
@@ -1166,31 +1210,9 @@ void jpsGraphicsView::delete_marked_lines()
 
         for (int i=0; i<marked_lines.size(); ++i)
         {
-            QList<QPointF *> points = marked_lines[i]->get_intersectionVector();
-
-            for (int j=0; j<points.size(); ++j)
-            {
-                delete points[j];
-                intersect_point_vector.removeOne(points[j]);
-                for (int k=0; k<marked_lines[i]->get_intersectLineVector().size(); ++k)
-                {
-                    // removing the intersectionPoint pointer from all lines which includes the point
-                    marked_lines[i]->get_intersectLineVector()[k]->remove_intersectionPoint(points[j]);
-
-                    // as marked_lines is removed it is has no intersections with any other line anymore
-                    // so pointers of possible intersectionsLine have to be removed
 
-                }
-
-
-            }
-
-
-            for (int k=0; k<marked_lines[i]->get_intersectLineVector().size(); ++k)
-            {
-                marked_lines[i]->get_intersectLineVector()[k]->remove_interLine(marked_lines[i]);
-            }
 
+            RemoveIntersections(marked_lines[i]);
 
             delete marked_lines[i]->get_line();
             //marked_lines[i]->set_line(nullptr);
@@ -1209,6 +1231,32 @@ void jpsGraphicsView::delete_marked_lines()
 
 }
 
+void jpsGraphicsView::RemoveIntersections(jpsLineItem *lineItem)
+{
+    QList<QPointF *> points = lineItem->get_intersectionVector();
+
+    for (int j=0; j<points.size(); ++j)
+    {
+        delete points[j];
+        intersect_point_vector.removeOne(points[j]);
+        for (int k=0; k<lineItem->get_intersectLineVector().size(); ++k)
+        {
+            // removing the intersectionPoint pointer from all lines which includes the point
+            lineItem->get_intersectLineVector()[k]->remove_intersectionPoint(points[j]);
+
+            // as marked_lines is removed it has no intersections with any other line anymore
+            // so pointers of possible intersectionsLine have to be removed
+
+        }
+    }
+
+
+    for (int k=0; k<lineItem->get_intersectLineVector().size(); ++k)
+    {
+        lineItem->get_intersectLineVector()[k]->remove_interLine(lineItem);
+    }
+}
+
 void jpsGraphicsView::delete_landmark()
 {
     if (markedLandmark!=nullptr)
diff --git a/src/GraphicView.h b/src/GraphicView.h
index 6e2d468..3500d5c 100644
--- a/src/GraphicView.h
+++ b/src/GraphicView.h
@@ -76,6 +76,7 @@ class jpsGraphicsView: public QGraphicsView {
     void drawLine();
     qreal calc_d_point(const QLineF &line, const qreal &x, const qreal &y);
     void delete_marked_lines();
+    void RemoveIntersections(jpsLineItem* lineItem);
 
     /// Landmark
     void delete_landmark();
diff --git a/src/datamanager.cpp b/src/datamanager.cpp
index 45ed66c..a0850ed 100644
--- a/src/datamanager.cpp
+++ b/src/datamanager.cpp
@@ -257,9 +257,9 @@ void jpsDatamanager::writeXML(QFile &file)
     exitList.clear();
     stream->writeEndElement();//transitions
 
-    //stream->writeStartElement("landmarks");
-    //writeLandmarks(stream,landmarks);
-    //stream->writeEndElement();//landmarks
+    stream->writeStartElement("landmarks");
+    writeLandmarks(stream,landmarks);
+    stream->writeEndElement();//landmarks
 
     stream->writeEndElement();//geometry
 
@@ -284,9 +284,9 @@ void jpsDatamanager::AutoSaveXML(QFile &file)
     exitList.clear();
     stream->writeEndElement();//transitions
 
-    //stream->writeStartElement("landmarks");
-    //writeLandmarks(stream,landmarks);
-    //stream->writeEndElement();//landmarks
+    stream->writeStartElement("landmarks");
+    writeLandmarks(stream,landmarks);
+    stream->writeEndElement();//landmarks
 
     stream->writeEndElement();//geometry
 

From ec0d57145e75a964c492eab8b383aa9f5be355ed Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Wed, 29 Jul 2015 16:25:41 +0200
Subject: [PATCH 02/53] first attempts to establish a backgroundgrid

---
 forms/backgroundgrid.png       | Bin 0 -> 35014 bytes
 forms/backgroundgridpoints.png | Bin 0 -> 6785 bytes
 src/GraphicView.cpp            | 210 +++++++++++++++++++--------------
 src/GraphicView.h              |  62 +++++-----
 src/mainWindow.cpp             |   6 +-
 src/mainWindow.h               |   2 +-
 6 files changed, 154 insertions(+), 126 deletions(-)
 create mode 100644 forms/backgroundgrid.png
 create mode 100644 forms/backgroundgridpoints.png

diff --git a/forms/backgroundgrid.png b/forms/backgroundgrid.png
new file mode 100644
index 0000000000000000000000000000000000000000..e98e2c8f36f2322e2e1b1e29b9b6ac9c2a5ed081
GIT binary patch
literal 35014
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
O+qi!7y3=bb|M(sGP<PM(

literal 0
HcmV?d00001

diff --git a/forms/backgroundgridpoints.png b/forms/backgroundgridpoints.png
new file mode 100644
index 0000000000000000000000000000000000000000..d73d4234aa8971f2c83210c7a8c7ad05436a8dbf
GIT binary patch
literal 6785
zcmeAS@N?(olHy`uVBq!ia0y~yU<+elU|Pq)1{ArxSMeo~Vk{1FcVbv~P6otbNq6*h
zWMJ6X&;2Kn70Bl-@Q5sCU=S(+Va9uD@)ZmWQevJijv*CsZ*OkoWpLy<yy4CMFaNo;
zcx5ab1(#f|1?mC<l|vv)85kT)M8n>Fv+DPq8*OT4YF3(e^~RMOS9XRb2PX$V59{^q
zMVI*eY1!HHAgdV|BvjUbX$BXVVWR@z0Kp88;KZkS>p$ZSSd<Xg&%gC225eS?<7nW5
z0>XiC+8RyD;1okdND&T8+$u(sGB}hm^Efs0>1a|OP0GL!plu?<oyVz}l;O6F7967m
z2T}DnJjKu?8B)X0(WE?@lt+{DXwQV$M#^Y&j@Xc*M%h0a+VlwR(K>Ln4jiomN9#ah
w%bL+rnb?q`qz)V{mFZ9_!y{<ug!ZRe`}`ZhD)o03xPSu4)78&qol`;+0A<hWwEzGB

literal 0
HcmV?d00001

diff --git a/src/GraphicView.cpp b/src/GraphicView.cpp
index ccecbaa..5cd5e96 100644
--- a/src/GraphicView.cpp
+++ b/src/GraphicView.cpp
@@ -45,7 +45,7 @@ jpsGraphicsView::jpsGraphicsView(QWidget* parent):QGraphicsView(parent)
     midbutton_hold=false;
     translation_x=0;
     translation_y=0;//this->height();
-    gridmode=false;
+    anglesnap=false;
     gl_scale_f=.01;
     //scale(10,10);
     catch_radius=10*gl_scale_f;
@@ -56,6 +56,7 @@ jpsGraphicsView::jpsGraphicsView(QWidget* parent):QGraphicsView(parent)
     line_tracked=-1;
     current_rect=nullptr;
     currentSelectRect=nullptr;
+    gridmap=nullptr;
     objectsnap=false;
     statWall=false;
     statDoor=false;
@@ -98,7 +99,7 @@ jpsGraphicsView::jpsGraphicsView(QWidget* parent):QGraphicsView(parent)
     setScene(Scene);
     setSceneRect(0, 0, 1920, 1080);
 
-    //create_grid();
+    create_grid();
 
     ///Origin
 
@@ -128,18 +129,18 @@ void jpsGraphicsView::mouseMoveEvent(QMouseEvent *mouseEvent)
 
     pos=mapToScene(mouseEvent->pos());
 
-    if (gridmode==true)
+    if (anglesnap==true)
     {
         if (current_line!=nullptr)
         {
-            use_gridmode(current_line,5);
+            use_anglesnap(current_line,5);
         }
     }
 
     if (_currentVLine!=nullptr)
     {
         /// vline will be deleted if it is not thrown horizontally or vertically
-        if(!use_gridmode(_currentVLine,15))
+        if(!use_anglesnap(_currentVLine,15))
         {
             delete _currentVLine;
             _currentVLine=nullptr;
@@ -162,10 +163,14 @@ void jpsGraphicsView::mouseMoveEvent(QMouseEvent *mouseEvent)
     translated_pos.setX(pos.x()-translation_x);
     translated_pos.setY(pos.y()-translation_y);
 
+
     if (objectsnap)
     {
+
         catch_points();
 
+        use_gridmode();
+
         ///VLine
         if (point_tracked && (statWall==true || statDoor==true || statExit==true))
         {
@@ -205,7 +210,20 @@ void jpsGraphicsView::mousePressEvent(QMouseEvent *mouseEvent)
 
         if (statWall==true || statDoor==true || statExit==true)
         {
-            drawLine();
+            /// If line is edited currently
+            if (_statLineEdit)
+            {
+                for (jpsLineItem* line:line_vector)
+                {
+                    locate_intersection(marked_lines.first(),line);
+                }
+                current_line=nullptr;
+                _statLineEdit=false;
+                line_tracked=1;
+                emit no_drawing();
+            }
+            else
+                drawLine();
         }
         else if (statLandmark==true)
         {
@@ -462,7 +480,7 @@ void jpsGraphicsView::delete_all(bool final)
     update();
 }
 
-bool jpsGraphicsView::use_gridmode(QGraphicsLineItem* currentline, int accuracy)
+bool jpsGraphicsView::use_anglesnap(QGraphicsLineItem* currentline, int accuracy)
 
 {
     // if a current line is in the drawing procedure (i. e. starting point is determined but not the ending point)
@@ -494,6 +512,21 @@ bool jpsGraphicsView::use_gridmode(QGraphicsLineItem* currentline, int accuracy)
     return false;
 }
 
+void jpsGraphicsView::use_gridmode()
+{
+    if ((std::fmod(translated_pos.x(),1.0)<=0.1 || std::fmod(translated_pos.x(),1.0)>=0.9) &&
+         (std::fmod(translated_pos.y(),1.0)<=0.1 || std::fmod(translated_pos.y(),1.0)>=0.9))
+    {
+        translated_pos.setX(int(translated_pos.x()+0.5));
+        translated_pos.setY(int(translated_pos.y()+0.5));
+        current_rect=Scene->addRect(translated_pos.x()+translation_x-10*gl_scale_f,translated_pos.y()+translation_y-10*gl_scale_f,20*gl_scale_f,20*gl_scale_f,QPen(Qt::red,0));
+        point_tracked=true;
+        _currentTrackedPoint= &translated_pos;
+    }
+    else
+        point_tracked=false;
+}
+
 void jpsGraphicsView::catch_points()
 {
     ///Searching for startpoints of all lines near the current cursor position
@@ -639,43 +672,30 @@ void jpsGraphicsView::drawLine()
     // if the mouse was pressed secondly of two times
     else
     {
-        /// If line is edited currently
-        if (_statLineEdit)
-        {
 
-            //select_line(lineItem);
-            current_line=nullptr;
-            _statLineEdit=false;
-            line_tracked=1;
-            emit no_drawing();
-        }
+        jpsLineItem* lineItem= new jpsLineItem(current_line);
 
-        else
+        // if there is already a drawn line
+        if (line_vector.size()>=1)
         {
-
-            jpsLineItem* lineItem= new jpsLineItem(current_line);
-
-            // if there is already a drawn line
-            if (line_vector.size()>=1)
+            // Searching for intersection of the current line with all already drawn lines
+            for (int i=0; i<line_vector.size(); i++)
             {
-                // Searching for intersection of the current line with all already drawn lines
-                for (int i=0; i<line_vector.size(); i++)
-                {
-                    // locate possible intersection between lines
-                    // if there are some, intersectionPoint will be added to container
-                    locate_intersection(lineItem,line_vector[i]);
-                }
+                // locate possible intersection between lines
+                // if there are some, intersectionPoint will be added to container
+                locate_intersection(lineItem,line_vector[i]);
             }
+        }
 
-            lineItem->set_type(statWall,statDoor,statExit);
-            line_vector.push_back(lineItem);
+        lineItem->set_type(statWall,statDoor,statExit);
+        line_vector.push_back(lineItem);
 
-            ///reset pointer
-            current_line=nullptr;
+        ///reset pointer
+        current_line=nullptr;
+
+        drawLine();
 
-            drawLine();
 
-        }
 
     }
 
@@ -939,7 +959,14 @@ void jpsGraphicsView::create_grid() /// FIX ME!!!!
     //{
      //   delete gridpoint;
     //}
-    grid_point_vector.clear();
+    //grid_point_vector.clear();
+
+    QPixmap pixmap("../jupedsim/forms/backgroundgridpoints.png");
+
+    gridmap = Scene->addPixmap(pixmap);
+
+    gridmap->setScale(0.0269);
+    gridmap->setTransform(QTransform::fromTranslate(-0.96,-0.05), true);
 
     //std::cout << rect.bottomRight().y() << std::endl;
 
@@ -947,30 +974,30 @@ void jpsGraphicsView::create_grid() /// FIX ME!!!!
 
     //QPointF leftup = mapToScene(Scene->sceneRect().bottomLeft().x(),Scene->sceneRect().bottomLeft().y());
     //std::cout << leftup.x()-translation_x << std::endl;
-    qreal rightx = translated_pos.x()+1920*gl_scale_f;
-    qreal upy = translated_pos.y()+1080*gl_scale_f;
-    qreal leftx = translated_pos.x()-1920*gl_scale_f;
-    qreal downy = translated_pos.y()-1080*gl_scale_f;
-    //QGraphicsEllipseItem* point = Scene->addEllipse(0,0,10,10,QPen(Qt::red));
-    //point->setTransform(Scene->sceneRect().);
-    //point->setTransform(QTransform::fromTranslate(translation_x,translation_y));
-    //grid_point_vector.push_back(point);
-    //std::cout << translation_y << std::endl;
-    //std::cout << this->height() << std::endl;
-    //qreal leftdownx = leftdown.x();//+translation_x;
-    //qreal leftdowny = leftdown.y();//+translation_y;
-
-    //QPointF topRight = mapToScene(this->sceneRect().topRight().x(),this->sceneRect().topRight().y());
-    //qreal rightupx = topRight.x();//+translation_x;
-    //qreal rightupy = topRight.y();//+translation_y;
-
-    //std::cout << rightupx << std::endl;
-    //std::cout << rightupy << std::endl;
-    int intervall=100*gl_scale_f;
-    int ileftx = leftx/intervall;
-    ileftx*=intervall;
-    int idowny = downy/intervall;
-    idowny*=intervall;
+//    qreal rightx = translated_pos.x()+1920*gl_scale_f;
+//    qreal upy = translated_pos.y()+1080*gl_scale_f;
+//    qreal leftx = translated_pos.x()-1920*gl_scale_f;
+//    qreal downy = translated_pos.y()-1080*gl_scale_f;
+//    //QGraphicsEllipseItem* point = Scene->addEllipse(0,0,10,10,QPen(Qt::red));
+//    //point->setTransform(Scene->sceneRect().);
+//    //point->setTransform(QTransform::fromTranslate(translation_x,translation_y));
+//    //grid_point_vector.push_back(point);
+//    //std::cout << translation_y << std::endl;
+//    //std::cout << this->height() << std::endl;
+//    //qreal leftdownx = leftdown.x();//+translation_x;
+//    //qreal leftdowny = leftdown.y();//+translation_y;
+
+//    //QPointF topRight = mapToScene(this->sceneRect().topRight().x(),this->sceneRect().topRight().y());
+//    //qreal rightupx = topRight.x();//+translation_x;
+//    //qreal rightupy = topRight.y();//+translation_y;
+
+//    //std::cout << rightupx << std::endl;
+//    //std::cout << rightupy << std::endl;
+//    int intervall=100*gl_scale_f;
+//    int ileftx = leftx/intervall;
+//    ileftx*=intervall;
+//    int idowny = downy/intervall;
+//    idowny*=intervall;
     //int ileftdowny = std::floor(leftdowny);
     //int irightupx = std::floor(rightupx);
     //int irightupy = std::floor(rightupy);
@@ -982,23 +1009,23 @@ void jpsGraphicsView::create_grid() /// FIX ME!!!!
     //std::cout << ileftdownx << std::endl;
     //std::cout << irightupy << std::endl;
 
-    for (int i=ileftx; i<rightx; i+=intervall)
-    {
-        for (int j=idowny; j<upy; j+=intervall)
-        {
-            //std::cout << rightdownx << std::endl;
-            /*
-            QGraphicsLineItem* line1 = Scene->addLine(i,j-5*gl_scale_f,i,j+5*gl_scale_f,QPen(Qt::red,0));
-            line1->setTransform(QTransform::fromTranslate(translation_x,translation_y), true);
-            grid_point_vector.push_back(line1);
-            QGraphicsLineItem* line2 = Scene->addLine(i-5*gl_scale_f,j,i+5*gl_scale_f,j,QPen(Qt::red,0));
-            line2->setTransform(QTransform::fromTranslate(translation_x,translation_y), true);
-            grid_point_vector.push_back(line2);
-            */
-            QPointF gridpoint(i,j);
-            grid_point_vector.push_back(gridpoint);
-        }
-    }
+//    for (int i=ileftx; i<rightx; i+=intervall)
+//    {
+//        for (int j=idowny; j<upy; j+=intervall)
+//        {
+//            //std::cout << rightdownx << std::endl;
+//            /*
+//            QGraphicsLineItem* line1 = Scene->addLine(i,j-5*gl_scale_f,i,j+5*gl_scale_f,QPen(Qt::red,0));
+//            line1->setTransform(QTransform::fromTranslate(translation_x,translation_y), true);
+//            grid_point_vector.push_back(line1);
+//            QGraphicsLineItem* line2 = Scene->addLine(i-5*gl_scale_f,j,i+5*gl_scale_f,j,QPen(Qt::red,0));
+//            line2->setTransform(QTransform::fromTranslate(translation_x,translation_y), true);
+//            grid_point_vector.push_back(line2);
+//            */
+//            QPointF gridpoint(i,j);
+//            grid_point_vector.push_back(gridpoint);
+//        }
+//    }
 
     //std::cout << leftup-translation_x << std::endl;
 }
@@ -1075,13 +1102,13 @@ void jpsGraphicsView::translations(QPointF old_pos)
         caption_list[i]->setTransform(QTransform::fromScale(scalef,scalef),true);
 
     }
-    for (int i=0; i<grid_point_vector.size(); ++i)
-    {
-        //line_vector[i]->get_line()->translate(pos.x()-old_pos.x(),pos.y()-old_pos.y());
-        //grid_point_vector[i]->setTransform(QTransform::fromTranslate(pos.x()-old_pos.x(),pos.y()-old_pos.y()), true);
-        grid_point_vector[i].setX(pos.x());
-        grid_point_vector[i].setY(pos.y());
-    }
+//    for (int i=0; i<grid_point_vector.size(); ++i)
+//    {
+//        //line_vector[i]->get_line()->translate(pos.x()-old_pos.x(),pos.y()-old_pos.y());
+//        //grid_point_vector[i]->setTransform(QTransform::fromTranslate(pos.x()-old_pos.x(),pos.y()-old_pos.y()), true);
+//        grid_point_vector[i].setX(pos.x());
+//        grid_point_vector[i].setY(pos.y());
+//    }
 
     for (jpsLandmark* landmark:LLandmarks)
     {
@@ -1092,6 +1119,10 @@ void jpsGraphicsView::translations(QPointF old_pos)
     {
         currentLandmarkRect->setTransform(QTransform::fromTranslate(pos.x()-old_pos.x(),pos.y()-old_pos.y()), true);
     }
+    if (gridmap!=nullptr)
+    {
+        gridmap->setTransform(QTransform::fromTranslate(pos.x()-old_pos.x(),pos.y()-old_pos.y()), true);
+    }
     for (QGraphicsEllipseItem* ellipse:_waypoints)
     {
         ellipse->setTransform(QTransform::fromTranslate(pos.x()-old_pos.x(),pos.y()-old_pos.y()), true);
@@ -1196,9 +1227,6 @@ qreal jpsGraphicsView::calc_d_point(const QLineF &line,const qreal &x, const qre
 
 }
 
-
-
-
 // Delete single line
 
 void jpsGraphicsView::delete_marked_lines()
@@ -1376,14 +1404,14 @@ bool jpsGraphicsView::statusWall()
     return statWall;
 }
 
-void jpsGraphicsView::change_gridmode()
+void jpsGraphicsView::change_stat_anglesnap()
 {
-    gridmode=!gridmode;
+    anglesnap=!anglesnap;
 }
 
-bool jpsGraphicsView::get_gridmode()
+bool jpsGraphicsView::get_stat_anglesnap()
 {
-    return gridmode;
+    return anglesnap;
 }
 
 void jpsGraphicsView::en_disableDoor()
diff --git a/src/GraphicView.h b/src/GraphicView.h
index 3500d5c..76145a7 100644
--- a/src/GraphicView.h
+++ b/src/GraphicView.h
@@ -48,9 +48,8 @@ class jpsGraphicsView: public QGraphicsView {
     ~jpsGraphicsView();
 
     ///Change modes
-    void change_gridmode();
-    bool get_gridmode();
-    bool use_gridmode(QGraphicsLineItem *currentline, int accuracy);
+    void change_stat_anglesnap();
+    bool get_stat_anglesnap();
     void change_objectsnap();
     bool get_objectsnap();
     bool statusWall();
@@ -62,21 +61,42 @@ class jpsGraphicsView: public QGraphicsView {
     bool statusLandmark();
     void en_disableLandmark();
 
+    /// global functions
+    qreal get_scale_f();
+    void take_l_from_lineEdit(const qreal &length);
+    void disable_drawing();
+    bool use_anglesnap(QGraphicsLineItem *currentline, int accuracy);
+    void use_gridmode();
+    ///View
+    void zoom(int delta);
+    void translations(QPointF old_pos);
+    void AutoZoom();
+
     ///Pos
     QPointF return_Pos();
 
-    ///Catch points
+    ///Catch lines, points and intersections
     void catch_points();
+    void locate_intersection(jpsLineItem* item1, jpsLineItem* item2);
+    void line_collision();
+    void catch_lines();
 
     ///Delete all
     void delete_all(bool final=false);
 
     ///Line operations
-    void catch_lines();
     void drawLine();
     qreal calc_d_point(const QLineF &line, const qreal &x, const qreal &y);
     void delete_marked_lines();
     void RemoveIntersections(jpsLineItem* lineItem);
+    /// lines read from dxf-file
+    jpsLineItem *addLineItem(const qreal &x1, const qreal &y1, const qreal &x2, const qreal &y2, const QString &type="");
+    QList<jpsLineItem *> get_markedLines();
+    QList<jpsLineItem *> get_line_vector();
+    void unmark_all_lines();
+    void select_line(jpsLineItem *mline);
+    void SetVLine();
+    void EditLine(QPointF* point);
 
     /// Landmark
     void delete_landmark();
@@ -90,30 +110,13 @@ class jpsGraphicsView: public QGraphicsView {
     QGraphicsRectItem* GetCurrentSelectRect();
     void ShowWaypoints(QList<jpsWaypoint* > waypoints);
 
-
-    /// Lines
-    void take_l_from_lineEdit(const qreal &length);
-    QList<jpsLineItem *> get_markedLines();
-    QList<jpsLineItem *> get_line_vector();
-    qreal get_scale_f();
-    void unmark_all_lines();
-    void select_line(jpsLineItem *mline);
-    void disable_drawing();
-    jpsLineItem *addLineItem(const qreal &x1, const qreal &y1, const qreal &x2, const qreal &y2, const QString &type="");
-    void locate_intersection(jpsLineItem* item1, jpsLineItem* item2);
-    void SetVLine();
-    void EditLine(QPointF* point);
-
     ///RoomCaption
     bool show_hide_roomCaption(QString name, qreal x, qreal y);
 
-    void line_collision();
+    ///backgroundgrid
     void create_grid();
 
-    ///View
-    void zoom(int delta);
-    void translations(QPointF old_pos);
-    void AutoZoom();
+
 
 public slots:
     ///Waypoints
@@ -122,6 +125,7 @@ public slots:
 
 
 protected:
+    ///Mouse events
     virtual void mouseMoveEvent(QMouseEvent * mouseEvent);
     //void paintEvent(QPaintEvent* event);
     virtual void mousePressEvent(QMouseEvent *event);
@@ -133,7 +137,7 @@ public slots:
     QGraphicsLineItem* current_line;
     //std::vector<jpsLineItem> line_vector;
     QList<QPointF *> intersect_point_vector;
-    QList<QPointF> grid_point_vector;
+    //QList<QPointF> grid_point_vector;
     QList<jpsLineItem *> line_vector;
     QList<QGraphicsLineItem *> origin;
     //QList<QList<jpsLineItem*> *> mainlist;
@@ -145,7 +149,7 @@ public slots:
     qreal translation_x;
     qreal translation_y;
     QPointF translated_pos;
-    bool gridmode;
+    bool anglesnap;
     bool statWall;
     bool statDoor;
     bool statExit;
@@ -169,9 +173,8 @@ public slots:
     QList<QGraphicsEllipseItem* > _waypoints;
     QGraphicsLineItem* _currentVLine;
     QPointF* _currentTrackedPoint;
-
+    QGraphicsPixmapItem* gridmap;
     bool _statLineEdit;
-
     bool lines_collided;
     bool _assoDef;
 
@@ -189,9 +192,6 @@ public slots:
     void AssoDefCompleted();
     //void DoubleClick();
 
-
-
-
 };
 
 
diff --git a/src/mainWindow.cpp b/src/mainWindow.cpp
index 5456168..c4fc190 100644
--- a/src/mainWindow.cpp
+++ b/src/mainWindow.cpp
@@ -92,7 +92,7 @@ MWindow :: MWindow() {
     /// Tab Help
     connect(action_ber,SIGNAL(triggered(bool)),this,SLOT(info()));
     /// Tab Tools
-    connect(actionanglesnap,SIGNAL(triggered(bool)),this,SLOT(gridmode()));
+    connect(actionanglesnap,SIGNAL(triggered(bool)),this,SLOT(anglesnap()));
     connect(actionWall,SIGNAL(triggered(bool)),this,SLOT(en_disableWall()));
     connect(actionDoor,SIGNAL(triggered(bool)),this,SLOT(en_disableDoor()));
     connect(actionExit,SIGNAL(triggered(bool)),this,SLOT(en_disableExit()));
@@ -265,9 +265,9 @@ void MWindow::info(){
                 0,tr("About..."),tr("JuPedSim; Interface for generating and editing geometry(XML)-files necessary for using JPScore; Manual and tutorial coming soon!"));
 }
 
-void MWindow::gridmode()
+void MWindow::anglesnap()
 {
-   mview->change_gridmode();
+   mview->change_stat_anglesnap();
 }
 
 void MWindow::en_disableWall()
diff --git a/src/mainWindow.h b/src/mainWindow.h
index 3d76676..e44ded3 100644
--- a/src/mainWindow.h
+++ b/src/mainWindow.h
@@ -70,7 +70,7 @@ protected slots:
     void saveFile();
     void saveAsDXF();
     void info();
-    void gridmode();
+    void anglesnap();
     void en_disableWall();
     void en_disableDoor();
     void en_disableExit();

From 5be72cfee37080b5383438b4bc7fe195a34523b7 Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Thu, 30 Jul 2015 16:09:23 +0200
Subject: [PATCH 03/53] procedure to establish backgroundgrid changed again.
 Grid now will be painted using QGraphicsScene::drawBackground. Performance is
 OK

---
 jpseditor.pro        |  6 ++-
 src/GraphicView.cpp  | 97 +++++++-------------------------------------
 src/GraphicView.h    | 10 ++---
 src/graphicscene.cpp | 59 +++++++++++++++++++++++++++
 src/graphicscene.h   | 31 ++++++++++++++
 src/mainWindow.cpp   |  3 +-
 6 files changed, 116 insertions(+), 90 deletions(-)
 create mode 100644 src/graphicscene.cpp
 create mode 100644 src/graphicscene.h

diff --git a/jpseditor.pro b/jpseditor.pro
index 71f932d..f2d6466 100644
--- a/jpseditor.pro
+++ b/jpseditor.pro
@@ -52,7 +52,8 @@ HEADERS += \
     dxflib/src/dl_codes.h \
     dxflib/src/dl_attributes.h \
     src/jpswaypoint.h \
-    src/widgetlandmark.h
+    src/widgetlandmark.h \
+    src/graphicscene.h
 
 
 SOURCES += \
@@ -70,7 +71,8 @@ SOURCES += \
     dxflib/src/dl_writer_ascii.cpp \
     dxflib/src/dl_dxf.cpp \
     src/jpswaypoint.cpp \
-    src/widgetlandmark.cpp
+    src/widgetlandmark.cpp \
+    src/graphicscene.cpp
 
 
 RESOURCES +=  forms/Ressource.qrc
diff --git a/src/GraphicView.cpp b/src/GraphicView.cpp
index 5cd5e96..0d9939a 100644
--- a/src/GraphicView.cpp
+++ b/src/GraphicView.cpp
@@ -58,6 +58,7 @@ jpsGraphicsView::jpsGraphicsView(QWidget* parent):QGraphicsView(parent)
     currentSelectRect=nullptr;
     gridmap=nullptr;
     objectsnap=false;
+    _gridmode=false;
     statWall=false;
     statDoor=false;
     statExit=false;
@@ -79,7 +80,7 @@ jpsGraphicsView::jpsGraphicsView(QWidget* parent):QGraphicsView(parent)
     //m_graphView->setFixedSize(1600, 900);
     //m_graphView->setScene(m_graphScen);
 
-    setCacheMode(QGraphicsView::CacheBackground);
+    //setCacheMode(QGraphicsView::CacheBackground);
     setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
 
 
@@ -95,11 +96,12 @@ jpsGraphicsView::jpsGraphicsView(QWidget* parent):QGraphicsView(parent)
 
 
     //Set-up the scene
-    Scene = new QGraphicsScene(this);
+    Scene = new GraphicScene(this);
+
     setScene(Scene);
     setSceneRect(0, 0, 1920, 1080);
 
-    create_grid();
+    //create_grid();
 
     ///Origin
 
@@ -950,85 +952,6 @@ void jpsGraphicsView::line_collision() ///FIX ME!!!
     }
 }
 
-void jpsGraphicsView::create_grid() /// FIX ME!!!!
-{
-    //QPointF sceneViewBottomLeft = mapToScene(QPoint(this->sceneRect().bottomLeft()));
-    //QPointF sceneViewTopRight = mapToScene(QPoint(this->sceneRect().topRight()));
-    //QRectF rect = this->sceneRect();
-    //for (QGraphicsLineItem *gridpoint: grid_point_vector)
-    //{
-     //   delete gridpoint;
-    //}
-    //grid_point_vector.clear();
-
-    QPixmap pixmap("../jupedsim/forms/backgroundgridpoints.png");
-
-    gridmap = Scene->addPixmap(pixmap);
-
-    gridmap->setScale(0.0269);
-    gridmap->setTransform(QTransform::fromTranslate(-0.96,-0.05), true);
-
-    //std::cout << rect.bottomRight().y() << std::endl;
-
-    //QPointF leftdown = mapToScene(this->sceneRect().bottomLeft().x(),this->sceneRect().bottomLeft().y());
-
-    //QPointF leftup = mapToScene(Scene->sceneRect().bottomLeft().x(),Scene->sceneRect().bottomLeft().y());
-    //std::cout << leftup.x()-translation_x << std::endl;
-//    qreal rightx = translated_pos.x()+1920*gl_scale_f;
-//    qreal upy = translated_pos.y()+1080*gl_scale_f;
-//    qreal leftx = translated_pos.x()-1920*gl_scale_f;
-//    qreal downy = translated_pos.y()-1080*gl_scale_f;
-//    //QGraphicsEllipseItem* point = Scene->addEllipse(0,0,10,10,QPen(Qt::red));
-//    //point->setTransform(Scene->sceneRect().);
-//    //point->setTransform(QTransform::fromTranslate(translation_x,translation_y));
-//    //grid_point_vector.push_back(point);
-//    //std::cout << translation_y << std::endl;
-//    //std::cout << this->height() << std::endl;
-//    //qreal leftdownx = leftdown.x();//+translation_x;
-//    //qreal leftdowny = leftdown.y();//+translation_y;
-
-//    //QPointF topRight = mapToScene(this->sceneRect().topRight().x(),this->sceneRect().topRight().y());
-//    //qreal rightupx = topRight.x();//+translation_x;
-//    //qreal rightupy = topRight.y();//+translation_y;
-
-//    //std::cout << rightupx << std::endl;
-//    //std::cout << rightupy << std::endl;
-//    int intervall=100*gl_scale_f;
-//    int ileftx = leftx/intervall;
-//    ileftx*=intervall;
-//    int idowny = downy/intervall;
-//    idowny*=intervall;
-    //int ileftdowny = std::floor(leftdowny);
-    //int irightupx = std::floor(rightupx);
-    //int irightupy = std::floor(rightupy);
-    //std::cout << ileftupx << std::endl;
-    //std::cout << rightdownx << std::endl;
-    //QGraphicsTextItem* point = Scene->addText("Hallo Welt");
-    //point->setX(ileftupx);
-    //point->setY(ileftupy);
-    //std::cout << ileftdownx << std::endl;
-    //std::cout << irightupy << std::endl;
-
-//    for (int i=ileftx; i<rightx; i+=intervall)
-//    {
-//        for (int j=idowny; j<upy; j+=intervall)
-//        {
-//            //std::cout << rightdownx << std::endl;
-//            /*
-//            QGraphicsLineItem* line1 = Scene->addLine(i,j-5*gl_scale_f,i,j+5*gl_scale_f,QPen(Qt::red,0));
-//            line1->setTransform(QTransform::fromTranslate(translation_x,translation_y), true);
-//            grid_point_vector.push_back(line1);
-//            QGraphicsLineItem* line2 = Scene->addLine(i-5*gl_scale_f,j,i+5*gl_scale_f,j,QPen(Qt::red,0));
-//            line2->setTransform(QTransform::fromTranslate(translation_x,translation_y), true);
-//            grid_point_vector.push_back(line2);
-//            */
-//            QPointF gridpoint(i,j);
-//            grid_point_vector.push_back(gridpoint);
-//        }
-//    }
-
-    //std::cout << leftup-translation_x << std::endl;
-}
 
 void jpsGraphicsView::zoom(int delta)
 {
@@ -1069,6 +992,9 @@ void jpsGraphicsView::translations(QPointF old_pos)
     translation_x+=pos.x()-old_pos.x();
     translation_y+=pos.y()-old_pos.y();
 
+    /// translate the background grid
+    Scene->ChangeTranslation(translation_x,translation_y);
+
     if (current_line!=nullptr)
     {
         //current_line->translate(pos.x()-old_pos.x(),pos.y()-old_pos.y());
@@ -1382,6 +1308,13 @@ bool jpsGraphicsView::get_objectsnap()
     return objectsnap;
 }
 
+void jpsGraphicsView::change_gridmode()
+{
+    _gridmode=!_gridmode;
+    Scene->ChangeGridmode(_gridmode);
+    Scene->update();
+}
+
 void jpsGraphicsView::en_disableWall()
 {
     statWall=!statWall;
diff --git a/src/GraphicView.h b/src/GraphicView.h
index 76145a7..d1729f5 100644
--- a/src/GraphicView.h
+++ b/src/GraphicView.h
@@ -30,7 +30,8 @@
 
 
 #include <QGraphicsView>
-#include <QGraphicsSceneMouseEvent>
+//#include <QGraphicsSceneMouseEvent>
+#include "graphicscene.h"
 #include <QGraphicsLineItem>
 #include "jpsLineItem.h"
 #include "jpslandmark.h"
@@ -52,6 +53,7 @@ class jpsGraphicsView: public QGraphicsView {
     bool get_stat_anglesnap();
     void change_objectsnap();
     bool get_objectsnap();
+    void change_gridmode();
     bool statusWall();
     void en_disableWall();
     bool statusDoor();
@@ -113,9 +115,6 @@ class jpsGraphicsView: public QGraphicsView {
     ///RoomCaption
     bool show_hide_roomCaption(QString name, qreal x, qreal y);
 
-    ///backgroundgrid
-    void create_grid();
-
 
 
 public slots:
@@ -143,7 +142,7 @@ public slots:
     //QList<QList<jpsLineItem*> *> mainlist;
     QPointF pos;
     //QPointF* intersection_point;
-    QGraphicsScene* Scene;
+    GraphicScene* Scene;
     bool midbutton_hold;
     bool leftbutton_hold;
     qreal translation_x;
@@ -177,6 +176,7 @@ public slots:
     bool _statLineEdit;
     bool lines_collided;
     bool _assoDef;
+    bool _gridmode;
 
     //qreal gl_min_x;
     //qreal gl_min_y;
diff --git a/src/graphicscene.cpp b/src/graphicscene.cpp
new file mode 100644
index 0000000..98c22ae
--- /dev/null
+++ b/src/graphicscene.cpp
@@ -0,0 +1,59 @@
+#include "graphicscene.h"
+#include <iostream>
+
+GraphicScene::GraphicScene()
+{
+
+}
+
+GraphicScene::GraphicScene(QObject *parent) : QGraphicsScene(parent)
+{
+    _translationX=0.0;
+    _translationY=0.0;
+    _gridmode=false;
+}
+
+GraphicScene::~GraphicScene()
+{
+
+}
+
+void GraphicScene::ChangeGridmode(const bool &stat)
+{
+    _gridmode=stat;
+}
+
+bool GraphicScene::GetGridmode() const
+{
+    return _gridmode;
+}
+
+void GraphicScene::ChangeTranslation(qreal x, qreal y)
+{
+    _translationX=x;
+    _translationY=y;
+}
+
+void GraphicScene::drawBackground(QPainter *painter, const QRectF &rect)
+{
+    if (_gridmode)
+    {
+        const int gridSize = 1;
+
+        qreal left = int(rect.left()-_translationX) - (int(rect.left()-_translationX) % gridSize);
+        qreal top = int(rect.top()-_translationY) - (int(rect.top()-_translationY) % gridSize);
+
+        QVarLengthArray<QLineF, 100> lines;
+
+        for (qreal x = left; x < rect.right()-_translationX; x += gridSize)
+            lines.append(QLineF(x+_translationX, rect.top(), x+_translationX, rect.bottom()));
+        for (qreal y = top; y < rect.bottom()-_translationY; y += gridSize)
+            lines.append(QLineF(rect.left(), y+_translationY, rect.right(), y+_translationY));
+
+        //qDebug() << lines.size();
+        painter->setPen(QPen(Qt::gray,0));
+        painter->drawLines(lines.data(), lines.size());
+    }
+
+}
+
diff --git a/src/graphicscene.h b/src/graphicscene.h
new file mode 100644
index 0000000..f0257cc
--- /dev/null
+++ b/src/graphicscene.h
@@ -0,0 +1,31 @@
+#ifndef GRAPHICSCENE_H
+#define GRAPHICSCENE_H
+
+#include <QGraphicsScene>
+#include <QPainter>
+
+class GraphicScene : public QGraphicsScene
+{
+    Q_OBJECT
+
+public:
+    GraphicScene();
+    GraphicScene(QObject* parent=0);
+    GraphicScene(qreal x, qreal y, qreal w, qreal h)
+        : QGraphicsScene(x, y, w, h)
+    { }
+    ~GraphicScene();
+    void ChangeGridmode(const bool& stat);
+    bool GetGridmode() const;
+    void ChangeTranslation(qreal x, qreal y);
+
+protected:
+    void drawBackground(QPainter *painter, const QRectF &rect);
+private:
+    bool _gridmode;
+    qreal _translationX;
+    qreal _translationY;
+
+};
+
+#endif // GRAPHICSCENE_H
diff --git a/src/mainWindow.cpp b/src/mainWindow.cpp
index c4fc190..8b0f62d 100644
--- a/src/mainWindow.cpp
+++ b/src/mainWindow.cpp
@@ -310,7 +310,8 @@ void MWindow::disableDrawing()
 
 void MWindow::objectsnap()
 {
-    mview->change_objectsnap();
+    //mview->change_objectsnap();
+    mview->change_gridmode();
 }
 
 void MWindow::show_coords()

From 95750f25f924a0bff1bdb27d9bbe81f7c8d48e61 Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Thu, 30 Jul 2015 16:12:11 +0200
Subject: [PATCH 04/53] not necessary any more since grid will be painted by
 QPainter

---
 forms/backgroundgridpoints.png | Bin 6785 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 forms/backgroundgridpoints.png

diff --git a/forms/backgroundgridpoints.png b/forms/backgroundgridpoints.png
deleted file mode 100644
index d73d4234aa8971f2c83210c7a8c7ad05436a8dbf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6785
zcmeAS@N?(olHy`uVBq!ia0y~yU<+elU|Pq)1{ArxSMeo~Vk{1FcVbv~P6otbNq6*h
zWMJ6X&;2Kn70Bl-@Q5sCU=S(+Va9uD@)ZmWQevJijv*CsZ*OkoWpLy<yy4CMFaNo;
zcx5ab1(#f|1?mC<l|vv)85kT)M8n>Fv+DPq8*OT4YF3(e^~RMOS9XRb2PX$V59{^q
zMVI*eY1!HHAgdV|BvjUbX$BXVVWR@z0Kp88;KZkS>p$ZSSd<Xg&%gC225eS?<7nW5
z0>XiC+8RyD;1okdND&T8+$u(sGB}hm^Efs0>1a|OP0GL!plu?<oyVz}l;O6F7967m
z2T}DnJjKu?8B)X0(WE?@lt+{DXwQV$M#^Y&j@Xc*M%h0a+VlwR(K>Ln4jiomN9#ah
w%bL+rnb?q`qz)V{mFZ9_!y{<ug!ZRe`}`ZhD)o03xPSu4)78&qol`;+0A<hWwEzGB


From 21efdaedc36fa7e303f17155006ec2d830bf59e0 Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Thu, 30 Jul 2015 16:12:30 +0200
Subject: [PATCH 05/53] not necessary any more since grid will be painted by
 QPainter

---
 forms/backgroundgrid.png | Bin 35014 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 forms/backgroundgrid.png

diff --git a/forms/backgroundgrid.png b/forms/backgroundgrid.png
deleted file mode 100644
index e98e2c8f36f2322e2e1b1e29b9b6ac9c2a5ed081..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 35014
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
O+qi!7y3=bb|M(sGP<PM(


From 05fb948aa6515d9f2d6970a091c1b33ac97105c1 Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Fri, 31 Jul 2015 15:35:30 +0200
Subject: [PATCH 06/53] background established. However, it is not adaptive
 yet.

---
 forms/Ressource.qrc |   1 +
 forms/anglesnap.PNG | Bin 0 -> 18685 bytes
 forms/mainwindow.ui |  33 ++++++++++++++++++++++++++++-----
 src/GraphicView.cpp |  27 +++++++++++++++++++--------
 src/mainWindow.cpp  |   7 ++++++-
 src/mainWindow.h    |   1 +
 6 files changed, 55 insertions(+), 14 deletions(-)
 create mode 100644 forms/anglesnap.PNG

diff --git a/forms/Ressource.qrc b/forms/Ressource.qrc
index 04ae408..c9b94b3 100644
--- a/forms/Ressource.qrc
+++ b/forms/Ressource.qrc
@@ -38,5 +38,6 @@
         <file>jupedsim.png</file>
         <file>statue.jpg</file>
         <file>statue_specs.jpg</file>
+        <file>anglesnap.PNG</file>
     </qresource>
 </RCC>
diff --git a/forms/anglesnap.PNG b/forms/anglesnap.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..97fd814fa2b35a7b918dd4c47d2323dbc53e0265
GIT binary patch
literal 18685
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
b6Crp0{B&&J-|ruymKyCb)qlLp@z4JQML{ZI

literal 0
HcmV?d00001

diff --git a/forms/mainwindow.ui b/forms/mainwindow.ui
index 855d0bc..60112e6 100644
--- a/forms/mainwindow.ui
+++ b/forms/mainwindow.ui
@@ -53,7 +53,7 @@
     <addaction name="actionWall"/>
     <addaction name="actionDoor"/>
     <addaction name="separator"/>
-    <addaction name="actionanglesnap"/>
+    <addaction name="actiongridmode"/>
     <addaction name="actionObjectsnap"/>
     <addaction name="actionDelete_lines"/>
     <addaction name="actionDelete_single_line"/>
@@ -87,10 +87,12 @@
    <addaction name="actionWall"/>
    <addaction name="actionDoor"/>
    <addaction name="separator"/>
-   <addaction name="actionanglesnap"/>
+   <addaction name="actiongridmode"/>
    <addaction name="separator"/>
    <addaction name="actionObjectsnap"/>
    <addaction name="separator"/>
+   <addaction name="actionanglesnap"/>
+   <addaction name="separator"/>
    <addaction name="actionDelete_lines"/>
    <addaction name="separator"/>
    <addaction name="actionDelete_single_line"/>
@@ -156,7 +158,7 @@
     <string>F1</string>
    </property>
   </action>
-  <action name="actionanglesnap">
+  <action name="actiongridmode">
    <property name="checkable">
     <bool>true</bool>
    </property>
@@ -168,10 +170,10 @@
      <normaloff>:/Grid.png</normaloff>:/Grid.png</iconset>
    </property>
    <property name="text">
-    <string>Angle snap</string>
+    <string>Gridmode</string>
    </property>
    <property name="toolTip">
-    <string>Angle snap</string>
+    <string>Gridmode</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+G</string>
@@ -422,6 +424,27 @@
     <string>LandmarkSpecs</string>
    </property>
   </action>
+  <action name="actionanglesnap">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="enabled">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="Ressource.qrc">
+     <normaloff>:/anglesnap.PNG</normaloff>:/anglesnap.PNG</iconset>
+   </property>
+   <property name="text">
+    <string>Orthomode</string>
+   </property>
+   <property name="toolTip">
+    <string>Orthomode</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+H</string>
+   </property>
+  </action>
  </widget>
  <resources>
   <include location="Ressource.qrc"/>
diff --git a/src/GraphicView.cpp b/src/GraphicView.cpp
index 0d9939a..32efea8 100644
--- a/src/GraphicView.cpp
+++ b/src/GraphicView.cpp
@@ -165,13 +165,15 @@ void jpsGraphicsView::mouseMoveEvent(QMouseEvent *mouseEvent)
     translated_pos.setX(pos.x()-translation_x);
     translated_pos.setY(pos.y()-translation_y);
 
+    if (_gridmode)
+        use_gridmode();
 
     if (objectsnap)
     {
 
         catch_points();
 
-        use_gridmode();
+
 
         ///VLine
         if (point_tracked && (statWall==true || statDoor==true || statExit==true))
@@ -516,11 +518,17 @@ bool jpsGraphicsView::use_anglesnap(QGraphicsLineItem* currentline, int accuracy
 
 void jpsGraphicsView::use_gridmode()
 {
-    if ((std::fmod(translated_pos.x(),1.0)<=0.1 || std::fmod(translated_pos.x(),1.0)>=0.9) &&
-         (std::fmod(translated_pos.y(),1.0)<=0.1 || std::fmod(translated_pos.y(),1.0)>=0.9))
+    if ((std::fmod(std::fabs(translated_pos.x()),1.0)<=0.1 || std::fmod(std::fabs(translated_pos.x()),1.0)>=0.9) &&
+         (std::fmod(std::fabs(translated_pos.y()),1.0)<=0.1 || std::fmod(std::fabs(translated_pos.y()),1.0)>=0.9))
     {
-        translated_pos.setX(int(translated_pos.x()+0.5));
-        translated_pos.setY(int(translated_pos.y()+0.5));
+        if (translated_pos.x()<0)
+            translated_pos.setX(int(translated_pos.x()-0.5));
+        else
+            translated_pos.setX(int(translated_pos.x()+0.5));
+        if (translated_pos.y()<0)
+            translated_pos.setY(int(translated_pos.y()-0.5));
+        else
+            translated_pos.setY(int(translated_pos.y()+0.5));
         current_rect=Scene->addRect(translated_pos.x()+translation_x-10*gl_scale_f,translated_pos.y()+translation_y-10*gl_scale_f,20*gl_scale_f,20*gl_scale_f,QPen(Qt::red,0));
         point_tracked=true;
         _currentTrackedPoint= &translated_pos;
@@ -552,7 +560,8 @@ void jpsGraphicsView::catch_points()
             _currentTrackedPoint= &translated_pos;
             //QPen pen;
             //pen.setColor('red');
-            current_rect=Scene->addRect(translated_pos.x()+translation_x-10*gl_scale_f,translated_pos.y()+translation_y-10*gl_scale_f,20*gl_scale_f,20*gl_scale_f,QPen(Qt::red,0));
+            if (current_rect==nullptr)
+                current_rect=Scene->addRect(translated_pos.x()+translation_x-10*gl_scale_f,translated_pos.y()+translation_y-10*gl_scale_f,20*gl_scale_f,20*gl_scale_f,QPen(Qt::red,0));
             /// if a point was tracked there is no need to look for further points ( only one point can be tracked)
 
             return;
@@ -573,7 +582,8 @@ void jpsGraphicsView::catch_points()
             translated_pos.setY(line_vector[i]->get_line()->line().y2());
             //cursor.setPos(mapToGlobal(QPoint(translate_back_x(line_vector[i].x2()),translate_back_y(line_vector[i].y2()))));
             point_tracked=true;
-            current_rect=Scene->addRect(translated_pos.x()+translation_x-10*gl_scale_f,translated_pos.y()+translation_y-10*gl_scale_f,20*gl_scale_f,20*gl_scale_f,QPen(Qt::red,0));            
+            if (current_rect==nullptr)
+                current_rect=Scene->addRect(translated_pos.x()+translation_x-10*gl_scale_f,translated_pos.y()+translation_y-10*gl_scale_f,20*gl_scale_f,20*gl_scale_f,QPen(Qt::red,0));
             _currentTrackedPoint= &translated_pos;
             return;
         }
@@ -587,8 +597,9 @@ void jpsGraphicsView::catch_points()
         {
             translated_pos.setX(intersect_point_vector[j]->x());
             translated_pos.setY(intersect_point_vector[j]->y());
+            if (current_rect==nullptr)
             current_rect=Scene->addRect(translated_pos.x()+translation_x-10*gl_scale_f,translated_pos.y()+translation_y-10*gl_scale_f,20*gl_scale_f,20*gl_scale_f,QPen(Qt::red,0));
-            point_tracked=true;
+                point_tracked=true;
             return;
         }
     }
diff --git a/src/mainWindow.cpp b/src/mainWindow.cpp
index 8b0f62d..ac24fd3 100644
--- a/src/mainWindow.cpp
+++ b/src/mainWindow.cpp
@@ -93,6 +93,7 @@ MWindow :: MWindow() {
     connect(action_ber,SIGNAL(triggered(bool)),this,SLOT(info()));
     /// Tab Tools
     connect(actionanglesnap,SIGNAL(triggered(bool)),this,SLOT(anglesnap()));
+    connect(actiongridmode,SIGNAL(triggered(bool)),this,SLOT(gridmode()));
     connect(actionWall,SIGNAL(triggered(bool)),this,SLOT(en_disableWall()));
     connect(actionDoor,SIGNAL(triggered(bool)),this,SLOT(en_disableDoor()));
     connect(actionExit,SIGNAL(triggered(bool)),this,SLOT(en_disableExit()));
@@ -310,7 +311,11 @@ void MWindow::disableDrawing()
 
 void MWindow::objectsnap()
 {
-    //mview->change_objectsnap();
+    mview->change_objectsnap();
+}
+
+void MWindow::gridmode()
+{
     mview->change_gridmode();
 }
 
diff --git a/src/mainWindow.h b/src/mainWindow.h
index e44ded3..3e0629d 100644
--- a/src/mainWindow.h
+++ b/src/mainWindow.h
@@ -77,6 +77,7 @@ protected slots:
     void en_disableLandmark();
     void disableDrawing();
     void objectsnap();
+    void gridmode();
     void show_coords();
     void delete_lines();
     void delete_marked_lines();

From 6915239dab3d81c628e10f2d236ef6c95a65ae44 Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Mon, 3 Aug 2015 13:20:56 +0200
Subject: [PATCH 07/53] remove (redundant) constructor

---
 src/GraphicView.cpp  | 2 +-
 src/graphicscene.cpp | 4 ----
 src/graphicscene.h   | 6 +++---
 src/jpsobstacle.cpp  | 1 +
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/GraphicView.cpp b/src/GraphicView.cpp
index 32efea8..f9868af 100644
--- a/src/GraphicView.cpp
+++ b/src/GraphicView.cpp
@@ -96,7 +96,7 @@ jpsGraphicsView::jpsGraphicsView(QWidget* parent):QGraphicsView(parent)
 
 
     //Set-up the scene
-    Scene = new GraphicScene(this);
+    Scene = new GraphicScene(qobject_cast<QObject*>(this));
 
     setScene(Scene);
     setSceneRect(0, 0, 1920, 1080);
diff --git a/src/graphicscene.cpp b/src/graphicscene.cpp
index 98c22ae..db83022 100644
--- a/src/graphicscene.cpp
+++ b/src/graphicscene.cpp
@@ -1,10 +1,6 @@
 #include "graphicscene.h"
 #include <iostream>
 
-GraphicScene::GraphicScene()
-{
-
-}
 
 GraphicScene::GraphicScene(QObject *parent) : QGraphicsScene(parent)
 {
diff --git a/src/graphicscene.h b/src/graphicscene.h
index f0257cc..3d2cac4 100644
--- a/src/graphicscene.h
+++ b/src/graphicscene.h
@@ -9,8 +9,8 @@ class GraphicScene : public QGraphicsScene
     Q_OBJECT
 
 public:
-    GraphicScene();
-    GraphicScene(QObject* parent=0);
+
+    GraphicScene(QObject* parent=nullptr);
     GraphicScene(qreal x, qreal y, qreal w, qreal h)
         : QGraphicsScene(x, y, w, h)
     { }
@@ -20,7 +20,7 @@ class GraphicScene : public QGraphicsScene
     void ChangeTranslation(qreal x, qreal y);
 
 protected:
-    void drawBackground(QPainter *painter, const QRectF &rect);
+    void drawBackground(QPainter *painter, const QRectF &rect) override;
 private:
     bool _gridmode;
     qreal _translationX;
diff --git a/src/jpsobstacle.cpp b/src/jpsobstacle.cpp
index 3b4d710..2b8b52e 100644
--- a/src/jpsobstacle.cpp
+++ b/src/jpsobstacle.cpp
@@ -44,3 +44,4 @@ jpsRoom* jpsObstacle::get_room()
 {
     return _room;
 }
+

From 26797cc938fb9838d9186a6104afc4bf4daff451 Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Mon, 3 Aug 2015 14:25:13 +0200
Subject: [PATCH 08/53] remove qObjectcast

---
 src/GraphicView.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/GraphicView.cpp b/src/GraphicView.cpp
index f9868af..32efea8 100644
--- a/src/GraphicView.cpp
+++ b/src/GraphicView.cpp
@@ -96,7 +96,7 @@ jpsGraphicsView::jpsGraphicsView(QWidget* parent):QGraphicsView(parent)
 
 
     //Set-up the scene
-    Scene = new GraphicScene(qobject_cast<QObject*>(this));
+    Scene = new GraphicScene(this);
 
     setScene(Scene);
     setSceneRect(0, 0, 1920, 1080);

From 57545d40d174192d8eabad04811e0d3237524856 Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Mon, 3 Aug 2015 15:57:11 +0200
Subject: [PATCH 09/53] setScene qobject_cast

---
 src/GraphicView.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/GraphicView.cpp b/src/GraphicView.cpp
index 32efea8..0eb41a6 100644
--- a/src/GraphicView.cpp
+++ b/src/GraphicView.cpp
@@ -98,7 +98,7 @@ jpsGraphicsView::jpsGraphicsView(QWidget* parent):QGraphicsView(parent)
     //Set-up the scene
     Scene = new GraphicScene(this);
 
-    setScene(Scene);
+    setScene(qobject_cast<QGraphicsScene*>(Scene));
     setSceneRect(0, 0, 1920, 1080);
 
     //create_grid();

From 4d0af02faa018d27eae737da82d629d6731a1904 Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Mon, 3 Aug 2015 16:04:24 +0200
Subject: [PATCH 10/53] minor modifications

---
 src/GraphicView.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/GraphicView.cpp b/src/GraphicView.cpp
index 0eb41a6..32efea8 100644
--- a/src/GraphicView.cpp
+++ b/src/GraphicView.cpp
@@ -98,7 +98,7 @@ jpsGraphicsView::jpsGraphicsView(QWidget* parent):QGraphicsView(parent)
     //Set-up the scene
     Scene = new GraphicScene(this);
 
-    setScene(qobject_cast<QGraphicsScene*>(Scene));
+    setScene(Scene);
     setSceneRect(0, 0, 1920, 1080);
 
     //create_grid();

From ec049f6fba72e1cf99366d54dd9d0d744d92f7f4 Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Tue, 4 Aug 2015 07:59:24 +0200
Subject: [PATCH 11/53] Add graphicscene to CMakeLists.txt

---
 CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fa6befb..b635b72 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -84,6 +84,7 @@ set( SRCS
     src/mainWindow.cpp
     src/main.cpp 
     src/GraphicView.cpp
+	src/graphicscene.cpp
     src/roomwidget.cpp
     src/rooms.cpp
     src/datamanager.cpp  
@@ -101,6 +102,7 @@ set( SRCS
 set( HDR
     src/mainWindow.h 
     src/GraphicView.h
+	src/graphicscene.h
     src/roomwidget.h
     src/rooms.h
     src/datamanager.h  

From ac788db017ee2a17e592dc7a922853a3b2b32166 Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Tue, 4 Aug 2015 08:04:44 +0200
Subject: [PATCH 12/53] #include QVarLengthArray

---
 src/graphicscene.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/graphicscene.cpp b/src/graphicscene.cpp
index db83022..f88f5be 100644
--- a/src/graphicscene.cpp
+++ b/src/graphicscene.cpp
@@ -1,5 +1,5 @@
 #include "graphicscene.h"
-#include <iostream>
+#include <QVarLengthArray>
 
 
 GraphicScene::GraphicScene(QObject *parent) : QGraphicsScene(parent)

From 29d0e4434a0ec8300a79645944e43244eaa5dc0a Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Tue, 4 Aug 2015 15:08:05 +0200
Subject: [PATCH 13/53] Adaptive grid (point- and line-grid can be selected via
 Settings)

---
 .idea/vcs.xml           |   6 +++
 CMakeLists.txt          |   3 ++
 forms/mainwindow.ui     |  57 ++++++++++++++---------
 forms/widgetsettings.ui | 100 ++++++++++++++++++++++++++++++++++++++++
 jpseditor.pro           |   9 ++--
 src/GraphicView.cpp     |  70 ++++++++++++++++++++++------
 src/GraphicView.h       |   9 +++-
 src/graphicscene.cpp    |  63 ++++++++++++++++++++-----
 src/graphicscene.h      |   6 +++
 src/mainWindow.cpp      |  63 ++++++++++++++++++-------
 src/mainWindow.h        |   3 ++
 src/widgetsettings.cpp  |  31 +++++++++++++
 src/widgetsettings.h    |  29 ++++++++++++
 13 files changed, 382 insertions(+), 67 deletions(-)
 create mode 100644 .idea/vcs.xml
 create mode 100644 forms/widgetsettings.ui
 create mode 100644 src/widgetsettings.cpp
 create mode 100644 src/widgetsettings.h

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b635b72..1ac4a45 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,6 +95,7 @@ set( SRCS
 	src/jpslandmark.cpp
 	src/jpswaypoint.cpp
 	src/widgetlandmark.cpp
+	src/widgetsettings.cpp
     dxflib/src/dl_writer_ascii.cpp
     dxflib/src/dl_dxf.cpp
   )  
@@ -113,6 +114,7 @@ set( HDR
 	src/jpslandmark.h
 	src/jpswaypoint.h
 	src/widgetlandmark.h
+	src/widgetsettings.h
     dxflib/src/dl_writer_ascii.h
     dxflib/src/dl_writer.h
     dxflib/src/dl_global.h
@@ -132,6 +134,7 @@ set( UIS
     forms/mainwindow.ui
     forms/roomwidget.ui
 	forms/widgetlandmark.ui
+	forms/widgetsettings.ui
   )
 
 # and finally a resource file
diff --git a/forms/mainwindow.ui b/forms/mainwindow.ui
index 60112e6..41cc955 100644
--- a/forms/mainwindow.ui
+++ b/forms/mainwindow.ui
@@ -14,7 +14,7 @@
    <string>JuPedSim</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="Ressource.qrc">
+   <iconset>
     <normaloff>:/jupedsim.png</normaloff>:/jupedsim.png</iconset>
   </property>
   <widget class="QWidget" name="centralwidget"/>
@@ -36,6 +36,8 @@
     <addaction name="actionSpeichern"/>
     <addaction name="actionSpeichern_dxf"/>
     <addaction name="separator"/>
+    <addaction name="actionSettings"/>
+    <addaction name="separator"/>
     <addaction name="actionBeenden"/>
    </widget>
    <widget class="QMenu" name="menuHilfe">
@@ -55,6 +57,7 @@
     <addaction name="separator"/>
     <addaction name="actiongridmode"/>
     <addaction name="actionObjectsnap"/>
+    <addaction name="actionanglesnap"/>
     <addaction name="actionDelete_lines"/>
     <addaction name="actionDelete_single_line"/>
     <addaction name="separator"/>
@@ -104,7 +107,7 @@
   </widget>
   <action name="action_ffnen">
    <property name="icon">
-    <iconset resource="Ressource.qrc">
+    <iconset>
      <normaloff>:/open.png</normaloff>:/open.png</iconset>
    </property>
    <property name="text">
@@ -119,7 +122,7 @@
   </action>
   <action name="actionSpeichern">
    <property name="icon">
-    <iconset resource="Ressource.qrc">
+    <iconset>
      <normaloff>:/filesave.png</normaloff>:/filesave.png</iconset>
    </property>
    <property name="text">
@@ -134,7 +137,7 @@
   </action>
   <action name="actionBeenden">
    <property name="icon">
-    <iconset resource="Ressource.qrc">
+    <iconset>
      <normaloff>:/man-gimp1.png</normaloff>:/man-gimp1.png</iconset>
    </property>
    <property name="text">
@@ -166,7 +169,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="Ressource.qrc">
+    <iconset>
      <normaloff>:/Grid.png</normaloff>:/Grid.png</iconset>
    </property>
    <property name="text">
@@ -187,7 +190,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="Ressource.qrc">
+    <iconset>
      <normaloff>:/Wall.png</normaloff>:/Wall.png</iconset>
    </property>
    <property name="text">
@@ -208,7 +211,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="Ressource.qrc">
+    <iconset>
      <normaloff>:/snap.png</normaloff>:/snap.png</iconset>
    </property>
    <property name="text">
@@ -223,7 +226,7 @@
   </action>
   <action name="actionDelete_lines">
    <property name="icon">
-    <iconset resource="Ressource.qrc">
+    <iconset>
      <normaloff>:/DeleteAll.png</normaloff>:/DeleteAll.png</iconset>
    </property>
    <property name="text">
@@ -238,7 +241,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="Ressource.qrc">
+    <iconset>
      <normaloff>:/Delete.png</normaloff>:/Delete.png</iconset>
    </property>
    <property name="text">
@@ -259,7 +262,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="Ressource.qrc">
+    <iconset>
      <normaloff>:/Door.png</normaloff>:/Door.png</iconset>
    </property>
    <property name="text">
@@ -283,7 +286,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="Ressource.qrc">
+    <iconset>
      <normaloff>:/Exit.png</normaloff>:/Exit.png</iconset>
    </property>
    <property name="text">
@@ -307,7 +310,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="Ressource.qrc">
+    <iconset>
      <normaloff>:/Room.png</normaloff>:/Room.png</iconset>
    </property>
    <property name="text">
@@ -334,7 +337,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="Ressource.qrc">
+    <iconset>
      <normaloff>:/basicCursor.png</normaloff>:/basicCursor.png</iconset>
    </property>
    <property name="text">
@@ -352,7 +355,7 @@
   </action>
   <action name="actionSpeichern_dxf">
    <property name="icon">
-    <iconset resource="Ressource.qrc">
+    <iconset>
      <normaloff>:/filesave.png</normaloff>:/filesave.png</iconset>
    </property>
    <property name="text">
@@ -367,7 +370,7 @@
   </action>
   <action name="action_ffnen_xml">
    <property name="icon">
-    <iconset resource="Ressource.qrc">
+    <iconset>
      <normaloff>:/open.png</normaloff>:/open.png</iconset>
    </property>
    <property name="text">
@@ -396,7 +399,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="Ressource.qrc">
+    <iconset>
      <normaloff>:/statue.jpg</normaloff>:/statue.jpg</iconset>
    </property>
    <property name="text">
@@ -414,7 +417,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="Ressource.qrc">
+    <iconset>
      <normaloff>:/statue_specs.jpg</normaloff>:/statue_specs.jpg</iconset>
    </property>
    <property name="text">
@@ -432,7 +435,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="Ressource.qrc">
+    <iconset>
      <normaloff>:/anglesnap.PNG</normaloff>:/anglesnap.PNG</iconset>
    </property>
    <property name="text">
@@ -445,9 +448,21 @@
     <string>Ctrl+H</string>
    </property>
   </action>
+  <action name="actionSettings">
+   <property name="enabled">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Settings</string>
+   </property>
+   <property name="toolTip">
+    <string>Settings</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+E</string>
+   </property>
+  </action>
  </widget>
- <resources>
-  <include location="Ressource.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>
diff --git a/forms/widgetsettings.ui b/forms/widgetsettings.ui
new file mode 100644
index 0000000..1eabe5a
--- /dev/null
+++ b/forms/widgetsettings.ui
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>WidgetSettings</class>
+ <widget class="QTabWidget" name="WidgetSettings">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>330</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>TabWidget</string>
+  </property>
+  <widget class="QWidget" name="tab">
+   <attribute name="title">
+    <string>View Settings</string>
+   </attribute>
+   <widget class="QGroupBox" name="GridSettings">
+    <property name="geometry">
+     <rect>
+      <x>10</x>
+      <y>10</y>
+      <width>171</width>
+      <height>241</height>
+     </rect>
+    </property>
+    <property name="title">
+     <string>Grid Settings</string>
+    </property>
+    <widget class="QRadioButton" name="en_pointGrid">
+     <property name="geometry">
+      <rect>
+       <x>10</x>
+       <y>30</y>
+       <width>95</width>
+       <height>20</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>Point Grid</string>
+     </property>
+     <property name="checked">
+      <bool>false</bool>
+     </property>
+    </widget>
+    <widget class="QRadioButton" name="en_lineGrid">
+     <property name="geometry">
+      <rect>
+       <x>10</x>
+       <y>60</y>
+       <width>95</width>
+       <height>20</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>Line Grid</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+    </widget>
+    <widget class="Line" name="line">
+     <property name="geometry">
+      <rect>
+       <x>0</x>
+       <y>90</y>
+       <width>171</width>
+       <height>16</height>
+      </rect>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </widget>
+   <widget class="QPushButton" name="pushButtoncloseSettings">
+    <property name="geometry">
+     <rect>
+      <x>150</x>
+      <y>260</y>
+      <width>101</width>
+      <height>28</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>Apply and Close</string>
+    </property>
+   </widget>
+  </widget>
+  <widget class="QWidget" name="tab">
+   <attribute name="title">
+    <string>Tab 2</string>
+   </attribute>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/jpseditor.pro b/jpseditor.pro
index f2d6466..d5095fc 100644
--- a/jpseditor.pro
+++ b/jpseditor.pro
@@ -27,7 +27,8 @@ QMAKE_CXXFLAGS += -std=c++11
 FORMS += \
     forms/mainwindow.ui \
     forms/roomwidget.ui \
-    forms/widgetlandmark.ui
+    forms/widgetlandmark.ui \
+    forms/widgetsettings.ui
 
 HEADERS += \
     src/mainWindow.h \
@@ -53,7 +54,8 @@ HEADERS += \
     dxflib/src/dl_attributes.h \
     src/jpswaypoint.h \
     src/widgetlandmark.h \
-    src/graphicscene.h
+    src/graphicscene.h \
+    src/widgetsettings.h
 
 
 SOURCES += \
@@ -72,7 +74,8 @@ SOURCES += \
     dxflib/src/dl_dxf.cpp \
     src/jpswaypoint.cpp \
     src/widgetlandmark.cpp \
-    src/graphicscene.cpp
+    src/graphicscene.cpp \
+    src/widgetsettings.cpp
 
 
 RESOURCES +=  forms/Ressource.qrc
diff --git a/src/GraphicView.cpp b/src/GraphicView.cpp
index 32efea8..707ef19 100644
--- a/src/GraphicView.cpp
+++ b/src/GraphicView.cpp
@@ -46,7 +46,9 @@ jpsGraphicsView::jpsGraphicsView(QWidget* parent):QGraphicsView(parent)
     translation_x=0;
     translation_y=0;//this->height();
     anglesnap=false;
-    gl_scale_f=.01;
+    _scaleFactor=1.0;
+    _gridSize=1.0;
+    gl_scale_f=.01*_scaleFactor;
     //scale(10,10);
     catch_radius=10*gl_scale_f;
     catch_line_distance=10*gl_scale_f;
@@ -170,11 +172,8 @@ void jpsGraphicsView::mouseMoveEvent(QMouseEvent *mouseEvent)
 
     if (objectsnap)
     {
-
         catch_points();
 
-
-
         ///VLine
         if (point_tracked && (statWall==true || statDoor==true || statExit==true))
         {
@@ -355,6 +354,18 @@ void jpsGraphicsView::ClearWaypoints()
 
 }
 
+void jpsGraphicsView::ActivateLineGrid()
+{
+    Scene->SetGrid("Line");
+
+}
+
+void jpsGraphicsView::ActivatePointGrid()
+{
+    Scene->SetGrid("Point");
+
+}
+
 
 void jpsGraphicsView::wheelEvent(QWheelEvent *event)
 {
@@ -518,17 +529,20 @@ bool jpsGraphicsView::use_anglesnap(QGraphicsLineItem* currentline, int accuracy
 
 void jpsGraphicsView::use_gridmode()
 {
-    if ((std::fmod(std::fabs(translated_pos.x()),1.0)<=0.1 || std::fmod(std::fabs(translated_pos.x()),1.0)>=0.9) &&
-         (std::fmod(std::fabs(translated_pos.y()),1.0)<=0.1 || std::fmod(std::fabs(translated_pos.y()),1.0)>=0.9))
+    if ((std::fmod(std::fabs(translated_pos.x()),_gridSize)<=_gridSize*0.1 || std::fmod(std::fabs(translated_pos.x()),_gridSize)>=_gridSize*0.9) &&
+         (std::fmod(std::fabs(translated_pos.y()),_gridSize)<=_gridSize*0.1 || std::fmod(std::fabs(translated_pos.y()),_gridSize)>=_gridSize*0.9))
     {
-        if (translated_pos.x()<0)
-            translated_pos.setX(int(translated_pos.x()-0.5));
+        if (std::fmod(std::fabs(translated_pos.x()),_gridSize)<=_gridSize*0.1)
+            translated_pos.setX(translated_pos.x()-std::fmod(translated_pos.x(),_gridSize));
         else
-            translated_pos.setX(int(translated_pos.x()+0.5));
-        if (translated_pos.y()<0)
-            translated_pos.setY(int(translated_pos.y()-0.5));
+            translated_pos.setX(translated_pos.x()+(_gridSize-std::fmod(translated_pos.x(),_gridSize)));
+
+        if (std::fmod(std::fabs(translated_pos.y()),_gridSize)<=_gridSize*0.1)
+            translated_pos.setY(translated_pos.y()-std::fmod(translated_pos.y(),_gridSize));
         else
-            translated_pos.setY(int(translated_pos.y()+0.5));
+            translated_pos.setY(translated_pos.y()+(_gridSize-std::fmod(translated_pos.y(),_gridSize)));
+
+
         current_rect=Scene->addRect(translated_pos.x()+translation_x-10*gl_scale_f,translated_pos.y()+translation_y-10*gl_scale_f,20*gl_scale_f,20*gl_scale_f,QPen(Qt::red,0));
         point_tracked=true;
         _currentTrackedPoint= &translated_pos;
@@ -540,7 +554,7 @@ void jpsGraphicsView::use_gridmode()
 void jpsGraphicsView::catch_points()
 {
     ///Searching for startpoints of all lines near the current cursor position
-    for (signed int i=0; i<line_vector.size(); i++){
+    for (int i=0; i<line_vector.size(); ++i){
 
         // range chosen: 10 (-5:5) (has to be changed soon)
         if (line_vector[i]->get_line()->line().x1()>=(translated_pos.x()-catch_radius) && line_vector[i]->get_line()->line().x1()<=(translated_pos.x()+catch_radius) && line_vector[i]->get_line()->line().y1()>=(translated_pos.y()-catch_radius) && line_vector[i]->get_line()->line().y1()<=(translated_pos.y()+catch_radius)){
@@ -979,20 +993,24 @@ void jpsGraphicsView::zoom(int delta)
         // {
         //    caption_list[i]->setTransform(QTransform::fromScale(1/gl_scale_f,1/gl_scale_f));
         //}
+        _scaleFactor*=1/1.15;
         gl_scale_f*=1/1.15;
         scale(scaleFactor, scaleFactor);
         catch_radius=10*gl_scale_f;
         catch_line_distance=10*gl_scale_f;
+        Scene->ChangeGridSize(this->CalcGridSize());
         //create_grid();
     }
     else
     {
         // Zooming out
 
+        _scaleFactor*=1.15;
         gl_scale_f*=1.15;
         scale(1.0 / scaleFactor, 1.0 / scaleFactor);
         catch_radius=10*gl_scale_f;
         catch_line_distance=10*gl_scale_f;
+        Scene->ChangeGridSize(this->CalcGridSize());
         //create_grid();
     }
 
@@ -1138,6 +1156,32 @@ void jpsGraphicsView::AutoZoom()
 
 }
 
+qreal jpsGraphicsView::CalcGridSize()
+{
+    int cFactor;
+    if (_scaleFactor<1.0)
+    {
+        cFactor = std::round(1/_scaleFactor);//std::round(_scaleFactor);
+    }
+    else
+        cFactor = std::round(_scaleFactor);
+
+    int n=0;
+    while (cFactor>std::pow(2,n))
+    {
+        n++;
+    }
+    qreal gridSize;
+    if (_scaleFactor<1.0)
+        gridSize=1/std::pow(2,n);
+    else
+        gridSize=std::pow(2,n);
+
+    _gridSize=gridSize;
+    return gridSize;
+
+}
+
 void jpsGraphicsView::StatAssoDef()
 {
    _assoDef=!_assoDef;
diff --git a/src/GraphicView.h b/src/GraphicView.h
index d1729f5..a704b1f 100644
--- a/src/GraphicView.h
+++ b/src/GraphicView.h
@@ -69,10 +69,12 @@ class jpsGraphicsView: public QGraphicsView {
     void disable_drawing();
     bool use_anglesnap(QGraphicsLineItem *currentline, int accuracy);
     void use_gridmode();
+
     ///View
     void zoom(int delta);
     void translations(QPointF old_pos);
     void AutoZoom();
+    qreal CalcGridSize();
 
     ///Pos
     QPointF return_Pos();
@@ -118,9 +120,12 @@ class jpsGraphicsView: public QGraphicsView {
 
 
 public slots:
-    ///Waypoints
+    //Waypoints
     void StatAssoDef();
     void ClearWaypoints();
+    //GridSettings
+    void ActivateLineGrid();
+    void ActivatePointGrid();
 
 
 protected:
@@ -154,7 +159,9 @@ public slots:
     bool statExit;
     bool statLandmark;
     qreal catch_radius;
+    qreal _scaleFactor;
     qreal gl_scale_f;
+    qreal _gridSize;
     bool point_tracked;
     QGraphicsItem* current_rect;
     QGraphicsRectItem* currentSelectRect;
diff --git a/src/graphicscene.cpp b/src/graphicscene.cpp
index f88f5be..941c685 100644
--- a/src/graphicscene.cpp
+++ b/src/graphicscene.cpp
@@ -7,6 +7,8 @@ GraphicScene::GraphicScene(QObject *parent) : QGraphicsScene(parent)
     _translationX=0.0;
     _translationY=0.0;
     _gridmode=false;
+    _statgrid="Line";
+    _gridSize=1.0;
 }
 
 GraphicScene::~GraphicScene()
@@ -30,26 +32,63 @@ void GraphicScene::ChangeTranslation(qreal x, qreal y)
     _translationY=y;
 }
 
+void GraphicScene::SetGrid(QString grid)
+{
+    _statgrid=grid;
+}
+
+void GraphicScene::ChangeGridSize(const qreal &gridSize)
+{
+    _gridSize=gridSize;
+}
+
 void GraphicScene::drawBackground(QPainter *painter, const QRectF &rect)
 {
     if (_gridmode)
     {
-        const int gridSize = 1;
+        if (_statgrid=="Line")
+            DrawLineGrid(painter,rect);
+        else
+            DrawPointGrid(painter,rect);
+    }   
+}
 
-        qreal left = int(rect.left()-_translationX) - (int(rect.left()-_translationX) % gridSize);
-        qreal top = int(rect.top()-_translationY) - (int(rect.top()-_translationY) % gridSize);
+void GraphicScene::DrawLineGrid(QPainter *painter, const QRectF &rect)
+{
+    //gridSize=1.0;
+    qreal left = int(rect.left()-_translationX) - std::fmod(int(rect.left()-_translationX), _gridSize);
+    qreal top = int(rect.top()-_translationY)- std::fmod(int(rect.top()-_translationY) , _gridSize);
 
-        QVarLengthArray<QLineF, 100> lines;
+    QVarLengthArray<QLineF, 100> lines;
 
-        for (qreal x = left; x < rect.right()-_translationX; x += gridSize)
-            lines.append(QLineF(x+_translationX, rect.top(), x+_translationX, rect.bottom()));
-        for (qreal y = top; y < rect.bottom()-_translationY; y += gridSize)
-            lines.append(QLineF(rect.left(), y+_translationY, rect.right(), y+_translationY));
+    for (qreal x = left; x < rect.right()-_translationX; x += _gridSize)
+        lines.append(QLineF(x+_translationX, rect.top(), x+_translationX, rect.bottom()));
+    for (qreal y = top; y < rect.bottom()-_translationY; y += _gridSize)
+        lines.append(QLineF(rect.left(), y+_translationY, rect.right(), y+_translationY));
+
+    //qDebug() << lines.size();
+    painter->setPen(QPen(Qt::gray,0));
+    painter->drawLines(lines.data(), lines.size());
+}
+
+void GraphicScene::DrawPointGrid(QPainter *painter, const QRectF &rect)
+{
 
-        //qDebug() << lines.size();
-        painter->setPen(QPen(Qt::gray,0));
-        painter->drawLines(lines.data(), lines.size());
-    }
 
+    qreal left = int(rect.left()-_translationX) - std::fmod(int(rect.left()-_translationX), _gridSize);
+    qreal top = int(rect.top()-_translationY)- std::fmod(int(rect.top()-_translationY) , _gridSize);
+
+    QVarLengthArray<QPointF, 100> points;
+
+    for (qreal x = left; x < rect.right()-_translationX; x += _gridSize)
+    {
+        for (qreal y = top; y < rect.bottom()-_translationY; y += _gridSize)
+        {
+            points.append(QPointF(x+_translationX, y+_translationY));
+        }
+    }
+    //qDebug() << lines.size();
+    painter->setPen(QPen(Qt::black,0));
+    painter->drawPoints(points.data(), points.size());
 }
 
diff --git a/src/graphicscene.h b/src/graphicscene.h
index 3d2cac4..91da5da 100644
--- a/src/graphicscene.h
+++ b/src/graphicscene.h
@@ -18,13 +18,19 @@ class GraphicScene : public QGraphicsScene
     void ChangeGridmode(const bool& stat);
     bool GetGridmode() const;
     void ChangeTranslation(qreal x, qreal y);
+    void SetGrid(QString grid);
+    void ChangeGridSize(const qreal& factor);
 
 protected:
     void drawBackground(QPainter *painter, const QRectF &rect) override;
+    void DrawLineGrid(QPainter *painter, const QRectF &rect);
+    void DrawPointGrid(QPainter *painter, const QRectF &rect);
 private:
     bool _gridmode;
     qreal _translationX;
     qreal _translationY;
+    QString _statgrid;
+    qreal _gridSize;
 
 };
 
diff --git a/src/mainWindow.cpp b/src/mainWindow.cpp
index ac24fd3..eb2a5c4 100644
--- a/src/mainWindow.cpp
+++ b/src/mainWindow.cpp
@@ -47,10 +47,12 @@ MWindow :: MWindow() {
     mview = new jpsGraphicsView(this);
     dmanager = new jpsDatamanager(this,mview);
 
-    ///Roomwidget
+    //Roomwidget
     rwidget=nullptr;
-    ///Landmarkwidget
+    //Landmarkwidget
     lwidget=nullptr;
+    //WidgetSettings
+    _settings=nullptr;
 
     length_edit = new QLineEdit();
     length_edit->setMaximumWidth(55);
@@ -63,7 +65,7 @@ MWindow :: MWindow() {
     infoLabel= new QLabel();
     infoLabel->setMinimumWidth(135);
 
-    ///filename of saved project
+    //filename of saved project
     _filename="";
 
 
@@ -75,23 +77,24 @@ MWindow :: MWindow() {
     statusBar()->addPermanentWidget(length_edit);
     statusBar()->addPermanentWidget(label2);
 
-    ///Timer needed for autosave function
-    /// timer will trigger autosave every 5th minute
+    //Timer needed for autosave function
+    // timer will trigger autosave every 5th minute
     timer = new QTimer(this);
     timer->setInterval(300000);
     timer->start();
 
 
-    ///Signals and Slots
-    /// Tab File
+    //Signals and Slots
+    // Tab File
     connect(actionBeenden, SIGNAL(triggered(bool)),qApp,SLOT(quit()));
     connect(action_ffnen,SIGNAL(triggered(bool)),this,SLOT(openFile()));
     connect(action_ffnen_xml,SIGNAL(triggered(bool)),this,SLOT(openFileXML()));
     connect(actionSpeichern,SIGNAL(triggered(bool)),this,SLOT(saveFile()));
     connect(actionSpeichern_dxf,SIGNAL(triggered(bool)),this,SLOT(saveAsDXF()));
-    /// Tab Help
+    connect(actionSettings,SIGNAL(triggered(bool)),this,SLOT(Settings()));
+    // Tab Help
     connect(action_ber,SIGNAL(triggered(bool)),this,SLOT(info()));
-    /// Tab Tools
+    // Tab Tools
     connect(actionanglesnap,SIGNAL(triggered(bool)),this,SLOT(anglesnap()));
     connect(actiongridmode,SIGNAL(triggered(bool)),this,SLOT(gridmode()));
     connect(actionWall,SIGNAL(triggered(bool)),this,SLOT(en_disableWall()));
@@ -105,11 +108,11 @@ MWindow :: MWindow() {
     connect(actionWall,SIGNAL(triggered(bool)),this,SLOT(dis_selectMode()));
     connect(actionDoor,SIGNAL(triggered(bool)),this,SLOT(dis_selectMode()));
     connect(actionExit,SIGNAL(triggered(bool)),this,SLOT(dis_selectMode()));
-    /// Tab View
+    // Tab View
     connect(actionRotate_90_deg_clockwise,SIGNAL(triggered(bool)),this,SLOT(rotate()));
-    /// Length edit
+    // Length edit
     connect(length_edit,SIGNAL(returnPressed()),this,SLOT(send_length()));
-    /// mview
+    // mview
     connect(mview,SIGNAL(no_drawing()),this,SLOT(en_selectMode()));
     connect(mview,SIGNAL(remove_marked_lines()),this,SLOT(lines_deleted()));
     connect(mview,SIGNAL(remove_all()),this,SLOT(remove_all_lines()));
@@ -117,14 +120,19 @@ MWindow :: MWindow() {
     connect(mview,SIGNAL(mouse_moved()),this,SLOT(show_coords()));
     connect(mview,SIGNAL(landmark_added()),this,SLOT(add_landmark()));
     //connect(mview,SIGNAL(DoubleClick()),this,SLOT(en_selectMode()));
-    ///Autosave
+    // Autosave
     connect(timer, SIGNAL(timeout()), this, SLOT(AutoSave()));
     ///Landmarks
     connect(actionLandmark,SIGNAL(triggered(bool)),this,SLOT(en_disableLandmark()));
     connect(actionLandmark,SIGNAL(triggered(bool)),this,SLOT(dis_selectMode()));
-    ///Landmark specifications
+    // Landmark specifications
     connect(actionLandmarkWidget,SIGNAL(triggered(bool)),this,SLOT(define_landmark()));
 
+
+
+
+
+
 }
 
 MWindow::~MWindow()
@@ -169,6 +177,24 @@ void MWindow::add_landmark()
     dmanager->new_landmark(landmark);
 }
 
+void MWindow::Settings()
+{
+    if (_settings==nullptr)
+    {
+        _settings = new WidgetSettings(this,mview);
+        _settings->setAttribute(Qt::WA_DeleteOnClose);
+        _settings->setGeometry(QRect(QPoint(5,75), _settings->size()));
+        _settings->show();
+    }
+
+    else
+    {
+        _settings->close();
+        _settings=nullptr;
+    }
+
+}
+
 void MWindow::openFile(){
 
     QString fileName=QFileDialog::getOpenFileName(this,tr("Open DXF"),"",tr("DXF-Drawings (*.dxf)"));
@@ -351,26 +377,29 @@ void MWindow::send_length()
 
 void MWindow::define_room()
 {
-    if (rwidget==0L)
+    if (rwidget==nullptr)
     {
         rwidget = new roomWidget(this,this->dmanager,this->mview);
         rwidget->setGeometry(QRect(QPoint(5,75), rwidget->size()));
+        rwidget->setAttribute(Qt::WA_DeleteOnClose);
         rwidget->show();
+
     }
     else
     {
         rwidget->close();
-        rwidget=0L;
+        rwidget=nullptr;
         actionRoom->setChecked(false);
     }
 }
 
 void MWindow::define_landmark()
 {
-    if (lwidget==0L)
+    if (lwidget==nullptr)
     {
         lwidget = new widgetLandmark(this,this->dmanager,this->mview);
         lwidget->setGeometry(QRect(QPoint(5,75), lwidget->size()));
+        lwidget->setAttribute(Qt::WA_DeleteOnClose);
         lwidget->show();
     }
     else
diff --git a/src/mainWindow.h b/src/mainWindow.h
index 3e0629d..3ae5f04 100644
--- a/src/mainWindow.h
+++ b/src/mainWindow.h
@@ -37,6 +37,7 @@
 #include "ui_mainwindow.h"
 #include "roomwidget.h"
 #include "widgetlandmark.h"
+#include "widgetsettings.h"
 #include "GraphicView.h"
 #include "datamanager.h"
 #include "rooms.h"
@@ -53,6 +54,7 @@ class MWindow : public QMainWindow, private Ui::MainWindow {
 private:
     roomWidget* rwidget;
     widgetLandmark* lwidget;
+    WidgetSettings* _settings;
     jpsDatamanager* dmanager;
     jpsGraphicsView* mview;
     //QVBoxLayout* VBox;
@@ -91,6 +93,7 @@ protected slots:
     void rotate();
     void AutoSave();
     void add_landmark();
+    void Settings();
 
 
 };
diff --git a/src/widgetsettings.cpp b/src/widgetsettings.cpp
new file mode 100644
index 0000000..7c556e9
--- /dev/null
+++ b/src/widgetsettings.cpp
@@ -0,0 +1,31 @@
+#include "widgetsettings.h"
+#include "ui_widgetsettings.h"
+
+WidgetSettings::WidgetSettings(QWidget *parent, jpsGraphicsView *view) :
+    QTabWidget(parent),
+    ui(new Ui::WidgetSettings)
+{
+    ui->setupUi(this);
+    _view=view;
+    connect(ui->pushButtoncloseSettings,SIGNAL(clicked(bool)),QTabWidget::parent(),SLOT(Settings()));
+    connect(ui->en_lineGrid,SIGNAL(toggled(bool)),this,SLOT(changeGridRadio(bool)));
+    connect(ui->en_pointGrid,SIGNAL(toggled(bool)),this,SLOT(changeGridRadio(bool)));
+
+}
+
+WidgetSettings::~WidgetSettings()
+{
+    delete ui;
+}
+
+void WidgetSettings::changeGridRadio(bool status)
+{
+    if (status)
+    {
+        if (ui->en_lineGrid->isChecked())
+            _view->ActivateLineGrid();
+
+        else
+            _view->ActivatePointGrid();
+    }
+}
diff --git a/src/widgetsettings.h b/src/widgetsettings.h
new file mode 100644
index 0000000..604d8cf
--- /dev/null
+++ b/src/widgetsettings.h
@@ -0,0 +1,29 @@
+#ifndef WIDGETSETTINGS_H
+#define WIDGETSETTINGS_H
+
+#include <QTabWidget>
+#include "GraphicView.h"
+
+namespace Ui {
+class WidgetSettings;
+}
+
+class WidgetSettings : public QTabWidget
+{
+    Q_OBJECT
+
+public:
+    explicit WidgetSettings(QWidget *parent = nullptr, jpsGraphicsView* view = nullptr);
+    ~WidgetSettings();
+
+public slots:
+    void changeGridRadio(bool status);
+
+private:
+    Ui::WidgetSettings *ui;
+    jpsGraphicsView* _view;
+
+
+};
+
+#endif // WIDGETSETTINGS_H

From d55eba1075c4d83653b8e9ac7e40a369da03f852 Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Tue, 4 Aug 2015 15:16:53 +0200
Subject: [PATCH 14/53] debugging

---
 src/GraphicView.cpp | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/GraphicView.cpp b/src/GraphicView.cpp
index 707ef19..0f1442e 100644
--- a/src/GraphicView.cpp
+++ b/src/GraphicView.cpp
@@ -532,20 +532,41 @@ void jpsGraphicsView::use_gridmode()
     if ((std::fmod(std::fabs(translated_pos.x()),_gridSize)<=_gridSize*0.1 || std::fmod(std::fabs(translated_pos.x()),_gridSize)>=_gridSize*0.9) &&
          (std::fmod(std::fabs(translated_pos.y()),_gridSize)<=_gridSize*0.1 || std::fmod(std::fabs(translated_pos.y()),_gridSize)>=_gridSize*0.9))
     {
-        if (std::fmod(std::fabs(translated_pos.x()),_gridSize)<=_gridSize*0.1)
+        bool posx_positiv=true;
+        bool posy_positiv=true;
+        if (translated_pos.x()<0)
+        {
+            translated_pos.setX(std::fabs(translated_pos.x()));
+            posx_positiv=false;
+        }
+
+        if (translated_pos.y()<0)
+        {
+            translated_pos.setY(std::fabs(translated_pos.y()));
+            posy_positiv=false;
+        }
+
+        if (std::fmod(translated_pos.x(),_gridSize)<=_gridSize*0.1)
             translated_pos.setX(translated_pos.x()-std::fmod(translated_pos.x(),_gridSize));
         else
             translated_pos.setX(translated_pos.x()+(_gridSize-std::fmod(translated_pos.x(),_gridSize)));
 
-        if (std::fmod(std::fabs(translated_pos.y()),_gridSize)<=_gridSize*0.1)
+        if (std::fmod(translated_pos.y(),_gridSize)<=_gridSize*0.1)
             translated_pos.setY(translated_pos.y()-std::fmod(translated_pos.y(),_gridSize));
         else
             translated_pos.setY(translated_pos.y()+(_gridSize-std::fmod(translated_pos.y(),_gridSize)));
 
+        if (!posx_positiv)
+            translated_pos.setX(translated_pos.x()*(-1));
+
+        if (!posy_positiv)
+            translated_pos.setY(translated_pos.y()*(-1));
 
         current_rect=Scene->addRect(translated_pos.x()+translation_x-10*gl_scale_f,translated_pos.y()+translation_y-10*gl_scale_f,20*gl_scale_f,20*gl_scale_f,QPen(Qt::red,0));
         point_tracked=true;
         _currentTrackedPoint= &translated_pos;
+
+
     }
     else
         point_tracked=false;

From dea7d97e9be23b15c0add1a6140a0f2ab178194c Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Wed, 5 Aug 2015 10:10:27 +0200
Subject: [PATCH 15/53] add include cmath in graphicscene

---
 src/graphicscene.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/graphicscene.cpp b/src/graphicscene.cpp
index 941c685..4bf1630 100644
--- a/src/graphicscene.cpp
+++ b/src/graphicscene.cpp
@@ -1,5 +1,6 @@
 #include "graphicscene.h"
 #include <QVarLengthArray>
+#include <cmath>
 
 
 GraphicScene::GraphicScene(QObject *parent) : QGraphicsScene(parent)

From ee1dbddbfb6f70b4c1d82d27e64919a0283160c3 Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Fri, 28 Aug 2015 13:46:18 +0200
Subject: [PATCH 16/53] stuff for visualisation of cognitive map

---
 forms/mainwindow.ui    |  68 ++++++++++----
 jpseditor.pro          |   6 +-
 src/GraphicView.cpp    |  66 +++++++++++--
 src/GraphicView.h      |  38 ++++----
 src/datamanager.cpp    | 205 +++++++++++++++++++++++++++++++++++++++++
 src/datamanager.h      |  43 ++++++---
 src/jpslandmark.h      |   6 +-
 src/jpswaypoint.cpp    | 149 ++++++++++++++++++++++++++++--
 src/jpswaypoint.h      |  52 +++++++++--
 src/jpsyahpointer.cpp  |  77 ++++++++++++++++
 src/jpsyahpointer.h    |  39 ++++++++
 src/mainWindow.cpp     |  67 ++++++++++++--
 src/mainWindow.h       |  33 ++++++-
 src/widgetlandmark.cpp |   5 +-
 src/widgetlandmark.h   |   1 +
 15 files changed, 766 insertions(+), 89 deletions(-)
 create mode 100644 src/jpsyahpointer.cpp
 create mode 100644 src/jpsyahpointer.h

diff --git a/forms/mainwindow.ui b/forms/mainwindow.ui
index 41cc955..a73684a 100644
--- a/forms/mainwindow.ui
+++ b/forms/mainwindow.ui
@@ -14,7 +14,7 @@
    <string>JuPedSim</string>
   </property>
   <property name="windowIcon">
-   <iconset>
+   <iconset resource="Ressource.qrc">
     <normaloff>:/jupedsim.png</normaloff>:/jupedsim.png</iconset>
   </property>
   <widget class="QWidget" name="centralwidget"/>
@@ -36,6 +36,7 @@
     <addaction name="actionSpeichern"/>
     <addaction name="actionSpeichern_dxf"/>
     <addaction name="separator"/>
+    <addaction name="separator"/>
     <addaction name="actionSettings"/>
     <addaction name="separator"/>
     <addaction name="actionBeenden"/>
@@ -69,10 +70,18 @@
     </property>
     <addaction name="actionRotate_90_deg_clockwise"/>
    </widget>
+   <widget class="QMenu" name="menuCognitive_Map">
+    <property name="title">
+     <string>Cognitive Map</string>
+    </property>
+    <addaction name="action_ffnen_CogMap"/>
+    <addaction name="actionRun_visualisation"/>
+   </widget>
    <addaction name="menuDatei"/>
    <addaction name="menuTools"/>
    <addaction name="menuView"/>
    <addaction name="menuHilfe"/>
+   <addaction name="menuCognitive_Map"/>
   </widget>
   <widget class="QStatusBar" name="statusbar"/>
   <widget class="QToolBar" name="toolBar">
@@ -102,12 +111,12 @@
    <addaction name="separator"/>
    <addaction name="actionRoom"/>
    <addaction name="separator"/>
-   <addaction name="actionLandmark"/>
    <addaction name="actionLandmarkWidget"/>
+   <addaction name="actionLandmark"/>
   </widget>
   <action name="action_ffnen">
    <property name="icon">
-    <iconset>
+    <iconset resource="Ressource.qrc">
      <normaloff>:/open.png</normaloff>:/open.png</iconset>
    </property>
    <property name="text">
@@ -122,7 +131,7 @@
   </action>
   <action name="actionSpeichern">
    <property name="icon">
-    <iconset>
+    <iconset resource="Ressource.qrc">
      <normaloff>:/filesave.png</normaloff>:/filesave.png</iconset>
    </property>
    <property name="text">
@@ -137,7 +146,7 @@
   </action>
   <action name="actionBeenden">
    <property name="icon">
-    <iconset>
+    <iconset resource="Ressource.qrc">
      <normaloff>:/man-gimp1.png</normaloff>:/man-gimp1.png</iconset>
    </property>
    <property name="text">
@@ -169,7 +178,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset>
+    <iconset resource="Ressource.qrc">
      <normaloff>:/Grid.png</normaloff>:/Grid.png</iconset>
    </property>
    <property name="text">
@@ -190,7 +199,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset>
+    <iconset resource="Ressource.qrc">
      <normaloff>:/Wall.png</normaloff>:/Wall.png</iconset>
    </property>
    <property name="text">
@@ -211,7 +220,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset>
+    <iconset resource="Ressource.qrc">
      <normaloff>:/snap.png</normaloff>:/snap.png</iconset>
    </property>
    <property name="text">
@@ -226,7 +235,7 @@
   </action>
   <action name="actionDelete_lines">
    <property name="icon">
-    <iconset>
+    <iconset resource="Ressource.qrc">
      <normaloff>:/DeleteAll.png</normaloff>:/DeleteAll.png</iconset>
    </property>
    <property name="text">
@@ -241,7 +250,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset>
+    <iconset resource="Ressource.qrc">
      <normaloff>:/Delete.png</normaloff>:/Delete.png</iconset>
    </property>
    <property name="text">
@@ -262,7 +271,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset>
+    <iconset resource="Ressource.qrc">
      <normaloff>:/Door.png</normaloff>:/Door.png</iconset>
    </property>
    <property name="text">
@@ -286,7 +295,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset>
+    <iconset resource="Ressource.qrc">
      <normaloff>:/Exit.png</normaloff>:/Exit.png</iconset>
    </property>
    <property name="text">
@@ -310,7 +319,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset>
+    <iconset resource="Ressource.qrc">
      <normaloff>:/Room.png</normaloff>:/Room.png</iconset>
    </property>
    <property name="text">
@@ -337,7 +346,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset>
+    <iconset resource="Ressource.qrc">
      <normaloff>:/basicCursor.png</normaloff>:/basicCursor.png</iconset>
    </property>
    <property name="text">
@@ -355,7 +364,7 @@
   </action>
   <action name="actionSpeichern_dxf">
    <property name="icon">
-    <iconset>
+    <iconset resource="Ressource.qrc">
      <normaloff>:/filesave.png</normaloff>:/filesave.png</iconset>
    </property>
    <property name="text">
@@ -370,7 +379,7 @@
   </action>
   <action name="action_ffnen_xml">
    <property name="icon">
-    <iconset>
+    <iconset resource="Ressource.qrc">
      <normaloff>:/open.png</normaloff>:/open.png</iconset>
    </property>
    <property name="text">
@@ -399,7 +408,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset>
+    <iconset resource="Ressource.qrc">
      <normaloff>:/statue.jpg</normaloff>:/statue.jpg</iconset>
    </property>
    <property name="text">
@@ -417,7 +426,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset>
+    <iconset resource="Ressource.qrc">
      <normaloff>:/statue_specs.jpg</normaloff>:/statue_specs.jpg</iconset>
    </property>
    <property name="text">
@@ -435,7 +444,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset>
+    <iconset resource="Ressource.qrc">
      <normaloff>:/anglesnap.PNG</normaloff>:/anglesnap.PNG</iconset>
    </property>
    <property name="text">
@@ -462,7 +471,26 @@
     <string>Ctrl+E</string>
    </property>
   </action>
+  <action name="action_ffnen_CogMap">
+   <property name="icon">
+    <iconset resource="Ressource.qrc">
+     <normaloff>:/open.png</normaloff>:/open.png</iconset>
+   </property>
+   <property name="text">
+    <string>Load CognitiveMap</string>
+   </property>
+   <property name="toolTip">
+    <string>Load CognitiveMap</string>
+   </property>
+  </action>
+  <action name="actionRun_visualisation">
+   <property name="text">
+    <string>Run visualisation</string>
+   </property>
+  </action>
  </widget>
- <resources/>
+ <resources>
+  <include location="Ressource.qrc"/>
+ </resources>
  <connections/>
 </ui>
diff --git a/jpseditor.pro b/jpseditor.pro
index d5095fc..ae202ad 100644
--- a/jpseditor.pro
+++ b/jpseditor.pro
@@ -55,7 +55,8 @@ HEADERS += \
     src/jpswaypoint.h \
     src/widgetlandmark.h \
     src/graphicscene.h \
-    src/widgetsettings.h
+    src/widgetsettings.h \
+    src/jpsyahpointer.h
 
 
 SOURCES += \
@@ -75,7 +76,8 @@ SOURCES += \
     src/jpswaypoint.cpp \
     src/widgetlandmark.cpp \
     src/graphicscene.cpp \
-    src/widgetsettings.cpp
+    src/widgetsettings.cpp \
+    src/jpsyahpointer.cpp
 
 
 RESOURCES +=  forms/Ressource.qrc
diff --git a/src/GraphicView.cpp b/src/GraphicView.cpp
index 0f1442e..0de9147 100644
--- a/src/GraphicView.cpp
+++ b/src/GraphicView.cpp
@@ -76,8 +76,7 @@ jpsGraphicsView::jpsGraphicsView(QWidget* parent):QGraphicsView(parent)
 
     lines_collided=false;
     _assoDef=false;
-    //gl_min_x=1e6;
-    //gl_min_y=1e6;
+
 
     //m_graphView->setFixedSize(1600, 900);
     //m_graphView->setScene(m_graphScen);
@@ -334,24 +333,62 @@ void jpsGraphicsView::ShowWaypoints(QList<jpsWaypoint *> waypoints)
     {
         QGraphicsEllipseItem* ellipse = Scene->addEllipse(waypoint->GetRect(),QPen(Qt::blue,0));
         ellipse->setTransform(QTransform::fromTranslate(translation_x,translation_y), true);
+        QString string = waypoint->GetCaption()+ "\n" + waypoint->GetText();
+        QGraphicsTextItem* text = Scene->addText(string);
+        text->setPos(waypoint->GetPos().x()+translation_x,waypoint->GetPos().y()+translation_y);
+        //text->setScale(gl_scale_f);
+        text->setData(0,gl_scale_f);
+        text->setTransform(QTransform::fromScale(gl_scale_f,-gl_scale_f),true);
         _waypoints.push_back(ellipse);
+        _waypointLabels.push_back(text);
+    }
+
+
+}
+
+void jpsGraphicsView::ShowYAHPointer(const QPointF &pos, const qreal &dir)
+{
+    for (QGraphicsLineItem* lineItem:_yahPointer)
+    {
+        delete lineItem;
+    }
+    _yahPointer.clear();
+
+    _yahPointer.push_back(Scene->addLine(pos.x(),pos.y(),pos.x()+0.5*std::cos(dir),pos.y()+0.5*std::sin(dir),QPen(Qt::blue,0)));
+    _yahPointer.push_back(Scene->addLine(pos.x()+0.5*std::cos(dir),pos.y()+0.5*std::sin(dir),pos.x()+0.2*std::cos(dir+M_PI/4.0),pos.y()+0.2*std::sin(dir+M_PI/4.0),QPen(Qt::blue,0)));
+    _yahPointer.push_back(Scene->addLine(pos.x()+0.5*std::cos(dir),pos.y()+0.5*std::sin(dir),pos.x()+0.2*std::cos(dir-M_PI/4.0),pos.y()+0.2*std::sin(dir-M_PI/4.0),QPen(Qt::blue,0)));
+
+    for (QGraphicsLineItem* lineItem:_yahPointer)
+    {
+        lineItem->setTransform(QTransform::fromTranslate(translation_x,translation_y), true);
     }
 
 
 }
 
+void jpsGraphicsView::ClearWaypointLabels()
+{
+    for (QGraphicsTextItem* label:_waypointLabels)
+    {
+        delete label;
+    }
+    _waypointLabels.clear();
+}
+
 
 
 void jpsGraphicsView::ClearWaypoints()
 {
 
-    ///Waypoints
+    //Waypoints
     for (QGraphicsEllipseItem* old_waypoint:_waypoints)
     {
         delete old_waypoint;
     }
     _waypoints.clear();
 
+    ClearWaypointLabels();
+
 }
 
 void jpsGraphicsView::ActivateLineGrid()
@@ -381,7 +418,7 @@ void jpsGraphicsView::mouseReleaseEvent(QMouseEvent *event)
 
     if (event->button() == Qt::LeftButton)
     {
-        /// Select lines that are located within the rectangle
+        // Select lines that are located within the rectangle
         if (!(statWall==true || statDoor==true || statExit==true || statLandmark==true))
         {
             leftbutton_hold=false;
@@ -390,17 +427,17 @@ void jpsGraphicsView::mouseReleaseEvent(QMouseEvent *event)
             {
                 if (_assoDef)
                 {
-                    ///Waypoint definition
+                    //Waypoint definition
                     emit AssoDefCompleted();
                 }
                 else
                 {
-                    /// Select lines by creating a rect with the cursor
+                    // Select lines by creating a rect with the cursor
                     catch_lines();
 
-                    /// unmark Landmark is possible
+                    // unmark Landmark is possible
                     unmarkLandmark();
-                    /// Look for landmarks with position in the currentSelectRect
+                    // Look for landmarks with position in the currentSelectRect
                     catch_landmark();
                 }
                 delete currentSelectRect;
@@ -408,7 +445,7 @@ void jpsGraphicsView::mouseReleaseEvent(QMouseEvent *event)
 
             }
 
-            ///unmark selected line(s)
+            //unmark selected line(s)
             if (line_tracked==-1)
             {
                 unmark_all_lines();
@@ -1103,6 +1140,17 @@ void jpsGraphicsView::translations(QPointF old_pos)
     {
         ellipse->setTransform(QTransform::fromTranslate(pos.x()-old_pos.x(),pos.y()-old_pos.y()), true);
     }
+    for (QGraphicsLineItem* lineItem:_yahPointer)
+    {
+        lineItem->setTransform(QTransform::fromTranslate(pos.x()-old_pos.x(),pos.y()-old_pos.y()), true);
+    }
+    for (QGraphicsTextItem* item:_waypointLabels)
+    {
+        qreal scalef = item->data(0).toReal();
+        item->setTransform(QTransform::fromScale(1.0/scalef,1.0/scalef),true); // without this line translations won't work
+        item->setTransform(QTransform::fromTranslate(pos.x()-old_pos.x(),-pos.y()+old_pos.y()), true);
+        item->setTransform(QTransform::fromScale(scalef,scalef),true);
+    }
 
 }
 
diff --git a/src/GraphicView.h b/src/GraphicView.h
index a704b1f..441748a 100644
--- a/src/GraphicView.h
+++ b/src/GraphicView.h
@@ -42,13 +42,13 @@ class jpsGraphicsView: public QGraphicsView {
     Q_OBJECT
 
 public:
-    ///Constructor
+    //Constructor
     jpsGraphicsView(QWidget* parent = nullptr);
 
-    ///Destructor
+    //Destructor
     ~jpsGraphicsView();
 
-    ///Change modes
+    //Change modes
     void change_stat_anglesnap();
     bool get_stat_anglesnap();
     void change_objectsnap();
@@ -63,37 +63,37 @@ class jpsGraphicsView: public QGraphicsView {
     bool statusLandmark();
     void en_disableLandmark();
 
-    /// global functions
+    // global functions
     qreal get_scale_f();
     void take_l_from_lineEdit(const qreal &length);
     void disable_drawing();
     bool use_anglesnap(QGraphicsLineItem *currentline, int accuracy);
     void use_gridmode();
 
-    ///View
+    //View
     void zoom(int delta);
     void translations(QPointF old_pos);
     void AutoZoom();
     qreal CalcGridSize();
 
-    ///Pos
+    //Pos
     QPointF return_Pos();
 
-    ///Catch lines, points and intersections
+    //Catch lines, points and intersections
     void catch_points();
     void locate_intersection(jpsLineItem* item1, jpsLineItem* item2);
     void line_collision();
     void catch_lines();
 
-    ///Delete all
+    //Delete all
     void delete_all(bool final=false);
 
-    ///Line operations
+    //Line operations
     void drawLine();
     qreal calc_d_point(const QLineF &line, const qreal &x, const qreal &y);
     void delete_marked_lines();
     void RemoveIntersections(jpsLineItem* lineItem);
-    /// lines read from dxf-file
+    // lines read from dxf-file
     jpsLineItem *addLineItem(const qreal &x1, const qreal &y1, const qreal &x2, const qreal &y2, const QString &type="");
     QList<jpsLineItem *> get_markedLines();
     QList<jpsLineItem *> get_line_vector();
@@ -102,7 +102,7 @@ class jpsGraphicsView: public QGraphicsView {
     void SetVLine();
     void EditLine(QPointF* point);
 
-    /// Landmark
+    // Landmark
     void delete_landmark();
     void catch_landmark();
     void select_landmark(jpsLandmark *landmark);
@@ -110,11 +110,13 @@ class jpsGraphicsView: public QGraphicsView {
     void unmarkLandmark();
     QList<jpsLandmark *> get_landmarks();
 
-    ///Waypoints
+    //Waypoints and YAHPointer
     QGraphicsRectItem* GetCurrentSelectRect();
     void ShowWaypoints(QList<jpsWaypoint* > waypoints);
+    void ShowYAHPointer(const QPointF& pos, const qreal& dir);
+    void ClearWaypointLabels();
 
-    ///RoomCaption
+    //RoomCaption
     bool show_hide_roomCaption(QString name, qreal x, qreal y);
 
 
@@ -129,7 +131,7 @@ public slots:
 
 
 protected:
-    ///Mouse events
+    //Mouse events
     virtual void mouseMoveEvent(QMouseEvent * mouseEvent);
     //void paintEvent(QPaintEvent* event);
     virtual void mousePressEvent(QMouseEvent *event);
@@ -173,10 +175,15 @@ public slots:
     QList<jpsLineItem *> marked_lines;
     QGraphicsTextItem* current_caption;
     QList<QGraphicsTextItem* > caption_list;
+
+    //Landmark and waypoints
     QList<jpsLandmark* > LLandmarks;
     jpsLandmark* markedLandmark;
     QGraphicsRectItem* currentLandmarkRect;
     QList<QGraphicsEllipseItem* > _waypoints;
+    QList<QGraphicsLineItem* > _yahPointer;
+    QList<QGraphicsTextItem* > _waypointLabels;
+
     QGraphicsLineItem* _currentVLine;
     QPointF* _currentTrackedPoint;
     QGraphicsPixmapItem* gridmap;
@@ -185,9 +192,6 @@ public slots:
     bool _assoDef;
     bool _gridmode;
 
-    //qreal gl_min_x;
-    //qreal gl_min_y;
-
 signals:
     void mouse_moved();
     void set_focus_textedit();
diff --git a/src/datamanager.cpp b/src/datamanager.cpp
index a0850ed..1a970c3 100644
--- a/src/datamanager.cpp
+++ b/src/datamanager.cpp
@@ -38,6 +38,8 @@ jpsDatamanager::jpsDatamanager(QWidget *parent, jpsGraphicsView *view)
     mView=view;
     room_id_counter=0;
     obs_id_counter=0;
+    _yahPointer=nullptr;
+    _frameRate=0;
 
 }
 
@@ -1441,6 +1443,209 @@ QString jpsDatamanager::check_printAbility()
     return "";
 }
 
+bool jpsDatamanager::ParseCogMap(QFile &file)
+{
+    QXmlStreamReader xmlReader(&file);
+
+    while(!xmlReader.atEnd() && !xmlReader.hasError())
+    {
+        /* Read next element.*/
+        QXmlStreamReader::TokenType token = xmlReader.readNext();
+        /* If token is just StartDocument, we'll go to next.*/
+        if(token == QXmlStreamReader::StartDocument)
+        {
+            continue;
+        }
+
+        /* If token is StartElement, we'll see if we can read it.*/
+        if(token == QXmlStreamReader::StartElement)
+        {
+            /* If it's named rooms, we'll go to the next.*/
+            if(xmlReader.name() == "cognitiveMap")
+            {
+                continue;
+            }
+            if(xmlReader.name() == "header")
+            {
+                continue;
+            }
+            if(xmlReader.name() == "frameRate")
+            {
+                _frameRate=xmlReader.readElementText().toFloat();
+            }
+            if(xmlReader.name() == "frame")
+            {
+                ParseFrames(xmlReader);
+            }
+        }
+    }
+    /* Error handling. */
+    if(xmlReader.hasError())
+    {
+        QMessageBox::critical(mView,
+                              "QXSRExample::parseXML",
+                              xmlReader.errorString(),
+                              QMessageBox::Ok);
+        return false;
+    }
+    /* Removes any device() or data from the reader
+     * and resets its internal state to the initial state. */
+
+
+    xmlReader.clear();
+    return true;
+}
+
+void jpsDatamanager::ParseFrames(QXmlStreamReader &xmlReader)
+{
+    int frameID= xmlReader.attributes().value("ID").toInt();
+
+    while(!(xmlReader.tokenType() == QXmlStreamReader::EndElement &&
+                xmlReader.name() == "frame"))
+    {
+        if (xmlReader.tokenType()==QXmlStreamReader::StartElement &&
+                         xmlReader.name() == "YAHPointer")
+        {
+            ParseYAHPointer(xmlReader, frameID);
+        }
+        else if (xmlReader.tokenType()==QXmlStreamReader::StartElement &&
+                    xmlReader.name() == "landmark")
+        {
+            ParseLandmarksInCMap(xmlReader, frameID);
+        }
+        else if (xmlReader.tokenType()==QXmlStreamReader::StartElement &&
+                    xmlReader.name() == "waypoint")
+        {
+            ParseWaypointInCMap(xmlReader, frameID);
+        }
+        xmlReader.readNext();
+    }
+
+    _lastCMapFrame=frameID;
+}
+
+void jpsDatamanager::ParseYAHPointer(QXmlStreamReader &xmlReader, const int& frame)
+{
+    qreal x = xmlReader.attributes().value("x").toFloat();
+    qreal y = xmlReader.attributes().value("y").toFloat();
+    qreal angle = xmlReader.attributes().value("dir").toFloat();
+    if (_yahPointer==nullptr)
+    {
+        _yahPointer = new jpsYAHPointer(x,y,angle);
+        _yahPointer->SetFirstFrame(frame);
+        _yahPointer->SetLastFrame(frame);
+    }
+    else
+    {
+        _yahPointer->SetPos(QPointF(x,y));
+        _yahPointer->SetDirection(angle);
+        _yahPointer->SetLastFrame(frame);
+    }
+
+}
+
+void jpsDatamanager::ParseLandmarksInCMap(QXmlStreamReader &xmlReader, const int& frame)
+{
+
+    bool wayPInList=false;
+
+    int id = xmlReader.attributes().value("ID").toInt();
+    qreal x = xmlReader.attributes().value("x").toFloat();
+    qreal y = xmlReader.attributes().value("y").toFloat();
+    qreal rA = xmlReader.attributes().value("rA").toFloat();
+    qreal rB = xmlReader.attributes().value("rB").toFloat();
+
+    for (jpsWaypoint* waypoint:_waypointsInCMap)
+    {
+        if (waypoint->GetId()==id && waypoint->GetCaption()=="Landmark")
+        {
+            wayPInList = true;
+            waypoint->SetLastFrame(frame);
+        }
+    }
+
+    if (!wayPInList)
+    {
+        _waypointsInCMap.push_back(new jpsWaypoint(QPointF(x,y),rA,rB,id,"Landmark"));
+        _waypointsInCMap.back()->SetFirstFrame(frame);
+        _waypointsInCMap.back()->SetLastFrame(frame);
+    }
+}
+
+void jpsDatamanager::ParseWaypointInCMap(QXmlStreamReader &xmlReader, const int& frame)
+{
+    bool wayPInList=false;
+
+    int id = xmlReader.attributes().value("ID").toInt();
+    qreal x = xmlReader.attributes().value("x").toFloat();
+    qreal y = xmlReader.attributes().value("y").toFloat();
+    qreal rA = xmlReader.attributes().value("rA").toFloat();
+    qreal rB = xmlReader.attributes().value("rB").toFloat();
+    bool current = xmlReader.attributes().value("current").toInt();
+
+    for (jpsWaypoint* waypoint:_waypointsInCMap)
+    {
+        if (waypoint->GetId()==id && waypoint->GetCaption()=="Waypoint")
+        {
+            wayPInList = true;
+            waypoint->SetLastFrame(frame);
+
+            if (current!=waypoint->IsCurrent())
+            {
+                waypoint->ChangeCurrentness(frame);
+
+            }
+
+        }
+    }
+
+
+    if (!wayPInList)
+    {
+        _waypointsInCMap.push_back(new jpsWaypoint(QPointF(x,y),rA,rB,id,"Waypoint"));
+        _waypointsInCMap.back()->SetFirstFrame(frame);
+        _waypointsInCMap.back()->SetLastFrame(frame);
+        _waypointsInCMap.back()->SetCurrentness(current,frame);
+
+    }
+}
+
+void jpsDatamanager::ShowCMapFrame(const int& frame) const
+{
+    mView->ShowYAHPointer(_yahPointer->GetPosWhenFrame(frame),_yahPointer->GetDirWhenFrame(frame));
+
+    QList<jpsWaypoint* > wayPCandidates;
+
+    for (jpsWaypoint* waypoint:_waypointsInCMap)
+    {
+        if (waypoint->OccursInFrame(frame))
+        {
+            wayPCandidates.push_back(waypoint);
+
+            if (waypoint->IsCurrentInFrame(frame))
+                waypoint->SetText("Next target");
+            else if (waypoint->Visited(frame))
+                waypoint->SetText("Already visited");
+            else
+                waypoint->SetText("");
+
+        }
+    }
+    mView->ShowWaypoints(wayPCandidates);
+
+}
+
+
+const double &jpsDatamanager::GetCMapFrameRate() const
+{
+    return _frameRate;
+}
+
+const int &jpsDatamanager::GetLastCMapFrame() const
+{
+    return _lastCMapFrame;
+}
+
 
 
 
diff --git a/src/datamanager.h b/src/datamanager.h
index d5e77e0..a82f8b9 100644
--- a/src/datamanager.h
+++ b/src/datamanager.h
@@ -40,6 +40,7 @@
 #include "jpsexit.h"
 #include "jpsobstacle.h"
 #include "GraphicView.h"
+#include "jpsyahpointer.h"
 
 
 #include "../dxflib/src/dl_creationadapter.h"
@@ -51,51 +52,51 @@ class jpsDatamanager: public DL_CreationAdapter
 public:
     jpsDatamanager(QWidget* parent=0L, jpsGraphicsView* view=0L);
     ~jpsDatamanager();
-    ///Room
+    //Room
     QList<jpsRoom *> get_roomlist();
     void new_room();
     void remove_room(jpsRoom* room);
     void change_roomName(jpsRoom* room, QString name);
     void remove_all_rooms();
-    ///Obstacle
+    //Obstacle
     QList<jpsObstacle *> get_obstaclelist();
     void new_obstacle();
     void remove_obstacle(jpsObstacle* obs);
     void change_obstacleName(jpsObstacle* obs, QString name);
     void remove_all_obstacles();
-    ///Crossing
+    //Crossing
     QList<jpsCrossing *> get_crossingList();
     void new_crossing(QList<jpsLineItem *> newCrossing);
     void new_crossing(jpsLineItem* newCrossing);
     void remove_crossing(jpsCrossing* crossing);
     void change_crossingName(jpsCrossing* crossing, QString name);
     void remove_all_crossings();
-    ///Exit
+    //Exit
     QList<jpsExit *> get_exitList();
     void new_exit(QList<jpsLineItem *> newExits);
     void new_exit(jpsLineItem* newExit);
     void remove_exit(jpsExit* exit);
     void change_exitName(jpsExit* exit, QString name);
     void remove_all_exits();
-    ///Landmark
+    //Landmark
     QList<jpsLandmark *> get_landmarks();
     void new_landmark(jpsLandmark * newlandmark);
     void remove_landmark(jpsLandmark* landmark);
     void change_LandmarkName(jpsLandmark* landmark, QString name);
     void remove_all_landmarks();
-    ///
+    //
     void remove_all();
     void remove_marked_lines();
     void set_view(jpsGraphicsView* view);
     jpsGraphicsView* get_view();
 
 
-    /// Auto Assign
+    // Auto Assign
     void AutoAssignCrossings();
     void AutoAssignExits();
 
 
-    /// Read XML
+    // Read XML
     bool readXML(QFile &file);
     void parseSubRoom(QXmlStreamReader &xmlReader);
     void parseWalls(QXmlStreamReader &xmlReader,jpsRoom* room);
@@ -104,7 +105,7 @@ class jpsDatamanager: public DL_CreationAdapter
     void parseTransitions(QXmlStreamReader &xmlReader);
     void parseObstacles(QXmlStreamReader &xmlReader, jpsRoom *room);
 
-    /// Write XML
+    // Write XML
     void writeXML(QFile &file);
     void AutoSaveXML(QFile &file);
     void writeHeader(QXmlStreamWriter *stream);
@@ -118,10 +119,10 @@ class jpsDatamanager: public DL_CreationAdapter
     void writeNotAssignedExits(QXmlStreamWriter *stream, QList<jpsLineItem* >& lines);
     void writeLandmarks(QXmlStreamWriter *stream, QList<jpsLandmark* > &landmarks);
 
-    /// Read DXF
+    // Read DXF
     bool readDXF(std::string filename);
     virtual void addLine(const DL_LineData& d);
-    /// write DXF
+    // write DXF
     void writeDXF(std::string filename);
     void writeDXFHeader(DL_Dxf* dxf, DL_WriterA *dw);
     void writeDXFTables(DL_Dxf* dxf, DL_WriterA *dw);
@@ -131,7 +132,20 @@ class jpsDatamanager: public DL_CreationAdapter
 
     QString check_printAbility();
 
+    //Parse Cognitive Map
+    bool ParseCogMap(QFile &file);
+    void ParseFrames(QXmlStreamReader &xmlReader);
+    void ParseYAHPointer(QXmlStreamReader &xmlReader, const int &frame);
+    void ParseLandmarksInCMap(QXmlStreamReader &xmlReader, const int &frame);
+    void ParseWaypointInCMap(QXmlStreamReader &xmlReader, const int &frame);
+
+    //Show Cognitive Map
+    void ShowCMapFrame(const int& frame) const;
+    const double& GetCMapFrameRate() const;
+    const int& GetLastCMapFrame() const;
+
 private:
+    //Geometry
     QList<jpsRoom *> roomlist;
     QList<jpsObstacle *> obstaclelist;
     QList<jpsCrossing *> crossingList;
@@ -142,7 +156,12 @@ class jpsDatamanager: public DL_CreationAdapter
     QWidget* parent_widget;
     jpsGraphicsView* mView;
 
-
+    //CognitiveMap
+    QList<jpsLandmark* > _landmarksInCMap;
+    QList<jpsWaypoint* > _waypointsInCMap;
+    jpsYAHPointer* _yahPointer;
+    double _frameRate;
+    int _lastCMapFrame;
 
 };
 
diff --git a/src/jpslandmark.h b/src/jpslandmark.h
index 9b3306f..3cff6d3 100644
--- a/src/jpslandmark.h
+++ b/src/jpslandmark.h
@@ -39,19 +39,19 @@ class jpsLandmark
     jpsLandmark();
     jpsLandmark(QGraphicsPixmapItem* pixmap, QString name, QPointF point);
     ~jpsLandmark();
-    ///Setter
+    //Setter
     void set_pixmap(QGraphicsPixmapItem* pixmap);
     void set_name(QString name);
     void set_pos(QPointF pos);
     void set_room(jpsRoom* room);
     void set_visibility(int visibility);
-    ///Getter
+    //Getter
     QGraphicsPixmapItem* get_pixmap();
     QString get_name();
     const QPointF& get_pos();
     jpsRoom *get_room();
     int get_visibility();
-    ///Waypoint handling
+    //Waypoint handling
     void AddWaypoint(jpsWaypoint* waypoint);
     void RemoveWaypoint(jpsWaypoint* waypoint);
     QList<jpsWaypoint* > GetWaypoints();
diff --git a/src/jpswaypoint.cpp b/src/jpswaypoint.cpp
index f9778cd..aa8fa49 100644
--- a/src/jpswaypoint.cpp
+++ b/src/jpswaypoint.cpp
@@ -28,27 +28,55 @@
 
 #include "jpswaypoint.h"
 #include <cmath>
+#include <iostream>
 jpsWaypoint::jpsWaypoint()
 {
 
 }
 
-jpsWaypoint::jpsWaypoint(QRectF rect)
+jpsWaypoint::jpsWaypoint(const QPointF &point, const qreal &rA, const qreal &rB, const int &id, const QString &caption)
+{
+    _pos=point;
+    _a=rA;
+    _b=rB;
+    _id=id;
+    _caption=caption;
+    _rect=QRectF(point.x()-rA,point.y()-rB,rA*2,rB*2);
+    _currentness=false;
+    _FFcurrentness=-1;
+    _LFcurrentness=-1;
+    _lastFrame=-1;
+    _firstFrame=-1;
+}
+
+jpsWaypoint::jpsWaypoint(QRectF rect, const int &id)
 {
     _rect=rect;
     _pos=_rect.center();
     _a=std::abs(_rect.width()/2.0);
     _b=std::abs(_rect.height()/2.0);
     _ellipseItem=nullptr;
+    _id=id;
+    _currentness=false;
+    _FFcurrentness=-1;
+    _LFcurrentness=-1;
+    _lastFrame=-1;
+    _firstFrame=-1;
 }
 
-jpsWaypoint::jpsWaypoint(QGraphicsEllipseItem* ellipseItem)
+jpsWaypoint::jpsWaypoint(QGraphicsEllipseItem* ellipseItem, const int &id)
 {
     _ellipseItem=ellipseItem;
     _rect=_ellipseItem->rect();
     _pos=_rect.center();
     _a=_rect.width();
     _b=_rect.height();
+    _id=id;
+    _currentness=false;
+    _FFcurrentness=-1;
+    _LFcurrentness=-1;
+    _lastFrame=-1;
+    _firstFrame=-1;
 }
 
 jpsWaypoint::~jpsWaypoint()
@@ -56,32 +84,42 @@ jpsWaypoint::~jpsWaypoint()
 
 }
 
-const QPointF &jpsWaypoint::GetPos()
+const QPointF &jpsWaypoint::GetPos() const
 {
     return _pos;
 
 }
 
-const QRectF &jpsWaypoint::GetRect()
+const QRectF &jpsWaypoint::GetRect() const
 {
     return _rect;
 }
 
-double jpsWaypoint::GetA()
+const double& jpsWaypoint::GetA() const
 {
     return _a;
 }
 
-double jpsWaypoint::GetB()
+const double& jpsWaypoint::GetB() const
 {
     return _b;
 }
 
+const int &jpsWaypoint::GetId() const
+{
+    return _id;
+}
+
 QGraphicsEllipseItem *jpsWaypoint::GetEllipseItem()
 {
     return _ellipseItem;
 }
 
+const QString &jpsWaypoint::GetCaption() const
+{
+    return _caption;
+}
+
 
 void jpsWaypoint::SetPos(QPointF point)
 {
@@ -102,6 +140,105 @@ void jpsWaypoint::SetEllipseItem(QGraphicsEllipseItem *ellipseItem)
     _ellipseItem=ellipseItem;
 }
 
+void jpsWaypoint::SetId(const int &id)
+{
+    _id=id;
+}
+
+void jpsWaypoint::SetCaption(const QString &string)
+{
+    _caption=string;
+}
+
+const int &jpsWaypoint::GetFirstFrame() const
+{
+    return _firstFrame;
+}
+
+const int &jpsWaypoint::GetLastFrame() const
+{
+    return _lastFrame;
+}
+
+void jpsWaypoint::SetFirstFrame(const int &frame)
+{
+    _firstFrame=frame;
+}
+
+void jpsWaypoint::SetLastFrame(const int &frame)
+{
+    _lastFrame=frame;
+}
+
+bool jpsWaypoint::OccursInFrame(const int &frame) const
+{
+    if (frame>=_firstFrame && frame<=_lastFrame)
+    {
+        return true;
+    }
+    return false;
+}
+
+bool jpsWaypoint::IsCurrent() const
+{
+    return _currentness;
+}
+
+bool jpsWaypoint::IsCurrentInFrame(const int &frameID)
+{
+    if (_FFcurrentness<= frameID && _LFcurrentness>=frameID)
+        return true;
+    else
+        return false;
+}
+
+void jpsWaypoint::SetCurrentness(bool stat, const int& frameID)
+{
+    _currentness=stat;
+    if (stat)
+        _FFcurrentness=frameID;
+}
+
+const int &jpsWaypoint::GetFirstFrameCurrent() const
+{
+    return _FFcurrentness;
+}
+
+const int &jpsWaypoint::GetLastFrameCurrent() const
+{
+    return _LFcurrentness;
+}
+
+void jpsWaypoint::ChangeCurrentness(const int& frameID)
+{
+    _currentness=!_currentness;
+    if (_currentness)
+        _FFcurrentness=frameID;
+    else
+        _LFcurrentness=frameID;
+}
+
+const QString &jpsWaypoint::GetText()
+{
+    return _text;
+}
+
+void jpsWaypoint::SetText(const QString &text)
+{
+    _text=text;
+}
+
+bool jpsWaypoint::Visited(const int &frameID) const
+{
+    if (frameID > _LFcurrentness && _lastFrame!=-1)
+        return true;
+
+    else
+        return false;
+}
+
+
+
 
 
 
diff --git a/src/jpswaypoint.h b/src/jpswaypoint.h
index fda1f7d..bce2d2f 100644
--- a/src/jpswaypoint.h
+++ b/src/jpswaypoint.h
@@ -35,20 +35,44 @@ class jpsWaypoint
 {
 public:
     jpsWaypoint();
-    jpsWaypoint(QRectF rect);
-    jpsWaypoint(QGraphicsEllipseItem* ellipseItem);
+    jpsWaypoint(const QPointF& point,const qreal& rA, const qreal& rB, const int& id=0, const QString& caption="Waypoint");
+    jpsWaypoint(QRectF rect, const int& id=0);
+    jpsWaypoint(QGraphicsEllipseItem* ellipseItem, const int& id=0);
     ~jpsWaypoint();
-    ///Getter
-    const QPointF& GetPos();
-    const QRectF &GetRect();
-    double GetA();
-    double GetB();
+    //Getter
+    const QPointF& GetPos() const;
+    const QRectF &GetRect() const;
+    const double& GetA() const;
+    const double& GetB() const;
+    const int& GetId() const;
     QGraphicsEllipseItem* GetEllipseItem();
+    const QString& GetCaption() const;
 
-    ///Setter
+    //Setter
     void SetPos(QPointF point);
     void SetRect(QRect rect);
     void SetEllipseItem(QGraphicsEllipseItem* ellipseItem);
+    void SetId(const int& id);
+    void SetCaption(const QString& string);
+
+    //Occurence
+    const int& GetFirstFrame() const;
+    const int& GetLastFrame() const;
+    void SetFirstFrame(const int& frame);
+    void SetLastFrame(const int& frame);
+    bool OccursInFrame(const int& frame) const;
+
+    //Currency
+    bool IsCurrent() const;
+    bool IsCurrentInFrame(const int& frameID);
+    void SetCurrentness(bool stat, const int &frameID=1);
+    const int& GetFirstFrameCurrent() const;
+    const int& GetLastFrameCurrent() const;
+    void ChangeCurrentness(const int& frameID);
+    const QString& GetText();
+    void SetText(const QString& text);
+
+    bool Visited(const int& frameID) const;
 
 
 private:
@@ -57,6 +81,18 @@ class jpsWaypoint
     QRectF _rect;
     double _a;
     double _b;
+    int _id;
+    QString _caption;
+
+    //Occurence
+    int _firstFrame;
+    int _lastFrame;
+
+    //Currentness
+    int _FFcurrentness;
+    int _LFcurrentness;
+    bool _currentness;
+    QString _text;
 
 };
 
diff --git a/src/jpsyahpointer.cpp b/src/jpsyahpointer.cpp
new file mode 100644
index 0000000..4c0b90f
--- /dev/null
+++ b/src/jpsyahpointer.cpp
@@ -0,0 +1,77 @@
+#include "jpsyahpointer.h"
+
+jpsYAHPointer::jpsYAHPointer(const QPointF &point, const qreal &angle)
+{
+    _cPos=point;
+    _cDirection=angle;
+    _allPos.push_back(point);
+    _allDir.push_back(angle);
+}
+
+jpsYAHPointer::jpsYAHPointer(const qreal &x, const qreal &y, const qreal &angle)
+{
+    _cPos.setX(x);
+    _cPos.setY(y);
+    _cDirection=angle;
+    _allPos.push_back(_cPos);
+    _allDir.push_back(angle);
+}
+
+jpsYAHPointer::~jpsYAHPointer()
+{
+
+}
+
+const QPointF &jpsYAHPointer::GetPos() const
+{
+    return _cPos;
+}
+
+const qreal &jpsYAHPointer::GetDirection() const
+{
+    return _cDirection;
+}
+
+void jpsYAHPointer::SetPos(const QPointF &point)
+{
+    _cPos=point;
+    _allPos.push_back(point);
+}
+
+void jpsYAHPointer::SetDirection(const qreal &angle)
+{
+    _cDirection=angle;
+    _allDir.push_back(angle);
+}
+
+
+const int &jpsYAHPointer::GetFirstFrame() const
+{
+    return _firstFrame;
+}
+
+const int &jpsYAHPointer::GetLastFrame() const
+{
+    return _lastFrame;
+}
+
+void jpsYAHPointer::SetFirstFrame(const int &frame)
+{
+    _firstFrame=frame;
+}
+
+void jpsYAHPointer::SetLastFrame(const int &frame)
+{
+    _lastFrame=frame;
+}
+
+const QPointF &jpsYAHPointer::GetPosWhenFrame(const int &frame)
+{
+    return _allPos[frame-1];
+}
+
+const qreal &jpsYAHPointer::GetDirWhenFrame(const int &frame)
+{
+    return _allDir[frame-1];
+}
+
diff --git a/src/jpsyahpointer.h b/src/jpsyahpointer.h
new file mode 100644
index 0000000..ad61057
--- /dev/null
+++ b/src/jpsyahpointer.h
@@ -0,0 +1,39 @@
+#ifndef JPSYAHPOINTER_H
+#define JPSYAHPOINTER_H
+#include <QPointF>
+
+class jpsYAHPointer
+{
+public:
+    jpsYAHPointer(const QPointF& point, const qreal& angle=0.0);
+    jpsYAHPointer(const qreal& x, const qreal& y, const qreal& angle=0.0);
+    ~jpsYAHPointer();
+
+    const QPointF& GetPos() const;
+    const qreal& GetDirection() const;
+
+    void SetPos(const QPointF& point);
+    void SetDirection(const qreal& angle);
+
+    //Occurence
+    const int& GetFirstFrame() const;
+    const int& GetLastFrame() const;
+    void SetFirstFrame(const int& frame);
+    void SetLastFrame(const int& frame);
+
+    //
+    const QPointF& GetPosWhenFrame(const int& frame);
+    const qreal& GetDirWhenFrame(const int& frame);
+
+private:
+    QPointF _cPos;
+    qreal _cDirection;
+    std::vector<QPointF> _allPos;
+    std::vector<qreal> _allDir;
+
+    //Occurence
+    int _firstFrame;
+    int _lastFrame;
+};
+
+#endif // JPSYAHPOINTER_H
diff --git a/src/mainWindow.cpp b/src/mainWindow.cpp
index eb2a5c4..bc7e99e 100644
--- a/src/mainWindow.cpp
+++ b/src/mainWindow.cpp
@@ -83,6 +83,8 @@ MWindow :: MWindow() {
     timer->setInterval(300000);
     timer->start();
 
+    _cMapTimer = new QTimer(this);
+    //_cMapTimer=nullptr;
 
     //Signals and Slots
     // Tab File
@@ -92,6 +94,7 @@ MWindow :: MWindow() {
     connect(actionSpeichern,SIGNAL(triggered(bool)),this,SLOT(saveFile()));
     connect(actionSpeichern_dxf,SIGNAL(triggered(bool)),this,SLOT(saveAsDXF()));
     connect(actionSettings,SIGNAL(triggered(bool)),this,SLOT(Settings()));
+    connect(action_ffnen_CogMap,SIGNAL(triggered(bool)),this,SLOT(openFileCMap()));
     // Tab Help
     connect(action_ber,SIGNAL(triggered(bool)),this,SLOT(info()));
     // Tab Tools
@@ -122,16 +125,14 @@ MWindow :: MWindow() {
     //connect(mview,SIGNAL(DoubleClick()),this,SLOT(en_selectMode()));
     // Autosave
     connect(timer, SIGNAL(timeout()), this, SLOT(AutoSave()));
-    ///Landmarks
+    //Landmarks
     connect(actionLandmark,SIGNAL(triggered(bool)),this,SLOT(en_disableLandmark()));
     connect(actionLandmark,SIGNAL(triggered(bool)),this,SLOT(dis_selectMode()));
     // Landmark specifications
     connect(actionLandmarkWidget,SIGNAL(triggered(bool)),this,SLOT(define_landmark()));
-
-
-
-
-
+    //CMap
+    connect(actionRun_visualisation,SIGNAL(triggered(bool)),this,SLOT(RunCMap()));
+    connect(_cMapTimer,SIGNAL(timeout()),this,SLOT(UpdateCMap()));
 
 }
 
@@ -144,6 +145,7 @@ MWindow::~MWindow()
     delete label2;
     delete infoLabel;
     delete timer;
+    delete _cMapTimer;
 }
 
 void MWindow::AutoSave()
@@ -171,6 +173,32 @@ void MWindow::AutoSave()
     }
 }
 
+void MWindow::RunCMap()
+{
+
+    double frameRate = dmanager->GetCMapFrameRate();
+    _cMapFrame=1;
+    if (frameRate==0)
+    {
+        statusBar()->showMessage(tr("No cognitive map has been loaded!"),10000);
+        return;
+    }
+    _cMapTimer->setInterval(1/frameRate*1000);
+    _cMapTimer->start();
+}
+
+void MWindow::UpdateCMap()
+{
+    _cMapFrame++;
+    if (_cMapFrame>dmanager->GetLastCMapFrame())
+    {
+        _cMapTimer->stop();
+        dmanager->ShowCMapFrame(1);
+        return;
+    }
+    dmanager->ShowCMapFrame(_cMapFrame);
+}
+
 void MWindow::add_landmark()
 {
     jpsLandmark* landmark = mview->get_landmarks().last();
@@ -243,6 +271,33 @@ void MWindow::openFileXML()
 
 }
 
+void MWindow::openFileCMap()
+{
+    QString fileName=QFileDialog::getOpenFileName(this,tr("Open XML"),"",tr("XML-Files (*.xml)"));
+    QFile file(fileName);
+    if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+        QMessageBox::critical(this,
+                              "OpenFileXML",
+                              "Couldn't open xml-file",
+                              QMessageBox::Ok);
+        return;
+    }
+
+
+    if (!dmanager->ParseCogMap(file))
+    {
+        statusBar()->showMessage("XML-File could not be parsed!",10000);
+    }
+
+    else
+    {
+
+        statusBar()->showMessage("Cognitive map successfully loaded!",10000);
+        dmanager->ShowCMapFrame(1);
+    }
+}
+
 void MWindow::saveFile(){
     QString fileName = QFileDialog::getSaveFileName(this,tr("Save XML"),"",tr("XML-Files (*.xml)"));
     _filename=fileName;
diff --git a/src/mainWindow.h b/src/mainWindow.h
index 3ae5f04..1215430 100644
--- a/src/mainWindow.h
+++ b/src/mainWindow.h
@@ -65,13 +65,24 @@ class MWindow : public QMainWindow, private Ui::MainWindow {
     QString _filename;
     QTimer *timer;
 
+    //CMap
+    QTimer *_cMapTimer;
+    int _cMapFrame;
+
 
 protected slots:
+    
+    //parseFiles
     void openFile();
     void openFileXML();
+    void openFileCMap();
     void saveFile();
     void saveAsDXF();
+    
+    //about
     void info();
+    
+    //drawing options
     void anglesnap();
     void en_disableWall();
     void en_disableDoor();
@@ -79,21 +90,33 @@ protected slots:
     void en_disableLandmark();
     void disableDrawing();
     void objectsnap();
-    void gridmode();
+
+    //Line operations
     void show_coords();
     void delete_lines();
     void delete_marked_lines();
     void send_length();
-    void define_room();
-    void define_landmark();
     void en_selectMode();
     void dis_selectMode();
     void lines_deleted();
     void remove_all_lines();
-    void rotate();
-    void AutoSave();
+    
+    //Room and landmark def
+    void define_room();
+    void define_landmark();
     void add_landmark();
+    
+    //view options
+    void gridmode();
+    void rotate();
     void Settings();
+    
+    //autosave
+    void AutoSave();
+    
+    //CMap
+    void RunCMap();
+    void UpdateCMap();
 
 
 };
diff --git a/src/widgetlandmark.cpp b/src/widgetlandmark.cpp
index 4dcf877..72041ce 100644
--- a/src/widgetlandmark.cpp
+++ b/src/widgetlandmark.cpp
@@ -40,6 +40,7 @@ widgetLandmark::widgetLandmark(QWidget *parent, jpsDatamanager *dmanager, jpsGra
     ui->setupUi(this);
     _dmanager=dmanager;
     _gview=gview;
+    _waypointIDCounter=0;
 
     show_landmarks();
 
@@ -162,8 +163,10 @@ void widgetLandmark::AddAssociation()
     {
         int cLanRow=ui->list_landmarks->currentIndex();
 
-        _dmanager->get_landmarks()[cLanRow]->AddWaypoint(new jpsWaypoint(_gview->GetCurrentSelectRect()->rect()));
+        _dmanager->get_landmarks()[cLanRow]->AddWaypoint(new jpsWaypoint(_gview->GetCurrentSelectRect()->rect(),_waypointIDCounter));
+
         ShowAssociations();
+        _waypointIDCounter++;
     }
 }
 
diff --git a/src/widgetlandmark.h b/src/widgetlandmark.h
index b4f678d..71369c7 100644
--- a/src/widgetlandmark.h
+++ b/src/widgetlandmark.h
@@ -60,6 +60,7 @@ protected slots:
     Ui::widgetLandmark *ui;
     jpsDatamanager* _dmanager;
     jpsGraphicsView* _gview;
+    int _waypointIDCounter;
 };
 
 #endif // WIDGETLANDMARK_H

From 9b3fa467068ff696c578bd69a4edd6282cdda196 Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Fri, 28 Aug 2015 13:49:23 +0200
Subject: [PATCH 17/53] update of CMakeLists.txt

---
 CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ac4a45..2c899e8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -96,6 +96,7 @@ set( SRCS
 	src/jpswaypoint.cpp
 	src/widgetlandmark.cpp
 	src/widgetsettings.cpp
+	src/jpsyahpointer.cpp
     dxflib/src/dl_writer_ascii.cpp
     dxflib/src/dl_dxf.cpp
   )  
@@ -115,6 +116,7 @@ set( HDR
 	src/jpswaypoint.h
 	src/widgetlandmark.h
 	src/widgetsettings.h
+	src/jpsyahpointer.h
     dxflib/src/dl_writer_ascii.h
     dxflib/src/dl_writer.h
     dxflib/src/dl_global.h

From a497c91b36a818c0a79a2aee1871164c40dc057e Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Fri, 28 Aug 2015 14:17:16 +0200
Subject: [PATCH 18/53] landmark selection fixed

---
 src/GraphicView.cpp    | 9 +++++----
 src/GraphicView.h      | 4 +++-
 src/widgetlandmark.cpp | 2 ++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/GraphicView.cpp b/src/GraphicView.cpp
index 0de9147..4c0a9be 100644
--- a/src/GraphicView.cpp
+++ b/src/GraphicView.cpp
@@ -104,7 +104,7 @@ jpsGraphicsView::jpsGraphicsView(QWidget* parent):QGraphicsView(parent)
 
     //create_grid();
 
-    ///Origin
+    //Origin
 
     //origin.push_back(Scene->addLine(1,1,1/gl_scale_f*0.02,1,QPen(Qt::black,0)));
     //origin.push_back(Scene->addLine(1,1,1,1/gl_scale_f*0.02,QPen(Qt::black,0)));
@@ -142,7 +142,7 @@ void jpsGraphicsView::mouseMoveEvent(QMouseEvent *mouseEvent)
 
     if (_currentVLine!=nullptr)
     {
-        /// vline will be deleted if it is not thrown horizontally or vertically
+        // vline will be deleted if it is not thrown horizontally or vertically
         if(!use_anglesnap(_currentVLine,15))
         {
             delete _currentVLine;
@@ -173,7 +173,7 @@ void jpsGraphicsView::mouseMoveEvent(QMouseEvent *mouseEvent)
     {
         catch_points();
 
-        ///VLine
+        //VLine
         if (point_tracked && (statWall==true || statDoor==true || statExit==true))
         {
             SetVLine();
@@ -195,7 +195,7 @@ void jpsGraphicsView::mouseMoveEvent(QMouseEvent *mouseEvent)
         _currentVLine->setLine(_currentVLine->line().x1(),_currentVLine->line().y1(),translated_pos.x(),translated_pos.y());
     }
 
-    /// see if two lines collided FIX ME!!!
+    // see if two lines collided FIX ME!!!
     //line_collision();
 
     emit mouse_moved();
@@ -429,6 +429,7 @@ void jpsGraphicsView::mouseReleaseEvent(QMouseEvent *event)
                 {
                     //Waypoint definition
                     emit AssoDefCompleted();
+                    _assoDef=false;
                 }
                 else
                 {
diff --git a/src/GraphicView.h b/src/GraphicView.h
index 441748a..a147cf7 100644
--- a/src/GraphicView.h
+++ b/src/GraphicView.h
@@ -107,7 +107,7 @@ class jpsGraphicsView: public QGraphicsView {
     void catch_landmark();
     void select_landmark(jpsLandmark *landmark);
     void addLandmark();
-    void unmarkLandmark();
+    // unmark Landmarks see slots
     QList<jpsLandmark *> get_landmarks();
 
     //Waypoints and YAHPointer
@@ -128,6 +128,8 @@ public slots:
     //GridSettings
     void ActivateLineGrid();
     void ActivatePointGrid();
+    //Landmarks
+    void unmarkLandmark();
 
 
 protected:
diff --git a/src/widgetlandmark.cpp b/src/widgetlandmark.cpp
index 72041ce..daf2308 100644
--- a/src/widgetlandmark.cpp
+++ b/src/widgetlandmark.cpp
@@ -48,6 +48,7 @@ widgetLandmark::widgetLandmark(QWidget *parent, jpsDatamanager *dmanager, jpsGra
     connect(ui->apply_name_button,SIGNAL(clicked(bool)),this,SLOT(change_name()));
     connect(ui->closeButton,SIGNAL(clicked(bool)),this->parentWidget(),SLOT(define_landmark()));
     connect(ui->list_landmarks,SIGNAL(activated(int)),this,SLOT(enable_room_selection()));
+    connect(ui->list_landmarks,SIGNAL(currentIndexChanged(int)),_gview,SLOT(unmarkLandmark()));
     connect(ui->roomBox_landmarks,SIGNAL(activated(int)),this,SLOT(add_room_to_landmark()));
     connect(ui->add_button,SIGNAL(clicked(bool)),_gview,SLOT(StatAssoDef()));
     connect(_gview,SIGNAL(AssoDefCompleted()),this,SLOT(AddAssociation()));
@@ -167,6 +168,7 @@ void widgetLandmark::AddAssociation()
 
         ShowAssociations();
         _waypointIDCounter++;
+        ui->add_button->setChecked(false);
     }
 }
 

From aa69768945313d825b4212ac99881144a363539d Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Mon, 31 Aug 2015 08:41:38 +0200
Subject: [PATCH 19/53] Roomtype definition

---
 forms/roomwidget.ui | 51 ++++++++++++++++++++++++++++++++++++---------
 src/datamanager.cpp | 10 +++++----
 src/rooms.cpp       |  1 +
 src/roomwidget.cpp  | 47 ++++++++++++++++++++++++++++++++++-------
 src/roomwidget.h    |  6 +++++-
 5 files changed, 92 insertions(+), 23 deletions(-)

diff --git a/forms/roomwidget.ui b/forms/roomwidget.ui
index 6810467..e1225f7 100644
--- a/forms/roomwidget.ui
+++ b/forms/roomwidget.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>320</width>
-    <height>678</height>
+    <height>725</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -42,7 +42,7 @@
     <property name="geometry">
      <rect>
       <x>20</x>
-      <y>510</y>
+      <y>560</y>
       <width>291</width>
       <height>31</height>
      </rect>
@@ -55,7 +55,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>330</y>
+      <y>380</y>
       <width>291</width>
       <height>171</height>
      </rect>
@@ -65,7 +65,7 @@
     <property name="geometry">
      <rect>
       <x>110</x>
-      <y>610</y>
+      <y>660</y>
       <width>93</width>
       <height>28</height>
      </rect>
@@ -78,7 +78,7 @@
     <property name="geometry">
      <rect>
       <x>30</x>
-      <y>550</y>
+      <y>600</y>
       <width>112</width>
       <height>34</height>
      </rect>
@@ -91,7 +91,7 @@
     <property name="geometry">
      <rect>
       <x>170</x>
-      <y>550</y>
+      <y>600</y>
       <width>112</width>
       <height>34</height>
      </rect>
@@ -117,7 +117,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>290</y>
+      <y>340</y>
       <width>191</width>
       <height>31</height>
      </rect>
@@ -199,7 +199,7 @@
     <property name="geometry">
      <rect>
       <x>-10</x>
-      <y>270</y>
+      <y>320</y>
       <width>341</width>
       <height>20</height>
      </rect>
@@ -212,7 +212,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>240</y>
+      <y>280</y>
       <width>121</width>
       <height>28</height>
      </rect>
@@ -225,7 +225,7 @@
     <property name="geometry">
      <rect>
       <x>202</x>
-      <y>240</y>
+      <y>280</y>
       <width>101</width>
       <height>28</height>
      </rect>
@@ -234,6 +234,37 @@
      <string>Highlight Room</string>
     </property>
    </widget>
+   <widget class="QComboBox" name="classBox">
+    <property name="enabled">
+     <bool>true</bool>
+    </property>
+    <property name="geometry">
+     <rect>
+      <x>100</x>
+      <y>240</y>
+      <width>111</width>
+      <height>21</height>
+     </rect>
+    </property>
+   </widget>
+   <widget class="QLabel" name="label_6">
+    <property name="geometry">
+     <rect>
+      <x>10</x>
+      <y>240</y>
+      <width>91</width>
+      <height>16</height>
+     </rect>
+    </property>
+    <property name="font">
+     <font>
+      <pointsize>9</pointsize>
+     </font>
+    </property>
+    <property name="text">
+     <string>Roomtype:</string>
+    </property>
+   </widget>
   </widget>
   <widget class="QWidget" name="tab">
    <attribute name="title">
diff --git a/src/datamanager.cpp b/src/datamanager.cpp
index 1a970c3..fd07518 100644
--- a/src/datamanager.cpp
+++ b/src/datamanager.cpp
@@ -322,7 +322,7 @@ void jpsDatamanager::writeRooms(QXmlStreamWriter *stream, QList<jpsLineItem *> &
         stream->writeStartElement("subroom");
         stream->writeAttribute("id",QString::number(roomlist[i]->get_id()));
         stream->writeAttribute("caption",roomlist[i]->get_name());
-        stream->writeAttribute("class","subroom");
+        stream->writeAttribute("class",roomlist[i]->get_type());
 
         //walls
         QList<jpsLineItem* > wallList=roomlist[i]->get_listWalls();
@@ -668,7 +668,7 @@ void jpsDatamanager::writeLandmarks(QXmlStreamWriter *stream, QList<jpsLandmark
         stream->writeAttribute("px",QString::number(landmark->get_pos().x()));
         stream->writeAttribute("py",QString::number(landmark->get_pos().y()));
         stream->writeStartElement("associations");
-        m=0;
+
         for (jpsWaypoint* waypoint:landmark->GetWaypoints())
         {
             stream->writeStartElement("association");
@@ -937,8 +937,10 @@ void jpsDatamanager::parseSubRoom(QXmlStreamReader &xmlReader)
 
     if(attributes.hasAttribute("class"))
     {
-        /* We'll add it to the room. */
-        roomlist.last()->set_type(attributes.value("class").toString());
+        if (attributes.value("class").toString()=="subroom")
+            roomlist.last()->set_type("Not specified");
+        else
+            roomlist.last()->set_type(attributes.value("class").toString());
     }
     this->parseWalls(xmlReader,roomlist.last());
     this->parseObstacles(xmlReader,roomlist.last());
diff --git a/src/rooms.cpp b/src/rooms.cpp
index a373338..f58763c 100644
--- a/src/rooms.cpp
+++ b/src/rooms.cpp
@@ -38,6 +38,7 @@ jpsRoom::jpsRoom(int id_room)
     QString string="Room ";
     name=string.append(QString::number(id));
     highlighted=false;
+    _type="Not specified";
 
 }
 
diff --git a/src/roomwidget.cpp b/src/roomwidget.cpp
index 221a45a..4ac0f82 100644
--- a/src/roomwidget.cpp
+++ b/src/roomwidget.cpp
@@ -47,11 +47,16 @@ roomWidget::roomWidget(QWidget *parent, jpsDatamanager *dmanager, jpsGraphicsVie
     show_exits();
     show_obstacles();
 
-    ///temporary uncommented
+    //temporary uncommented
     ui->auto_assign_doors->setVisible(false);
     //ui->auto_assign_exits->setVisible(false);
 
-
+    // roomClasses
+    ui->classBox->addItem("Not specified");
+    ui->classBox->addItem("Corridor");
+    ui->classBox->addItem("Office");
+    ui->classBox->addItem("Lobby");
+    ui->classBox->addItem("Entrance");
 
 
     //SIGNALS AND SLOTS
@@ -65,12 +70,14 @@ roomWidget::roomWidget(QWidget *parent, jpsDatamanager *dmanager, jpsGraphicsVie
     connect(ui->delete_room,SIGNAL(clicked(bool)),this,SLOT(delete_room()));
     connect(ui->apply_name_button,SIGNAL(clicked(bool)),this,SLOT(change_roomname()));
     connect(ui->add_button,SIGNAL(clicked(bool)),this,SLOT(addWall()));
-    connect(ui->list_rooms,SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)),this,SLOT(showWalls()));
-    connect(ui->list_rooms,SIGNAL(itemClicked(QListWidgetItem*)),this,SLOT(showWalls()));
+    connect(ui->list_rooms,SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)),this,SLOT(showWallsAndType()));
+    connect(ui->list_rooms,SIGNAL(itemClicked(QListWidgetItem*)),this,SLOT(showWallsAndType()));
     connect(ui->listWalls,SIGNAL(itemClicked(QListWidgetItem*)),this,SLOT(selectWall()));
     connect(ui->remove_button,SIGNAL(clicked(bool)),this,SLOT(removeWall()));
     connect(ui->caption,SIGNAL(clicked(bool)),this,SLOT(shhi_roomCaption()));
     connect(ui->highlight,SIGNAL(clicked(bool)),this,SLOT(highlight_room()));
+    connect(ui->classBox,SIGNAL(activated(int)),this,SLOT(ChangeRoomType()));
+    connect(ui->classBox,SIGNAL(currentIndexChanged(int)),this,SLOT(ChangeRoomType()));
     //tab crossing
     connect(ui->addCrossingButton,SIGNAL(clicked(bool)),this,SLOT(new_crossing()));
     connect(ui->crossingList,SIGNAL(itemClicked(QListWidgetItem*)),this,SLOT(enable_roomSelectionCrossings()));
@@ -244,7 +251,7 @@ void roomWidget::addWall()
             int crow=ui->list_rooms->currentRow();
 
             datamanager->get_roomlist()[crow]->addWall(graphview->get_markedLines());
-            this->showWalls();
+            this->showWallsAndType();
 
         }
     }
@@ -259,12 +266,12 @@ void roomWidget::removeWall()
             int crow=ui->list_rooms->currentRow();
 
             datamanager->get_roomlist()[crow]->removeWall(graphview->get_markedLines());
-            this->showWalls();
+            this->showWallsAndType();
         }
     }
 }
 
-void roomWidget::showWalls()
+void roomWidget::showWallsAndType()
 {
     ui->listWalls->clear();
 
@@ -285,6 +292,8 @@ void roomWidget::showWalls()
                 string.append(" y2:"+QString::number(walllist[i]->get_line()->line().y2()));
                 ui->listWalls->addItem(string);
             }
+
+            ShowRoomType(crow);
         }
     }
 }
@@ -558,7 +567,7 @@ void roomWidget::show_all()
     show_crossings();
     show_exits();
     show_obstacles();
-    showWalls();
+    showWallsAndType();
     showWallsObs();
 }
 
@@ -773,6 +782,28 @@ void roomWidget::autoAssignExits()
 
 }
 
+void roomWidget::ChangeRoomType()
+{
+    if (ui->list_rooms->currentItem()!=0L)
+    {
+        int cRoomRow=ui->list_rooms->currentRow();
+        int cClassRow=ui->classBox->currentIndex();
+        if (cClassRow!=-1)
+        {
+            datamanager->get_roomlist()[cRoomRow]->set_type(ui->classBox->currentText());
+        }
+    }
+
+}
+
+void roomWidget::ShowRoomType(int& cRow) const
+{
+    QString type = datamanager->get_roomlist()[cRow]->get_type();
+
+    ui->classBox->setCurrentText(type);
+
+}
+
 
 
 
diff --git a/src/roomwidget.h b/src/roomwidget.h
index e37ae17..7c8b072 100644
--- a/src/roomwidget.h
+++ b/src/roomwidget.h
@@ -57,7 +57,7 @@ protected slots:
     void change_roomname();
     void addWall();
     void removeWall();
-    void showWalls();
+    void showWallsAndType();
     void selectWall();
     void new_crossing();
     void enable_roomSelectionCrossings();
@@ -87,6 +87,7 @@ protected slots:
     void highlight_obs();
     void autoAssignDoors();
     void autoAssignExits();
+    void ChangeRoomType();
 
 
 private:
@@ -94,6 +95,9 @@ protected slots:
     jpsDatamanager *datamanager;
     jpsGraphicsView *graphview;
 
+    //
+    void ShowRoomType(int &cRow) const;
+
 };
 
 #endif // ROOMWIDGET_H

From ad2fd8cc4e31bc5e86eb0bf0a1631a0d8ce984e5 Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Wed, 9 Sep 2015 10:40:56 +0200
Subject: [PATCH 20/53] connection and waypoint stuff

---
 CMakeLists.txt         |  2 +
 forms/mainwindow.ui    | 13 ++++++-
 jpseditor.pro          |  6 ++-
 src/GraphicView.cpp    | 35 ++++++++++++++++--
 src/GraphicView.h      | 10 +++--
 src/datamanager.cpp    | 83 ++++++++++++++++++++++++++++++++++++------
 src/datamanager.h      |  9 ++++-
 src/jpsconnection.cpp  | 61 +++++++++++++++++++++++++++++++
 src/jpsconnection.h    | 33 +++++++++++++++++
 src/jpslandmark.cpp    | 12 +++---
 src/jpslandmark.h      | 10 +++--
 src/jpswaypoint.cpp    | 19 ++++++++--
 src/jpswaypoint.h      |  5 ++-
 src/widgetlandmark.cpp |  6 +--
 14 files changed, 265 insertions(+), 39 deletions(-)
 create mode 100644 src/jpsconnection.cpp
 create mode 100644 src/jpsconnection.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c899e8..567275f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,6 +97,7 @@ set( SRCS
 	src/widgetlandmark.cpp
 	src/widgetsettings.cpp
 	src/jpsyahpointer.cpp
+	src/jpsconnection.cpp
     dxflib/src/dl_writer_ascii.cpp
     dxflib/src/dl_dxf.cpp
   )  
@@ -117,6 +118,7 @@ set( HDR
 	src/widgetlandmark.h
 	src/widgetsettings.h
 	src/jpsyahpointer.h
+	src/jpsconnection.h
     dxflib/src/dl_writer_ascii.h
     dxflib/src/dl_writer.h
     dxflib/src/dl_global.h
diff --git a/forms/mainwindow.ui b/forms/mainwindow.ui
index a73684a..2dff77d 100644
--- a/forms/mainwindow.ui
+++ b/forms/mainwindow.ui
@@ -71,6 +71,9 @@
     <addaction name="actionRotate_90_deg_clockwise"/>
    </widget>
    <widget class="QMenu" name="menuCognitive_Map">
+    <property name="enabled">
+     <bool>true</bool>
+    </property>
     <property name="title">
      <string>Cognitive Map</string>
     </property>
@@ -405,7 +408,7 @@
     <bool>true</bool>
    </property>
    <property name="enabled">
-    <bool>true</bool>
+    <bool>false</bool>
    </property>
    <property name="icon">
     <iconset resource="Ressource.qrc">
@@ -417,13 +420,16 @@
    <property name="toolTip">
     <string>Landmark</string>
    </property>
+   <property name="visible">
+    <bool>false</bool>
+   </property>
   </action>
   <action name="actionLandmarkWidget">
    <property name="checkable">
     <bool>true</bool>
    </property>
    <property name="enabled">
-    <bool>true</bool>
+    <bool>false</bool>
    </property>
    <property name="icon">
     <iconset resource="Ressource.qrc">
@@ -435,6 +441,9 @@
    <property name="toolTip">
     <string>LandmarkSpecs</string>
    </property>
+   <property name="visible">
+    <bool>false</bool>
+   </property>
   </action>
   <action name="actionanglesnap">
    <property name="checkable">
diff --git a/jpseditor.pro b/jpseditor.pro
index ae202ad..4a77643 100644
--- a/jpseditor.pro
+++ b/jpseditor.pro
@@ -56,7 +56,8 @@ HEADERS += \
     src/widgetlandmark.h \
     src/graphicscene.h \
     src/widgetsettings.h \
-    src/jpsyahpointer.h
+    src/jpsyahpointer.h \
+    src/jpsconnection.h
 
 
 SOURCES += \
@@ -77,7 +78,8 @@ SOURCES += \
     src/widgetlandmark.cpp \
     src/graphicscene.cpp \
     src/widgetsettings.cpp \
-    src/jpsyahpointer.cpp
+    src/jpsyahpointer.cpp \
+    src/jpsconnection.cpp
 
 
 RESOURCES +=  forms/Ressource.qrc
diff --git a/src/GraphicView.cpp b/src/GraphicView.cpp
index 4c0a9be..5400ad2 100644
--- a/src/GraphicView.cpp
+++ b/src/GraphicView.cpp
@@ -325,15 +325,15 @@ QGraphicsRectItem *jpsGraphicsView::GetCurrentSelectRect()
     return currentSelectRect;
 }
 
-void jpsGraphicsView::ShowWaypoints(QList<jpsWaypoint *> waypoints)
+void jpsGraphicsView::ShowWaypoints(QList<ptrWaypoint> waypoints)
 {
     ClearWaypoints();
 
-    for (jpsWaypoint* waypoint:waypoints)
+    for (ptrWaypoint waypoint:waypoints)
     {
         QGraphicsEllipseItem* ellipse = Scene->addEllipse(waypoint->GetRect(),QPen(Qt::blue,0));
         ellipse->setTransform(QTransform::fromTranslate(translation_x,translation_y), true);
-        QString string = waypoint->GetCaption()+ "\n" + waypoint->GetText();
+        QString string = waypoint->GetType() + "\n" + waypoint->GetCaption()+ "\n" + waypoint->GetText();
         QGraphicsTextItem* text = Scene->addText(string);
         text->setPos(waypoint->GetPos().x()+translation_x,waypoint->GetPos().y()+translation_y);
         //text->setScale(gl_scale_f);
@@ -375,6 +375,30 @@ void jpsGraphicsView::ClearWaypointLabels()
     _waypointLabels.clear();
 }
 
+void jpsGraphicsView::ShowConnections(QList<ptrConnection> cons)
+{
+    ClearConnections();
+    for (ptrConnection con:cons)
+    {
+        QGraphicsLineItem* line = Scene->addLine(QLineF(con->GetWaypoints().first->GetPos(),con->GetWaypoints().second->GetPos()),QPen(Qt::blue,0));
+        _connections.push_back(line);
+
+
+        line->setTransform(QTransform::fromTranslate(translation_x,translation_y), true);
+
+
+    }
+}
+
+void jpsGraphicsView::ClearConnections()
+{
+    for (QGraphicsLineItem* line:_connections)
+    {
+        delete line;
+    }
+    _connections.clear();
+}
+
 
 
 void jpsGraphicsView::ClearWaypoints()
@@ -1153,6 +1177,11 @@ void jpsGraphicsView::translations(QPointF old_pos)
         item->setTransform(QTransform::fromScale(scalef,scalef),true);
     }
 
+    for (QGraphicsLineItem* lineItem:_connections)
+    {
+        lineItem->setTransform(QTransform::fromTranslate(pos.x()-old_pos.x(),pos.y()-old_pos.y()), true);
+    }
+
 }
 
 void jpsGraphicsView::AutoZoom()
diff --git a/src/GraphicView.h b/src/GraphicView.h
index a147cf7..7fd798c 100644
--- a/src/GraphicView.h
+++ b/src/GraphicView.h
@@ -35,7 +35,8 @@
 #include <QGraphicsLineItem>
 #include "jpsLineItem.h"
 #include "jpslandmark.h"
-
+#include "jpsconnection.h"
+using ptrConnection = std::shared_ptr<jpsConnection>;
 
 class jpsGraphicsView: public QGraphicsView {
 
@@ -110,11 +111,13 @@ class jpsGraphicsView: public QGraphicsView {
     // unmark Landmarks see slots
     QList<jpsLandmark *> get_landmarks();
 
-    //Waypoints and YAHPointer
+    //Waypoints/Connections and YAHPointer
     QGraphicsRectItem* GetCurrentSelectRect();
-    void ShowWaypoints(QList<jpsWaypoint* > waypoints);
+    void ShowWaypoints(QList<ptrWaypoint > waypoints);
     void ShowYAHPointer(const QPointF& pos, const qreal& dir);
     void ClearWaypointLabels();
+    void ShowConnections(QList<ptrConnection> cons);
+    void ClearConnections();
 
     //RoomCaption
     bool show_hide_roomCaption(QString name, qreal x, qreal y);
@@ -183,6 +186,7 @@ public slots:
     jpsLandmark* markedLandmark;
     QGraphicsRectItem* currentLandmarkRect;
     QList<QGraphicsEllipseItem* > _waypoints;
+    QList<QGraphicsLineItem* > _connections;
     QList<QGraphicsLineItem* > _yahPointer;
     QList<QGraphicsTextItem* > _waypointLabels;
 
diff --git a/src/datamanager.cpp b/src/datamanager.cpp
index fd07518..32bac34 100644
--- a/src/datamanager.cpp
+++ b/src/datamanager.cpp
@@ -29,6 +29,7 @@
 
 #include "datamanager.h"
 #include <iostream>
+#include <utility>
 
 
 
@@ -669,7 +670,7 @@ void jpsDatamanager::writeLandmarks(QXmlStreamWriter *stream, QList<jpsLandmark
         stream->writeAttribute("py",QString::number(landmark->get_pos().y()));
         stream->writeStartElement("associations");
 
-        for (jpsWaypoint* waypoint:landmark->GetWaypoints())
+        for (ptrWaypoint waypoint:landmark->GetWaypoints())
         {
             stream->writeStartElement("association");
             stream->writeAttribute("id",QString::number(m));
@@ -1520,7 +1521,13 @@ void jpsDatamanager::ParseFrames(QXmlStreamReader &xmlReader)
         {
             ParseWaypointInCMap(xmlReader, frameID);
         }
+        else if (xmlReader.tokenType()==QXmlStreamReader::StartElement &&
+                    xmlReader.name() == "connection")
+        {
+            ParseConnectionsInCMap(xmlReader, frameID);
+        }
         xmlReader.readNext();
+
     }
 
     _lastCMapFrame=frameID;
@@ -1556,10 +1563,11 @@ void jpsDatamanager::ParseLandmarksInCMap(QXmlStreamReader &xmlReader, const int
     qreal y = xmlReader.attributes().value("y").toFloat();
     qreal rA = xmlReader.attributes().value("rA").toFloat();
     qreal rB = xmlReader.attributes().value("rB").toFloat();
+    QString caption = xmlReader.attributes().value("caption").toString();
 
-    for (jpsWaypoint* waypoint:_waypointsInCMap)
+    for (ptrWaypoint waypoint:_waypointsInCMap)
     {
-        if (waypoint->GetId()==id && waypoint->GetCaption()=="Landmark")
+        if (waypoint->GetId()==id && waypoint->GetType()=="Landmark")
         {
             wayPInList = true;
             waypoint->SetLastFrame(frame);
@@ -1568,9 +1576,10 @@ void jpsDatamanager::ParseLandmarksInCMap(QXmlStreamReader &xmlReader, const int
 
     if (!wayPInList)
     {
-        _waypointsInCMap.push_back(new jpsWaypoint(QPointF(x,y),rA,rB,id,"Landmark"));
+        _waypointsInCMap.push_back(std::make_shared<jpsWaypoint>(QPointF(x,y),rA,rB,id,"Landmark"));
         _waypointsInCMap.back()->SetFirstFrame(frame);
         _waypointsInCMap.back()->SetLastFrame(frame);
+        _waypointsInCMap.back()->SetCaption(caption);
     }
 }
 
@@ -1583,11 +1592,12 @@ void jpsDatamanager::ParseWaypointInCMap(QXmlStreamReader &xmlReader, const int&
     qreal y = xmlReader.attributes().value("y").toFloat();
     qreal rA = xmlReader.attributes().value("rA").toFloat();
     qreal rB = xmlReader.attributes().value("rB").toFloat();
+    QString caption = xmlReader.attributes().value("caption").toString();
     bool current = xmlReader.attributes().value("current").toInt();
 
-    for (jpsWaypoint* waypoint:_waypointsInCMap)
+    for (ptrWaypoint waypoint:_waypointsInCMap)
     {
-        if (waypoint->GetId()==id && waypoint->GetCaption()=="Waypoint")
+        if (waypoint->GetId()==id && waypoint->GetType()=="Waypoint")
         {
             wayPInList = true;
             waypoint->SetLastFrame(frame);
@@ -1601,24 +1611,66 @@ void jpsDatamanager::ParseWaypointInCMap(QXmlStreamReader &xmlReader, const int&
         }
     }
 
-
     if (!wayPInList)
     {
-        _waypointsInCMap.push_back(new jpsWaypoint(QPointF(x,y),rA,rB,id,"Waypoint"));
+        _waypointsInCMap.push_back(std::make_shared<jpsWaypoint>(QPointF(x,y),rA,rB,id,"Waypoint"));
         _waypointsInCMap.back()->SetFirstFrame(frame);
         _waypointsInCMap.back()->SetLastFrame(frame);
         _waypointsInCMap.back()->SetCurrentness(current,frame);
+        _waypointsInCMap.back()->SetCaption(caption);
+    }
+
+}
+
+void jpsDatamanager::ParseConnectionsInCMap(QXmlStreamReader &xmlReader, const int &frame)
+{
+    int id1 = xmlReader.attributes().value("Landmark_WaypointID1").toInt();
+    int id2 = xmlReader.attributes().value("Landmark_WaypointID2").toInt();
+    std::shared_ptr<jpsWaypoint> waypoint1 = nullptr;
+    std::shared_ptr<jpsWaypoint> waypoint2 = nullptr;
+
+
+    for (ptrWaypoint waypoint:_waypointsInCMap)
+    {
+        if (waypoint->GetId()==id1)
+        {
+            waypoint1=waypoint;
+
+        }
+        else if (waypoint->GetId()==id2)
+        {
+            waypoint2=waypoint;
+
+        }
 
     }
+
+    ptrConnection con = std::make_shared<jpsConnection>(waypoint1,waypoint2,frame);
+    if (waypoint1!=nullptr && waypoint2!=nullptr)
+    {
+        for (ptrConnection conInMap : _connectionsInCMap)
+        {
+            if (con->operator ==(conInMap))
+            {
+                conInMap->SetLastFrame(frame);
+
+                return;
+            }
+        }
+
+        _connectionsInCMap.push_back(con);
+    }
+
+
 }
 
 void jpsDatamanager::ShowCMapFrame(const int& frame) const
 {
     mView->ShowYAHPointer(_yahPointer->GetPosWhenFrame(frame),_yahPointer->GetDirWhenFrame(frame));
 
-    QList<jpsWaypoint* > wayPCandidates;
+    QList<ptrWaypoint > wayPCandidates;
 
-    for (jpsWaypoint* waypoint:_waypointsInCMap)
+    for (ptrWaypoint waypoint:_waypointsInCMap)
     {
         if (waypoint->OccursInFrame(frame))
         {
@@ -1630,9 +1682,18 @@ void jpsDatamanager::ShowCMapFrame(const int& frame) const
                 waypoint->SetText("Already visited");
             else
                 waypoint->SetText("");
-
         }
     }
+    QList<ptrConnection> conCandidates;
+    for (ptrConnection connection:_connectionsInCMap)
+    {
+        if (connection->OccursInFrame(frame))
+        {
+            conCandidates.push_back(connection);
+        }
+    }
+
+    mView->ShowConnections(conCandidates);
     mView->ShowWaypoints(wayPCandidates);
 
 }
diff --git a/src/datamanager.h b/src/datamanager.h
index a82f8b9..fc10a4e 100644
--- a/src/datamanager.h
+++ b/src/datamanager.h
@@ -41,12 +41,17 @@
 #include "jpsobstacle.h"
 #include "GraphicView.h"
 #include "jpsyahpointer.h"
+#include "jpsconnection.h"
 
 
 #include "../dxflib/src/dl_creationadapter.h"
 #include "../dxflib/src/dl_dxf.h"
 
 
+using ptrConnection = std::shared_ptr<jpsConnection>;
+using ptrWaypoint = std::shared_ptr<jpsWaypoint>;
+
+
 class jpsDatamanager: public DL_CreationAdapter
 {
 public:
@@ -138,6 +143,7 @@ class jpsDatamanager: public DL_CreationAdapter
     void ParseYAHPointer(QXmlStreamReader &xmlReader, const int &frame);
     void ParseLandmarksInCMap(QXmlStreamReader &xmlReader, const int &frame);
     void ParseWaypointInCMap(QXmlStreamReader &xmlReader, const int &frame);
+    void ParseConnectionsInCMap(QXmlStreamReader &xmlReader, const int &frame);
 
     //Show Cognitive Map
     void ShowCMapFrame(const int& frame) const;
@@ -158,7 +164,8 @@ class jpsDatamanager: public DL_CreationAdapter
 
     //CognitiveMap
     QList<jpsLandmark* > _landmarksInCMap;
-    QList<jpsWaypoint* > _waypointsInCMap;
+    QList<ptrWaypoint > _waypointsInCMap;
+    QList<ptrConnection> _connectionsInCMap;
     jpsYAHPointer* _yahPointer;
     double _frameRate;
     int _lastCMapFrame;
diff --git a/src/jpsconnection.cpp b/src/jpsconnection.cpp
new file mode 100644
index 0000000..a2ccecc
--- /dev/null
+++ b/src/jpsconnection.cpp
@@ -0,0 +1,61 @@
+#include "jpsconnection.h"
+
+jpsConnection::jpsConnection(ptrWaypoint waypoint1, ptrWaypoint waypoint2, const int &frameID)
+{
+    _waypoint1=waypoint1;
+    _waypoint2=waypoint2;
+    _firstFrame=frameID;
+    _lastFrame=frameID;
+}
+
+jpsConnection::~jpsConnection()
+{
+
+}
+
+std::pair<ptrWaypoint, ptrWaypoint> jpsConnection::GetWaypoints() const
+{
+    return std::make_pair(_waypoint1,_waypoint2);
+}
+
+bool jpsConnection::OccursInFrame(const int& frameID) const
+{
+    if (frameID>=_firstFrame && frameID<=_lastFrame)
+    {
+        return true;
+    }
+    else
+        return false;
+}
+
+void jpsConnection::SetFirstFrame(const int &frameID)
+{
+    _firstFrame=frameID;
+}
+
+void jpsConnection::SetLastFrame(const int &frameID)
+{
+    _lastFrame=frameID;
+}
+
+const int &jpsConnection::GetFirstFrame() const
+{
+    return _firstFrame;
+}
+
+const int &jpsConnection::GetLastFrame() const
+{
+    return _lastFrame;
+}
+
+bool jpsConnection::operator == (const ptrConnection con2) const
+{
+    if ((con2->GetWaypoints().first==_waypoint1 && con2->GetWaypoints().second==_waypoint2)
+            || (con2->GetWaypoints().second==_waypoint1 && con2->GetWaypoints().first==_waypoint2))
+    {
+        return true;
+    }
+    else
+        return false;
+}
+
diff --git a/src/jpsconnection.h b/src/jpsconnection.h
new file mode 100644
index 0000000..8359d4e
--- /dev/null
+++ b/src/jpsconnection.h
@@ -0,0 +1,33 @@
+#ifndef JPSCONNECTION_H
+#define JPSCONNECTION_H
+
+#include <memory>
+#include <utility>
+#include "jpswaypoint.h"
+
+using ptrWaypoint = std::shared_ptr<jpsWaypoint>;
+
+
+class jpsConnection
+{
+using ptrConnection = std::shared_ptr<jpsConnection>;
+public:
+    jpsConnection(ptrWaypoint waypoint1, ptrWaypoint waypoint2, const int& frameID=-1);
+    ~jpsConnection();
+    std::pair<ptrWaypoint,ptrWaypoint> GetWaypoints() const;
+    //Occurence
+    bool OccursInFrame(const int &frameID) const;
+    void SetFirstFrame(const int &frameID);
+    void SetLastFrame(const int &frameID);
+    const int& GetFirstFrame() const;
+    const int& GetLastFrame() const;
+    // Operator overload
+    bool operator ==(const ptrConnection con2) const;
+private:
+    ptrWaypoint _waypoint1;
+    ptrWaypoint _waypoint2;
+    int _firstFrame;
+    int _lastFrame;
+};
+
+#endif // JPSCONNECTION_H
diff --git a/src/jpslandmark.cpp b/src/jpslandmark.cpp
index 637b737..b109cf3 100644
--- a/src/jpslandmark.cpp
+++ b/src/jpslandmark.cpp
@@ -100,27 +100,27 @@ int jpsLandmark::get_visibility()
     return _visibility;
 }
 
-void jpsLandmark::AddWaypoint(jpsWaypoint *waypoint)
+void jpsLandmark::AddWaypoint(ptrWaypoint waypoint)
 {
     _waypoints.push_back(waypoint);
 }
 
-void jpsLandmark::RemoveWaypoint(jpsWaypoint *waypoint)
+void jpsLandmark::RemoveWaypoint(ptrWaypoint waypoint)
 {
-    delete waypoint;
+    delete waypoint.get();
     _waypoints.removeOne(waypoint);
 }
 
-QList<jpsWaypoint *> jpsLandmark::GetWaypoints()
+QList<ptrWaypoint> jpsLandmark::GetWaypoints()
 {
     return _waypoints;
 }
 
 void jpsLandmark::RemoveAllWaypoints()
 {
-    for (jpsWaypoint* waypoint:_waypoints)
+    for (ptrWaypoint waypoint:_waypoints)
     {
-        delete waypoint;
+        delete waypoint.get();
     }
     _waypoints.clear();
 }
diff --git a/src/jpslandmark.h b/src/jpslandmark.h
index 3cff6d3..8bbf20f 100644
--- a/src/jpslandmark.h
+++ b/src/jpslandmark.h
@@ -29,9 +29,11 @@
 #ifndef JPSLANDMARK_H
 #define JPSLANDMARK_H
 #include <QPointF>
+#include <memory>
 #include "rooms.h"
 #include "jpswaypoint.h"
 
+using ptrWaypoint = std::shared_ptr<jpsWaypoint>;
 
 class jpsLandmark
 {
@@ -52,9 +54,9 @@ class jpsLandmark
     jpsRoom *get_room();
     int get_visibility();
     //Waypoint handling
-    void AddWaypoint(jpsWaypoint* waypoint);
-    void RemoveWaypoint(jpsWaypoint* waypoint);
-    QList<jpsWaypoint* > GetWaypoints();
+    void AddWaypoint(ptrWaypoint waypoint);
+    void RemoveWaypoint(ptrWaypoint waypoint);
+    QList<ptrWaypoint> GetWaypoints();
     void RemoveAllWaypoints();
 
 
@@ -64,7 +66,7 @@ class jpsLandmark
     jpsRoom* _room;
     int _visibility;
     QGraphicsPixmapItem* _pixmapItem;
-    QList<jpsWaypoint* > _waypoints;
+    QList<ptrWaypoint > _waypoints;
 
 };
 
diff --git a/src/jpswaypoint.cpp b/src/jpswaypoint.cpp
index aa8fa49..109c26b 100644
--- a/src/jpswaypoint.cpp
+++ b/src/jpswaypoint.cpp
@@ -34,19 +34,20 @@ jpsWaypoint::jpsWaypoint()
 
 }
 
-jpsWaypoint::jpsWaypoint(const QPointF &point, const qreal &rA, const qreal &rB, const int &id, const QString &caption)
+jpsWaypoint::jpsWaypoint(const QPointF &point, const qreal &rA, const qreal &rB, const int &id, const QString &type)
 {
     _pos=point;
     _a=rA;
     _b=rB;
     _id=id;
-    _caption=caption;
+    _type=type;
     _rect=QRectF(point.x()-rA,point.y()-rB,rA*2,rB*2);
     _currentness=false;
     _FFcurrentness=-1;
     _LFcurrentness=-1;
     _lastFrame=-1;
     _firstFrame=-1;
+    _caption="";
 }
 
 jpsWaypoint::jpsWaypoint(QRectF rect, const int &id)
@@ -120,6 +121,11 @@ const QString &jpsWaypoint::GetCaption() const
     return _caption;
 }
 
+const QString &jpsWaypoint::GetType() const
+{
+    return _type;
+}
+
 
 void jpsWaypoint::SetPos(QPointF point)
 {
@@ -150,6 +156,11 @@ void jpsWaypoint::SetCaption(const QString &string)
     _caption=string;
 }
 
+void jpsWaypoint::SetType(const QString &type)
+{
+    _type=type;
+}
+
 const int &jpsWaypoint::GetFirstFrame() const
 {
     return _firstFrame;
@@ -163,11 +174,13 @@ const int &jpsWaypoint::GetLastFrame() const
 void jpsWaypoint::SetFirstFrame(const int &frame)
 {
     _firstFrame=frame;
+
 }
 
 void jpsWaypoint::SetLastFrame(const int &frame)
 {
     _lastFrame=frame;
+
 }
 
 bool jpsWaypoint::OccursInFrame(const int &frame) const
@@ -230,7 +243,7 @@ void jpsWaypoint::SetText(const QString &text)
 
 bool jpsWaypoint::Visited(const int &frameID) const
 {
-    if (frameID > _LFcurrentness && _lastFrame!=-1)
+    if (frameID > _LFcurrentness && _LFcurrentness!=-1)
         return true;
 
     else
diff --git a/src/jpswaypoint.h b/src/jpswaypoint.h
index bce2d2f..39bb917 100644
--- a/src/jpswaypoint.h
+++ b/src/jpswaypoint.h
@@ -35,7 +35,7 @@ class jpsWaypoint
 {
 public:
     jpsWaypoint();
-    jpsWaypoint(const QPointF& point,const qreal& rA, const qreal& rB, const int& id=0, const QString& caption="Waypoint");
+    jpsWaypoint(const QPointF& point,const qreal& rA, const qreal& rB, const int& id=0, const QString& type="Waypoint");
     jpsWaypoint(QRectF rect, const int& id=0);
     jpsWaypoint(QGraphicsEllipseItem* ellipseItem, const int& id=0);
     ~jpsWaypoint();
@@ -47,6 +47,7 @@ class jpsWaypoint
     const int& GetId() const;
     QGraphicsEllipseItem* GetEllipseItem();
     const QString& GetCaption() const;
+    const QString& GetType() const;
 
     //Setter
     void SetPos(QPointF point);
@@ -54,6 +55,7 @@ class jpsWaypoint
     void SetEllipseItem(QGraphicsEllipseItem* ellipseItem);
     void SetId(const int& id);
     void SetCaption(const QString& string);
+    void SetType(const QString& type);
 
     //Occurence
     const int& GetFirstFrame() const;
@@ -83,6 +85,7 @@ class jpsWaypoint
     double _b;
     int _id;
     QString _caption;
+    QString _type;
 
     //Occurence
     int _firstFrame;
diff --git a/src/widgetlandmark.cpp b/src/widgetlandmark.cpp
index daf2308..6e2ce75 100644
--- a/src/widgetlandmark.cpp
+++ b/src/widgetlandmark.cpp
@@ -164,7 +164,7 @@ void widgetLandmark::AddAssociation()
     {
         int cLanRow=ui->list_landmarks->currentIndex();
 
-        _dmanager->get_landmarks()[cLanRow]->AddWaypoint(new jpsWaypoint(_gview->GetCurrentSelectRect()->rect(),_waypointIDCounter));
+        _dmanager->get_landmarks()[cLanRow]->AddWaypoint(std::make_shared<jpsWaypoint>(_gview->GetCurrentSelectRect()->rect(),_waypointIDCounter));
 
         ShowAssociations();
         _waypointIDCounter++;
@@ -178,9 +178,9 @@ void widgetLandmark::ShowAssociations()
     if (ui->list_landmarks->currentIndex()!=-1)
     {
         int cLanRow=ui->list_landmarks->currentIndex();
-        QList<jpsWaypoint *> waypoints = _dmanager->get_landmarks()[cLanRow]->GetWaypoints();
+        QList<ptrWaypoint> waypoints = _dmanager->get_landmarks()[cLanRow]->GetWaypoints();
 
-        for (jpsWaypoint* waypoint:waypoints)
+        for (ptrWaypoint waypoint:waypoints)
         {
             QPointF pos = waypoint->GetPos();
             QString name = "Waypoint: x: "+QString::number(pos.x())+"y: "+QString::number(pos.y());

From 901448364b5821555479f2a557b42f884996f709 Mon Sep 17 00:00:00 2001
From: Mohcine Chraibi <m.chraibi@fz-juelich.de>
Date: Wed, 4 Nov 2015 13:16:32 +0100
Subject: [PATCH 21/53] Add missing include in jpsyahpointer.h

- silence some cmake warnings (policy stuff)

- FIXME: The code does NOT compile with Qt4.
---
 CMakeLists.txt      | 40 ++++++++++++++++++++++------------------
 src/jpsyahpointer.h |  2 +-
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 567275f..b09c304 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,13 +7,17 @@
 #================
 # 1. CMAKE_BUILD_TYPE=Release (default Debug)
 # 2. DESIRED_QT_VERSION=5 (default 4)
+# example: >> cmake  -DDESIRED_QT_VERSION=5  -DCMAKE_PREFIX_PATH=~/Qt/5.5/clang_64 ..
 
+cmake_minimum_required(VERSION 2.8.9)
 IF (POLICY CMP0048) # in CMake 3.0.0+
   CMAKE_POLICY (SET CMP0048 OLD) # keep PROJECT() from clearing VERSION variables
 ENDIF (POLICY CMP0048)
-
+IF (POLICY CMP0043) # in CMake 3.0.0+
+  CMAKE_POLICY (SET CMP0043 OLD) # keep PROJECT() from clearing VERSION variables
+ENDIF (POLICY CMP0043)
 project(JPSeditor)
-cmake_minimum_required(VERSION 2.8.9)
+
 
 
 set(README_FILE "${CMAKE_SOURCE_DIR}/README.md")
@@ -84,7 +88,7 @@ set( SRCS
     src/mainWindow.cpp
     src/main.cpp 
     src/GraphicView.cpp
-	src/graphicscene.cpp
+    src/graphicscene.cpp
     src/roomwidget.cpp
     src/rooms.cpp
     src/datamanager.cpp  
@@ -92,12 +96,12 @@ set( SRCS
     src/jpsLineItem.cpp  
     src/jpsexit.cpp
     src/jpsobstacle.cpp 
-	src/jpslandmark.cpp
-	src/jpswaypoint.cpp
-	src/widgetlandmark.cpp
-	src/widgetsettings.cpp
-	src/jpsyahpointer.cpp
-	src/jpsconnection.cpp
+    src/jpslandmark.cpp
+    src/jpswaypoint.cpp
+    src/widgetlandmark.cpp
+    src/widgetsettings.cpp
+    src/jpsyahpointer.cpp
+    src/jpsconnection.cpp
     dxflib/src/dl_writer_ascii.cpp
     dxflib/src/dl_dxf.cpp
   )  
@@ -105,7 +109,7 @@ set( SRCS
 set( HDR
     src/mainWindow.h 
     src/GraphicView.h
-	src/graphicscene.h
+    src/graphicscene.h
     src/roomwidget.h
     src/rooms.h
     src/datamanager.h  
@@ -113,12 +117,12 @@ set( HDR
     src/jpsLineItem.h  
     src/jpsexit.h     
     src/jpsobstacle.h
-	src/jpslandmark.h
-	src/jpswaypoint.h
-	src/widgetlandmark.h
-	src/widgetsettings.h
-	src/jpsyahpointer.h
-	src/jpsconnection.h
+    src/jpslandmark.h
+    src/jpswaypoint.h
+    src/widgetlandmark.h
+    src/widgetsettings.h
+    src/jpsyahpointer.h
+    src/jpsconnection.h
     dxflib/src/dl_writer_ascii.h
     dxflib/src/dl_writer.h
     dxflib/src/dl_global.h
@@ -137,8 +141,8 @@ set( HDR
 set( UIS
     forms/mainwindow.ui
     forms/roomwidget.ui
-	forms/widgetlandmark.ui
-	forms/widgetsettings.ui
+    forms/widgetlandmark.ui
+    forms/widgetsettings.ui
   )
 
 # and finally a resource file
diff --git a/src/jpsyahpointer.h b/src/jpsyahpointer.h
index ad61057..ef1e002 100644
--- a/src/jpsyahpointer.h
+++ b/src/jpsyahpointer.h
@@ -1,7 +1,7 @@
 #ifndef JPSYAHPOINTER_H
 #define JPSYAHPOINTER_H
 #include <QPointF>
-
+#include <vector>
 class jpsYAHPointer
 {
 public:

From 072c17f7227bde3800daff7b4625ebb8cf4309b1 Mon Sep 17 00:00:00 2001
From: Mohcine Chraibi <m.chraibi@fz-juelich.de>
Date: Wed, 4 Nov 2015 13:54:01 +0100
Subject: [PATCH 22/53] fix ticket #34

- todo: check how to replace ui->classBox->setCurrentText
  in Qt4
---
 forms/widgetsettings.ui |  2 +-
 src/datamanager.cpp     | 34 +++++++++++++++++-----------------
 src/datamanager.h       |  2 +-
 src/roomwidget.cpp      |  3 +--
 4 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/forms/widgetsettings.ui b/forms/widgetsettings.ui
index 1eabe5a..95e275b 100644
--- a/forms/widgetsettings.ui
+++ b/forms/widgetsettings.ui
@@ -89,7 +89,7 @@
     </property>
    </widget>
   </widget>
-  <widget class="QWidget" name="tab">
+  <widget class="QWidget" name="tab2">
    <attribute name="title">
     <string>Tab 2</string>
    </attribute>
diff --git a/src/datamanager.cpp b/src/datamanager.cpp
index 32bac34..7135fbf 100644
--- a/src/datamanager.cpp
+++ b/src/datamanager.cpp
@@ -1501,7 +1501,7 @@ bool jpsDatamanager::ParseCogMap(QFile &file)
 
 void jpsDatamanager::ParseFrames(QXmlStreamReader &xmlReader)
 {
-    int frameID= xmlReader.attributes().value("ID").toInt();
+      int frameID= xmlReader.attributes().value("ID").toString().toInt();
 
     while(!(xmlReader.tokenType() == QXmlStreamReader::EndElement &&
                 xmlReader.name() == "frame"))
@@ -1535,9 +1535,9 @@ void jpsDatamanager::ParseFrames(QXmlStreamReader &xmlReader)
 
 void jpsDatamanager::ParseYAHPointer(QXmlStreamReader &xmlReader, const int& frame)
 {
-    qreal x = xmlReader.attributes().value("x").toFloat();
-    qreal y = xmlReader.attributes().value("y").toFloat();
-    qreal angle = xmlReader.attributes().value("dir").toFloat();
+    qreal x = xmlReader.attributes().value("x").toString().toFloat();
+    qreal y = xmlReader.attributes().value("y").toString().toFloat();
+    qreal angle = xmlReader.attributes().value("dir").toString().toFloat();
     if (_yahPointer==nullptr)
     {
         _yahPointer = new jpsYAHPointer(x,y,angle);
@@ -1558,11 +1558,11 @@ void jpsDatamanager::ParseLandmarksInCMap(QXmlStreamReader &xmlReader, const int
 
     bool wayPInList=false;
 
-    int id = xmlReader.attributes().value("ID").toInt();
-    qreal x = xmlReader.attributes().value("x").toFloat();
-    qreal y = xmlReader.attributes().value("y").toFloat();
-    qreal rA = xmlReader.attributes().value("rA").toFloat();
-    qreal rB = xmlReader.attributes().value("rB").toFloat();
+    int id = xmlReader.attributes().value("ID").toString().toInt();
+    qreal x = xmlReader.attributes().value("x").toString().toFloat();
+    qreal y = xmlReader.attributes().value("y").toString().toFloat();
+    qreal rA = xmlReader.attributes().value("rA").toString().toFloat();
+    qreal rB = xmlReader.attributes().value("rB").toString().toFloat();
     QString caption = xmlReader.attributes().value("caption").toString();
 
     for (ptrWaypoint waypoint:_waypointsInCMap)
@@ -1587,13 +1587,13 @@ void jpsDatamanager::ParseWaypointInCMap(QXmlStreamReader &xmlReader, const int&
 {
     bool wayPInList=false;
 
-    int id = xmlReader.attributes().value("ID").toInt();
-    qreal x = xmlReader.attributes().value("x").toFloat();
-    qreal y = xmlReader.attributes().value("y").toFloat();
-    qreal rA = xmlReader.attributes().value("rA").toFloat();
-    qreal rB = xmlReader.attributes().value("rB").toFloat();
+    int id = xmlReader.attributes().value("ID").toString().toInt();
+    qreal x = xmlReader.attributes().value("x").toString().toFloat();
+    qreal y = xmlReader.attributes().value("y").toString().toFloat();
+    qreal rA = xmlReader.attributes().value("rA").toString().toFloat();
+    qreal rB = xmlReader.attributes().value("rB").toString().toFloat();
     QString caption = xmlReader.attributes().value("caption").toString();
-    bool current = xmlReader.attributes().value("current").toInt();
+    bool current = xmlReader.attributes().value("current").toString().toInt();
 
     for (ptrWaypoint waypoint:_waypointsInCMap)
     {
@@ -1624,8 +1624,8 @@ void jpsDatamanager::ParseWaypointInCMap(QXmlStreamReader &xmlReader, const int&
 
 void jpsDatamanager::ParseConnectionsInCMap(QXmlStreamReader &xmlReader, const int &frame)
 {
-    int id1 = xmlReader.attributes().value("Landmark_WaypointID1").toInt();
-    int id2 = xmlReader.attributes().value("Landmark_WaypointID2").toInt();
+    int id1 = xmlReader.attributes().value("Landmark_WaypointID1").toString().toInt();
+    int id2 = xmlReader.attributes().value("Landmark_WaypointID2").toString().toInt();
     std::shared_ptr<jpsWaypoint> waypoint1 = nullptr;
     std::shared_ptr<jpsWaypoint> waypoint2 = nullptr;
 
diff --git a/src/datamanager.h b/src/datamanager.h
index fc10a4e..86f0fc4 100644
--- a/src/datamanager.h
+++ b/src/datamanager.h
@@ -30,7 +30,7 @@
 #ifndef DATAMANAGER_H
 #define DATAMANAGER_H
 
-#include<QtGui>
+#include <QtGui>
 #include <QApplication>
 #include <QGraphicsView>
 #include <QMessageBox>
diff --git a/src/roomwidget.cpp b/src/roomwidget.cpp
index 4ac0f82..793e55f 100644
--- a/src/roomwidget.cpp
+++ b/src/roomwidget.cpp
@@ -800,8 +800,7 @@ void roomWidget::ShowRoomType(int& cRow) const
 {
     QString type = datamanager->get_roomlist()[cRow]->get_type();
 
-    ui->classBox->setCurrentText(type);
-
+    // ui->classBox->setCurrentText(type);
 }
 
 

From dbf613d619524f0f8e56b7778874a588255f2fad Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Wed, 25 Nov 2015 10:52:59 +0100
Subject: [PATCH 23/53] working on issue: confirm before close window

---
 forms/mainwindow.ui |  8 ++++----
 src/mainWindow.cpp  | 11 ++++++++++-
 src/mainWindow.h    |  3 +++
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/forms/mainwindow.ui b/forms/mainwindow.ui
index 2dff77d..e3be1b6 100644
--- a/forms/mainwindow.ui
+++ b/forms/mainwindow.ui
@@ -408,7 +408,7 @@
     <bool>true</bool>
    </property>
    <property name="enabled">
-    <bool>false</bool>
+    <bool>true</bool>
    </property>
    <property name="icon">
     <iconset resource="Ressource.qrc">
@@ -421,7 +421,7 @@
     <string>Landmark</string>
    </property>
    <property name="visible">
-    <bool>false</bool>
+    <bool>true</bool>
    </property>
   </action>
   <action name="actionLandmarkWidget">
@@ -429,7 +429,7 @@
     <bool>true</bool>
    </property>
    <property name="enabled">
-    <bool>false</bool>
+    <bool>true</bool>
    </property>
    <property name="icon">
     <iconset resource="Ressource.qrc">
@@ -442,7 +442,7 @@
     <string>LandmarkSpecs</string>
    </property>
    <property name="visible">
-    <bool>false</bool>
+    <bool>true</bool>
    </property>
   </action>
   <action name="actionanglesnap">
diff --git a/src/mainWindow.cpp b/src/mainWindow.cpp
index bc7e99e..16967f1 100644
--- a/src/mainWindow.cpp
+++ b/src/mainWindow.cpp
@@ -88,7 +88,7 @@ MWindow :: MWindow() {
 
     //Signals and Slots
     // Tab File
-    connect(actionBeenden, SIGNAL(triggered(bool)),qApp,SLOT(quit()));
+    connect(actionBeenden, SIGNAL(triggered(bool)),this,SLOT(quit()));//qApp,SLOT(quit()));
     connect(action_ffnen,SIGNAL(triggered(bool)),this,SLOT(openFile()));
     connect(action_ffnen_xml,SIGNAL(triggered(bool)),this,SLOT(openFileXML()));
     connect(actionSpeichern,SIGNAL(triggered(bool)),this,SLOT(saveFile()));
@@ -199,6 +199,15 @@ void MWindow::UpdateCMap()
     dmanager->ShowCMapFrame(_cMapFrame);
 }
 
+void MWindow::quit()
+{
+    //MessageBox
+    //Wenn ja.
+    qApp->quit();
+    //Wenn nein
+    //return to app
+}
+
 void MWindow::add_landmark()
 {
     jpsLandmark* landmark = mview->get_landmarks().last();
diff --git a/src/mainWindow.h b/src/mainWindow.h
index 1215430..b0258a9 100644
--- a/src/mainWindow.h
+++ b/src/mainWindow.h
@@ -118,6 +118,9 @@ protected slots:
     void RunCMap();
     void UpdateCMap();
 
+    //quit
+    void quit();
+
 
 };
 

From dda2691e2b0c52db67f9d8d2dfb14198f1dea7ed Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Tue, 1 Dec 2015 16:00:42 +0100
Subject: [PATCH 24/53] working on the visulization of the origing

---
 forms/mainwindow.ui |  6 ++++
 src/GraphicView.cpp | 68 +++++++++++++++++++++++++++++++++++----------
 src/GraphicView.h   |  3 +-
 src/mainWindow.cpp  |  6 ++++
 src/mainWindow.h    |  1 +
 5 files changed, 68 insertions(+), 16 deletions(-)

diff --git a/forms/mainwindow.ui b/forms/mainwindow.ui
index e3be1b6..e67b2c0 100644
--- a/forms/mainwindow.ui
+++ b/forms/mainwindow.ui
@@ -69,6 +69,7 @@
      <string>View</string>
     </property>
     <addaction name="actionRotate_90_deg_clockwise"/>
+    <addaction name="actionShow_Point_of_Origin"/>
    </widget>
    <widget class="QMenu" name="menuCognitive_Map">
     <property name="enabled">
@@ -497,6 +498,11 @@
     <string>Run visualisation</string>
    </property>
   </action>
+  <action name="actionShow_Point_of_Origin">
+   <property name="text">
+    <string>Show Point of Origin</string>
+   </property>
+  </action>
  </widget>
  <resources>
   <include location="Ressource.qrc"/>
diff --git a/src/GraphicView.cpp b/src/GraphicView.cpp
index 5400ad2..47b3d69 100644
--- a/src/GraphicView.cpp
+++ b/src/GraphicView.cpp
@@ -102,12 +102,6 @@ jpsGraphicsView::jpsGraphicsView(QWidget* parent):QGraphicsView(parent)
     setScene(Scene);
     setSceneRect(0, 0, 1920, 1080);
 
-    //create_grid();
-
-    //Origin
-
-    //origin.push_back(Scene->addLine(1,1,1/gl_scale_f*0.02,1,QPen(Qt::black,0)));
-    //origin.push_back(Scene->addLine(1,1,1,1/gl_scale_f*0.02,QPen(Qt::black,0)));
 }
 
 jpsGraphicsView::~jpsGraphicsView()
@@ -1066,6 +1060,9 @@ void jpsGraphicsView::zoom(int delta)
 
     setTransformationAnchor(QGraphicsView::AnchorUnderMouse);
 
+    //exclude origin from scaling
+    ShowOrigin();
+
     // Scale the view / do the zoom
     double scaleFactor = 1.15;
     if(delta > 0)
@@ -1097,6 +1094,9 @@ void jpsGraphicsView::zoom(int delta)
         //create_grid();
     }
 
+    //set origin back to the scene
+    ShowOrigin();
+
 }
 
 void jpsGraphicsView::translations(QPointF old_pos)
@@ -1182,6 +1182,10 @@ void jpsGraphicsView::translations(QPointF old_pos)
         lineItem->setTransform(QTransform::fromTranslate(pos.x()-old_pos.x(),pos.y()-old_pos.y()), true);
     }
 
+    for (QGraphicsLineItem* lineItem:_origin)
+    {
+       lineItem->setTransform(QTransform::fromTranslate(pos.x()-old_pos.x(),pos.y()-old_pos.y()), true);
+    }
 }
 
 void jpsGraphicsView::AutoZoom()
@@ -1192,8 +1196,8 @@ void jpsGraphicsView::AutoZoom()
             line_vector[0]->get_line()->line().p1().y());
     for (jpsLineItem* line:line_vector)
     {
-        ///x
-        ///p1
+        //x
+        //p1
         if (line->get_line()->line().p1().x()<min.x())
         {
             min.setX(line->get_line()->line().p1().x());
@@ -1203,7 +1207,7 @@ void jpsGraphicsView::AutoZoom()
             max.setX(line->get_line()->line().p1().x());
         }
 
-        ///p2
+        //p2
         if (line->get_line()->line().p2().x()<min.x())
         {
             min.setX(line->get_line()->line().p2().x());
@@ -1213,8 +1217,8 @@ void jpsGraphicsView::AutoZoom()
             max.setX(line->get_line()->line().p2().x());
         }
 
-        ///y
-        ///p1
+        //y
+        //p1
         if (line->get_line()->line().p1().y()<min.y())
         {
             min.setY(line->get_line()->line().p1().y());
@@ -1237,17 +1241,17 @@ void jpsGraphicsView::AutoZoom()
     //QPointF center((min.x()+max.x())/2.0,(min.y()+max.y())/2.0);
 
 
-    ///scaling
+    //scaling
     qreal width = (max.x()-min.x());
     qreal height = (max.y()-min.y());
-    /// To ensure the functionality of fitInView
+    // To ensure the functionality of fitInView
     this->setSceneRect(min.x(),min.y(),width,height);
     this->fitInView(min.x(),min.y(),width,height,Qt::KeepAspectRatio);
 
-    ///adapting gl_scale_f
+    //adapting gl_scale_f
     gl_scale_f=1/this->transform().m11();
 
-    ///translations
+    //translations
     QPointF old_pos;
     old_pos.setX(pos.x()+translation_x);
     old_pos.setY(pos.y()+translation_y);
@@ -1281,6 +1285,40 @@ qreal jpsGraphicsView::CalcGridSize()
 
 }
 
+void jpsGraphicsView::ShowOrigin()
+{
+    if (_origin.isEmpty())
+    {
+        _origin.push_back(Scene->addLine(1,1,1/gl_scale_f*0.02,1,QPen(Qt::black,0.025)));
+        _origin.push_back(Scene->addLine(1,1,1,1/gl_scale_f*0.02,QPen(Qt::black,0.025)));
+        _origin.push_back(Scene->addLine(1,1/gl_scale_f*0.02,1-1/gl_scale_f*0.001,1/gl_scale_f*0.02-1/gl_scale_f*0.001,QPen(Qt::black,0.025)));
+        _origin.push_back(Scene->addLine(1,1/gl_scale_f*0.02,1+1/gl_scale_f*0.001,1/gl_scale_f*0.02-1/gl_scale_f*0.001,QPen(Qt::black,0.025)));
+        _origin.push_back(Scene->addLine(1/gl_scale_f*0.02,1,1/gl_scale_f*0.02-1/gl_scale_f*0.001,1-1/gl_scale_f*0.001,QPen(Qt::black,0.025)));
+        _origin.push_back(Scene->addLine(1/gl_scale_f*0.02,1,1/gl_scale_f*0.02-1/gl_scale_f*0.001,1+1/gl_scale_f*0.001,QPen(Qt::black,0.025)));
+        _origin.push_back(Scene->addLine(1/gl_scale_f*0.02,1,1/gl_scale_f*0.02-1/gl_scale_f*0.001,1+1/gl_scale_f*0.001,QPen(Qt::black,0.025)));
+        //Y
+        _origin.push_back(Scene->addLine(1-1/gl_scale_f*0.001,1/gl_scale_f*0.015,1-1/gl_scale_f*0.0005,1/gl_scale_f*0.0155,QPen(Qt::black,0.025)));
+        _origin.push_back(Scene->addLine(1-1/gl_scale_f*0.001,1/gl_scale_f*0.015,1-1/gl_scale_f*0.0015,1/gl_scale_f*0.0155,QPen(Qt::black,0.025)));
+        _origin.push_back(Scene->addLine(1-1/gl_scale_f*0.001,1/gl_scale_f*0.015,1-1/gl_scale_f*0.001,1/gl_scale_f*0.014,QPen(Qt::black,0.025)));
+        //X
+        _origin.push_back(Scene->addLine(1/gl_scale_f*0.014,1-1/gl_scale_f*0.0017,1/gl_scale_f*0.015,1-1/gl_scale_f*0.0005,QPen(Qt::black,0.025)));
+        _origin.push_back(Scene->addLine(1/gl_scale_f*0.015,1-1/gl_scale_f*0.0017,1/gl_scale_f*0.014,1-1/gl_scale_f*0.0005,QPen(Qt::black,0.025)));
+
+        for (QGraphicsLineItem* lineItem:_origin)
+        {
+           lineItem->setTransform(QTransform::fromTranslate(translation_x,translation_y), true);
+        }
+    }
+    else
+    {
+        for (QGraphicsLineItem* line:_origin)
+        {
+            delete line;
+        }
+        _origin.clear();
+    }
+}
+
 void jpsGraphicsView::StatAssoDef()
 {
    _assoDef=!_assoDef;
diff --git a/src/GraphicView.h b/src/GraphicView.h
index 7fd798c..8fa7cfd 100644
--- a/src/GraphicView.h
+++ b/src/GraphicView.h
@@ -76,6 +76,7 @@ class jpsGraphicsView: public QGraphicsView {
     void translations(QPointF old_pos);
     void AutoZoom();
     qreal CalcGridSize();
+    void ShowOrigin();
 
     //Pos
     QPointF return_Pos();
@@ -150,7 +151,7 @@ public slots:
     QList<QPointF *> intersect_point_vector;
     //QList<QPointF> grid_point_vector;
     QList<jpsLineItem *> line_vector;
-    QList<QGraphicsLineItem *> origin;
+    QList<QGraphicsLineItem *> _origin;
     //QList<QList<jpsLineItem*> *> mainlist;
     QPointF pos;
     //QPointF* intersection_point;
diff --git a/src/mainWindow.cpp b/src/mainWindow.cpp
index 16967f1..c1ac7a9 100644
--- a/src/mainWindow.cpp
+++ b/src/mainWindow.cpp
@@ -113,6 +113,7 @@ MWindow :: MWindow() {
     connect(actionExit,SIGNAL(triggered(bool)),this,SLOT(dis_selectMode()));
     // Tab View
     connect(actionRotate_90_deg_clockwise,SIGNAL(triggered(bool)),this,SLOT(rotate()));
+    connect(actionShow_Point_of_Origin,SIGNAL(triggered(bool)),this,SLOT(ShowOrigin()));
     // Length edit
     connect(length_edit,SIGNAL(returnPressed()),this,SLOT(send_length()));
     // mview
@@ -232,6 +233,11 @@ void MWindow::Settings()
 
 }
 
+void MWindow::ShowOrigin()
+{
+    mview->ShowOrigin();
+}
+
 void MWindow::openFile(){
 
     QString fileName=QFileDialog::getOpenFileName(this,tr("Open DXF"),"",tr("DXF-Drawings (*.dxf)"));
diff --git a/src/mainWindow.h b/src/mainWindow.h
index b0258a9..d20fd4f 100644
--- a/src/mainWindow.h
+++ b/src/mainWindow.h
@@ -110,6 +110,7 @@ protected slots:
     void gridmode();
     void rotate();
     void Settings();
+    void ShowOrigin();
     
     //autosave
     void AutoSave();

From 4ce2180610550f67f6befed27ad6d2dd8ef547eb Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Wed, 2 Dec 2015 11:51:38 +0100
Subject: [PATCH 25/53] length of current line will be displayed; debugging

---
 src/GraphicView.cpp | 7 +++++++
 src/GraphicView.h   | 2 ++
 src/datamanager.cpp | 6 ++++++
 src/mainWindow.cpp  | 8 +++++++-
 src/mainWindow.h    | 1 +
 5 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/GraphicView.cpp b/src/GraphicView.cpp
index 47b3d69..5095a71 100644
--- a/src/GraphicView.cpp
+++ b/src/GraphicView.cpp
@@ -182,6 +182,8 @@ void jpsGraphicsView::mouseMoveEvent(QMouseEvent *mouseEvent)
         current_line->setLine(current_line->line().x1(),current_line->line().y1(),translated_pos.x(),translated_pos.y());
 
         //}
+        //As line length has changed
+        emit LineLengthChanged();
     }
     if (_currentVLine!=nullptr)
     {
@@ -987,6 +989,11 @@ void jpsGraphicsView::EditLine(QPointF* point)
     }
 }
 
+qreal jpsGraphicsView::ReturnLineLength()
+{
+    return current_line->line().length();
+}
+
 bool jpsGraphicsView::show_hide_roomCaption(QString name, qreal x, qreal y)
 {
     // if caption exits, it is supposed to be hided:
diff --git a/src/GraphicView.h b/src/GraphicView.h
index 8fa7cfd..6b009b5 100644
--- a/src/GraphicView.h
+++ b/src/GraphicView.h
@@ -103,6 +103,7 @@ class jpsGraphicsView: public QGraphicsView {
     void select_line(jpsLineItem *mline);
     void SetVLine();
     void EditLine(QPointF* point);
+    qreal ReturnLineLength();
 
     // Landmark
     void delete_landmark();
@@ -208,6 +209,7 @@ public slots:
     void remove_all();
     void landmark_added();
     void AssoDefCompleted();
+    void LineLengthChanged();
     //void DoubleClick();
 
 };
diff --git a/src/datamanager.cpp b/src/datamanager.cpp
index 7135fbf..d731d70 100644
--- a/src/datamanager.cpp
+++ b/src/datamanager.cpp
@@ -60,8 +60,14 @@ void jpsDatamanager::remove_room(jpsRoom *room)
 {
     //if (roomlist.size()>0)
     //{
+    int roomID=room->get_id();
     roomlist.removeOne(room);
     delete room;
+    //change IDs of other room with ID greater than roomID
+    for (jpsRoom* otherroom:roomlist)
+        if (otherroom->get_id()>roomID)
+            otherroom->set_id(otherroom->get_id()-1);
+
     room_id_counter-=1;
     //}
 }
diff --git a/src/mainWindow.cpp b/src/mainWindow.cpp
index c1ac7a9..53fdeab 100644
--- a/src/mainWindow.cpp
+++ b/src/mainWindow.cpp
@@ -55,7 +55,7 @@ MWindow :: MWindow() {
     _settings=nullptr;
 
     length_edit = new QLineEdit();
-    length_edit->setMaximumWidth(55);
+    length_edit->setMaximumWidth(75);
     label1 = new QLabel();
     label1->setMinimumWidth(90);
     label1->setText("Length of Line :");
@@ -123,6 +123,7 @@ MWindow :: MWindow() {
     connect(mview,SIGNAL(set_focus_textedit()),length_edit,SLOT(setFocus()));
     connect(mview,SIGNAL(mouse_moved()),this,SLOT(show_coords()));
     connect(mview,SIGNAL(landmark_added()),this,SLOT(add_landmark()));
+    connect(mview,SIGNAL(LineLengthChanged()),this,SLOT(ShowLineLength()));
     //connect(mview,SIGNAL(DoubleClick()),this,SLOT(en_selectMode()));
     // Autosave
     connect(timer, SIGNAL(timeout()), this, SLOT(AutoSave()));
@@ -512,6 +513,11 @@ void MWindow::remove_all_lines()
     dmanager->remove_all();
 }
 
+void MWindow::ShowLineLength()
+{
+    length_edit->setText(QString::number(mview->ReturnLineLength()));
+}
+
 void MWindow::rotate()
 {
     mview->rotate(-90);
diff --git a/src/mainWindow.h b/src/mainWindow.h
index d20fd4f..d22ce94 100644
--- a/src/mainWindow.h
+++ b/src/mainWindow.h
@@ -100,6 +100,7 @@ protected slots:
     void dis_selectMode();
     void lines_deleted();
     void remove_all_lines();
+    void ShowLineLength();
     
     //Room and landmark def
     void define_room();

From 7c818bcd7e02e7226db86377c041eb54ab85084d Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Fri, 4 Dec 2015 11:17:44 +0100
Subject: [PATCH 26/53] show and catch the origin

---
 src/GraphicView.cpp  | 55 ++++++++++++++++++++++++++------------------
 src/GraphicView.h    |  3 ---
 src/graphicscene.cpp |  4 +++-
 3 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/src/GraphicView.cpp b/src/GraphicView.cpp
index 5095a71..0bb0925 100644
--- a/src/GraphicView.cpp
+++ b/src/GraphicView.cpp
@@ -632,14 +632,14 @@ void jpsGraphicsView::use_gridmode()
 
 void jpsGraphicsView::catch_points()
 {
-    ///Searching for startpoints of all lines near the current cursor position
+    //Searching for startpoints of all lines near the current cursor position
     for (int i=0; i<line_vector.size(); ++i){
 
         // range chosen: 10 (-5:5) (has to be changed soon)
         if (line_vector[i]->get_line()->line().x1()>=(translated_pos.x()-catch_radius) && line_vector[i]->get_line()->line().x1()<=(translated_pos.x()+catch_radius) && line_vector[i]->get_line()->line().y1()>=(translated_pos.y()-catch_radius) && line_vector[i]->get_line()->line().y1()<=(translated_pos.y()+catch_radius)){
-            /// in this case the cursor is working with global coordinates. So the method 'mapToGlobal' must be used
+            // in this case the cursor is working with global coordinates. So the method 'mapToGlobal' must be used
 
-            ///to avoid the tracking of the coords of an edited line
+            //to avoid the tracking of the coords of an edited line
             if (line_vector[i]->get_line()==current_line)
             {
                 continue;
@@ -648,23 +648,23 @@ void jpsGraphicsView::catch_points()
             translated_pos.setX(line_vector[i]->get_line()->line().x1());
             translated_pos.setY(line_vector[i]->get_line()->line().y1());
             //cursor.setPos(mapToGlobal(QPoint(translate_back_x(line_vector[i].x1()),translate_back_y(line_vector[i].y1()))));
-            ///bool is used to tell paint device to draw a red rect if a point was tracked
+            //bool is used to tell paint device to draw a red rect if a point was tracked
             point_tracked=true;
             _currentTrackedPoint= &translated_pos;
             //QPen pen;
             //pen.setColor('red');
             if (current_rect==nullptr)
                 current_rect=Scene->addRect(translated_pos.x()+translation_x-10*gl_scale_f,translated_pos.y()+translation_y-10*gl_scale_f,20*gl_scale_f,20*gl_scale_f,QPen(Qt::red,0));
-            /// if a point was tracked there is no need to look for further points ( only one point can be tracked)
+            // if a point was tracked there is no need to look for further points ( only one point can be tracked)
 
             return;
         }
 
-        ///Searching for endpoints of all lines near the current cursor position
+        //Searching for endpoints of all lines near the current cursor position
         else if (line_vector[i]->get_line()->line().x2()>=(translated_pos.x()-catch_radius) && line_vector[i]->get_line()->line().x2()<=(translated_pos.x()+catch_radius) && line_vector[i]->get_line()->line().y2()>=(translated_pos.y()-catch_radius) && line_vector[i]->get_line()->line().y2()<=(translated_pos.y()+catch_radius)){
             // see above
 
-            ///to avoid the tracking of the coords of an edited line
+            //to avoid the tracking of the coords of an edited line
             if (line_vector[i]->get_line()==current_line)
             {
                 continue;
@@ -681,9 +681,9 @@ void jpsGraphicsView::catch_points()
             return;
         }
     }
-    /// if no start- or endpoint was tracked it is searched for intersections- Points
+    // if no start- or endpoint was tracked it is searched for intersections- Points
 
-    /// see above
+    // see above
     for (int j=0; j<intersect_point_vector.size(); j++)
     {
         if (intersect_point_vector[j]->x()>=(translated_pos.x()-catch_radius) && intersect_point_vector[j]->x()<=(translated_pos.x()+catch_radius) && intersect_point_vector[j]->y()>=(translated_pos.y()-catch_radius) && intersect_point_vector[j]->y()<=(translated_pos.y()+catch_radius))
@@ -696,6 +696,17 @@ void jpsGraphicsView::catch_points()
             return;
         }
     }
+
+    // Catch origin
+    if (!_origin.isEmpty())
+        if (std::fabs(translated_pos.x())<=catch_radius && std::fabs(translated_pos.y())<=catch_radius)
+        {
+            translated_pos.setX(0);
+            translated_pos.setY(0);
+            if (current_rect==nullptr)
+                current_rect=Scene->addRect(translated_pos.x()+translation_x-10*gl_scale_f,translated_pos.y()+translation_y-10*gl_scale_f,20*gl_scale_f,20*gl_scale_f,QPen(Qt::red,0));
+
+        }
     //Look for gridpoints
 
 //    for (auto &gridpoint: grid_point_vector)
@@ -720,7 +731,7 @@ void jpsGraphicsView::catch_points()
 //        }
 //    }
 
-    /// if no point was tracked bool is set back to false
+    // if no point was tracked bool is set back to false
     point_tracked=false;
     return;
 }
@@ -1296,20 +1307,20 @@ void jpsGraphicsView::ShowOrigin()
 {
     if (_origin.isEmpty())
     {
-        _origin.push_back(Scene->addLine(1,1,1/gl_scale_f*0.02,1,QPen(Qt::black,0.025)));
-        _origin.push_back(Scene->addLine(1,1,1,1/gl_scale_f*0.02,QPen(Qt::black,0.025)));
-        _origin.push_back(Scene->addLine(1,1/gl_scale_f*0.02,1-1/gl_scale_f*0.001,1/gl_scale_f*0.02-1/gl_scale_f*0.001,QPen(Qt::black,0.025)));
-        _origin.push_back(Scene->addLine(1,1/gl_scale_f*0.02,1+1/gl_scale_f*0.001,1/gl_scale_f*0.02-1/gl_scale_f*0.001,QPen(Qt::black,0.025)));
-        _origin.push_back(Scene->addLine(1/gl_scale_f*0.02,1,1/gl_scale_f*0.02-1/gl_scale_f*0.001,1-1/gl_scale_f*0.001,QPen(Qt::black,0.025)));
-        _origin.push_back(Scene->addLine(1/gl_scale_f*0.02,1,1/gl_scale_f*0.02-1/gl_scale_f*0.001,1+1/gl_scale_f*0.001,QPen(Qt::black,0.025)));
-        _origin.push_back(Scene->addLine(1/gl_scale_f*0.02,1,1/gl_scale_f*0.02-1/gl_scale_f*0.001,1+1/gl_scale_f*0.001,QPen(Qt::black,0.025)));
+        //Scene->DrawOrigin();
+        _origin.push_back(Scene->addLine(0,0,0,0+gl_scale_f*100,QPen(Qt::black,gl_scale_f*2)));
+        _origin.push_back(Scene->addLine(0,0+gl_scale_f*100,0-gl_scale_f*10,0+gl_scale_f*100-gl_scale_f*10,QPen(Qt::black,gl_scale_f*2)));
+        _origin.push_back(Scene->addLine(0,0+gl_scale_f*100,0+gl_scale_f*10,0+gl_scale_f*100-gl_scale_f*10,QPen(Qt::black,gl_scale_f*2)));
+        _origin.push_back(Scene->addLine(0,0,0+gl_scale_f*100,0,QPen(Qt::black,gl_scale_f*2)));
+        _origin.push_back(Scene->addLine(0+gl_scale_f*100,0,gl_scale_f*100-gl_scale_f*10,-gl_scale_f*10,QPen(Qt::black,gl_scale_f*2)));
+        _origin.push_back(Scene->addLine(0+gl_scale_f*100,0,gl_scale_f*100-gl_scale_f*10,+gl_scale_f*10,QPen(Qt::black,gl_scale_f*2)));
         //Y
-        _origin.push_back(Scene->addLine(1-1/gl_scale_f*0.001,1/gl_scale_f*0.015,1-1/gl_scale_f*0.0005,1/gl_scale_f*0.0155,QPen(Qt::black,0.025)));
-        _origin.push_back(Scene->addLine(1-1/gl_scale_f*0.001,1/gl_scale_f*0.015,1-1/gl_scale_f*0.0015,1/gl_scale_f*0.0155,QPen(Qt::black,0.025)));
-        _origin.push_back(Scene->addLine(1-1/gl_scale_f*0.001,1/gl_scale_f*0.015,1-1/gl_scale_f*0.001,1/gl_scale_f*0.014,QPen(Qt::black,0.025)));
+        _origin.push_back(Scene->addLine(0-gl_scale_f*10,gl_scale_f*100-gl_scale_f*50,0-gl_scale_f*5,gl_scale_f*100-gl_scale_f*45,QPen(Qt::black,gl_scale_f*2)));
+        _origin.push_back(Scene->addLine(0-gl_scale_f*10,gl_scale_f*100-gl_scale_f*50,0-gl_scale_f*15,gl_scale_f*100-gl_scale_f*45,QPen(Qt::black,gl_scale_f*2)));
+        _origin.push_back(Scene->addLine(0-gl_scale_f*10,gl_scale_f*100-gl_scale_f*50,0-gl_scale_f*10,gl_scale_f*100-gl_scale_f*60,QPen(Qt::black,gl_scale_f*2)));
         //X
-        _origin.push_back(Scene->addLine(1/gl_scale_f*0.014,1-1/gl_scale_f*0.0017,1/gl_scale_f*0.015,1-1/gl_scale_f*0.0005,QPen(Qt::black,0.025)));
-        _origin.push_back(Scene->addLine(1/gl_scale_f*0.015,1-1/gl_scale_f*0.0017,1/gl_scale_f*0.014,1-1/gl_scale_f*0.0005,QPen(Qt::black,0.025)));
+        _origin.push_back(Scene->addLine(0+gl_scale_f*40,0-gl_scale_f*15,gl_scale_f*50,-gl_scale_f*5,QPen(Qt::black,gl_scale_f*2)));
+        _origin.push_back(Scene->addLine(0+gl_scale_f*40,0-gl_scale_f*5,gl_scale_f*50,-gl_scale_f*15,QPen(Qt::black,gl_scale_f*2)));
 
         for (QGraphicsLineItem* lineItem:_origin)
         {
diff --git a/src/GraphicView.h b/src/GraphicView.h
index 6b009b5..b1fe579 100644
--- a/src/GraphicView.h
+++ b/src/GraphicView.h
@@ -124,8 +124,6 @@ class jpsGraphicsView: public QGraphicsView {
     //RoomCaption
     bool show_hide_roomCaption(QString name, qreal x, qreal y);
 
-
-
 public slots:
     //Waypoints
     void StatAssoDef();
@@ -136,7 +134,6 @@ public slots:
     //Landmarks
     void unmarkLandmark();
 
-
 protected:
     //Mouse events
     virtual void mouseMoveEvent(QMouseEvent * mouseEvent);
diff --git a/src/graphicscene.cpp b/src/graphicscene.cpp
index 4bf1630..3600b99 100644
--- a/src/graphicscene.cpp
+++ b/src/graphicscene.cpp
@@ -51,7 +51,7 @@ void GraphicScene::drawBackground(QPainter *painter, const QRectF &rect)
             DrawLineGrid(painter,rect);
         else
             DrawPointGrid(painter,rect);
-    }   
+    }
 }
 
 void GraphicScene::DrawLineGrid(QPainter *painter, const QRectF &rect)
@@ -93,3 +93,5 @@ void GraphicScene::DrawPointGrid(QPainter *painter, const QRectF &rect)
     painter->drawPoints(points.data(), points.size());
 }
 
+
+

From 4289fcfda4c80600e1ac7484d2b88c462b72a601 Mon Sep 17 00:00:00 2001
From: "M.Osterkamp" <m.osterkamp@uni-wuppertal.de>
Date: Tue, 8 Dec 2015 13:17:57 +0100
Subject: [PATCH 27/53] added to v0.8: mark all lines with str+a confirm before
 close window

---
 src/GraphicView.cpp |  9 +++++++++
 src/GraphicView.h   |  2 ++
 src/mainWindow.cpp  | 34 ++++++++++++++++++++++++----------
 src/mainWindow.h    |  2 +-
 4 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/src/GraphicView.cpp b/src/GraphicView.cpp
index 0bb0925..a0e6008 100644
--- a/src/GraphicView.cpp
+++ b/src/GraphicView.cpp
@@ -1421,6 +1421,15 @@ void jpsGraphicsView::RemoveIntersections(jpsLineItem *lineItem)
     }
 }
 
+void jpsGraphicsView::SelectAllLines()
+{
+    marked_lines.clear();
+    for (jpsLineItem* line:line_vector)
+    {
+        select_line(line);
+    }
+}
+
 void jpsGraphicsView::delete_landmark()
 {
     if (markedLandmark!=nullptr)
diff --git a/src/GraphicView.h b/src/GraphicView.h
index b1fe579..f687b4f 100644
--- a/src/GraphicView.h
+++ b/src/GraphicView.h
@@ -133,6 +133,8 @@ public slots:
     void ActivatePointGrid();
     //Landmarks
     void unmarkLandmark();
+    //Line operations
+    void SelectAllLines();
 
 protected:
     //Mouse events
diff --git a/src/mainWindow.cpp b/src/mainWindow.cpp
index 53fdeab..8bd928f 100644
--- a/src/mainWindow.cpp
+++ b/src/mainWindow.cpp
@@ -36,6 +36,7 @@
 
 #include <QFileDialog>
 #include <QMessageBox>
+#include <QShortcut>
 
 MWindow :: MWindow() {
 
@@ -88,7 +89,7 @@ MWindow :: MWindow() {
 
     //Signals and Slots
     // Tab File
-    connect(actionBeenden, SIGNAL(triggered(bool)),this,SLOT(quit()));//qApp,SLOT(quit()));
+    connect(actionBeenden, SIGNAL(triggered(bool)),this,SLOT(close()));
     connect(action_ffnen,SIGNAL(triggered(bool)),this,SLOT(openFile()));
     connect(action_ffnen_xml,SIGNAL(triggered(bool)),this,SLOT(openFileXML()));
     connect(actionSpeichern,SIGNAL(triggered(bool)),this,SLOT(saveFile()));
@@ -124,6 +125,11 @@ MWindow :: MWindow() {
     connect(mview,SIGNAL(mouse_moved()),this,SLOT(show_coords()));
     connect(mview,SIGNAL(landmark_added()),this,SLOT(add_landmark()));
     connect(mview,SIGNAL(LineLengthChanged()),this,SLOT(ShowLineLength()));
+    // Mark all lines
+    QAction *str_a = new QAction(this);
+    str_a->setShortcut(Qt::Key_A | Qt::CTRL);
+    connect(str_a, SIGNAL(triggered(bool)), mview, SLOT(SelectAllLines()));
+    this->addAction(str_a);
     //connect(mview,SIGNAL(DoubleClick()),this,SLOT(en_selectMode()));
     // Autosave
     connect(timer, SIGNAL(timeout()), this, SLOT(AutoSave()));
@@ -201,15 +207,6 @@ void MWindow::UpdateCMap()
     dmanager->ShowCMapFrame(_cMapFrame);
 }
 
-void MWindow::quit()
-{
-    //MessageBox
-    //Wenn ja.
-    qApp->quit();
-    //Wenn nein
-    //return to app
-}
-
 void MWindow::add_landmark()
 {
     jpsLandmark* landmark = mview->get_landmarks().last();
@@ -523,6 +520,23 @@ void MWindow::rotate()
     mview->rotate(-90);
 }
 
+void MWindow::closeEvent(QCloseEvent *event)
+{
+    int ret = QMessageBox::warning(
+                this, "Quit?",
+                "Do you really want to quit?",
+                QMessageBox::Yes | QMessageBox::No );
+
+    if (ret == QMessageBox::Yes)
+    {
+        QMainWindow::closeEvent(event);
+    }
+    else
+    {
+        event->ignore();
+    }
+}
+
 
 
 
diff --git a/src/mainWindow.h b/src/mainWindow.h
index d22ce94..cec9493 100644
--- a/src/mainWindow.h
+++ b/src/mainWindow.h
@@ -121,7 +121,7 @@ protected slots:
     void UpdateCMap();
 
     //quit
-    void quit();
+    void closeEvent(QCloseEvent *event);
 
 
 };

From 6184cce499f5bc7240a22dd95c696f9b30508492 Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Tue, 8 Dec 2015 15:24:36 +0100
Subject: [PATCH 28/53] debugging delete marked lines

---
 src/GraphicView.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/GraphicView.cpp b/src/GraphicView.cpp
index a0e6008..8113632 100644
--- a/src/GraphicView.cpp
+++ b/src/GraphicView.cpp
@@ -738,9 +738,9 @@ void jpsGraphicsView::catch_points()
 
 void jpsGraphicsView::catch_lines()
 {
-    ///catch lines (only possible if wall is disabled)
-    /// if current rect was build up moving the cursor to the left ->
-    /// whole line has to be within the rect to select the line
+    //catch lines (only possible if wall is disabled)
+    // if current rect was build up moving the cursor to the left ->
+    // whole line has to be within the rect to select the line
     line_tracked=-1;
     if (currentSelectRect->rect().width()<0)
     {
@@ -750,14 +750,14 @@ void jpsGraphicsView::catch_lines()
                     && currentSelectRect->contains(item->get_line()->line().p2()))
             {
                 select_line(item);
-                line_tracked=1;
+
 
 
             }
         }
     }
-    /// if current rect was build up moving the cursor to the right ->
-    /// throwing the select rect only over a part of a line is sufficent to select it
+    // if current rect was build up moving the cursor to the right ->
+    // throwing the select rect only over a part of a line is sufficent to select it
     else if (currentSelectRect->rect().width()>0)
     {
         for (auto &item:line_vector)
@@ -832,6 +832,7 @@ void jpsGraphicsView::select_line(jpsLineItem *mline)
     {
         mline->get_line()->setPen(QPen(Qt::red,0));
         marked_lines.push_back(mline);
+        line_tracked=1;
     }
     else
     {

From 6cc6e922df6cdc2f24ef1a2dbb0b1e26aa90a46b Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Tue, 15 Dec 2015 11:51:45 +0100
Subject: [PATCH 29/53] add CHANGELOG.md

---
 CHANGELOG.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..b6521f6
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,15 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+
+
+## v0.8.0 [Unreleased]
+
+
+### Added
+#### JPSEditor  
+
+- Point Grid
+- Line Grid
+- Select all lines
+- Edit Room Type
+- Show and snap the origin
\ No newline at end of file

From dcea232773212e6dc3408d431409f9808b8df152 Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Thu, 7 Jan 2016 14:51:50 +0100
Subject: [PATCH 30/53] Get ready for VS and changing window title

---
 CMakeLists.txt      | 8 +++++---
 forms/mainwindow.ui | 2 +-
 src/main.cpp        | 8 ++++++++
 src/mainWindow.cpp  | 2 ++
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b09c304..66a2b08 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,6 +8,7 @@
 # 1. CMAKE_BUILD_TYPE=Release (default Debug)
 # 2. DESIRED_QT_VERSION=5 (default 4)
 # example: >> cmake  -DDESIRED_QT_VERSION=5  -DCMAKE_PREFIX_PATH=~/Qt/5.5/clang_64 ..
+# Flags for VS: -G "Visual Studio ..." -DCMAKE_PREFIX_PATH=... -DCMAKE_C_FLAGS="-mwindows" 
 
 cmake_minimum_required(VERSION 2.8.9)
 IF (POLICY CMP0048) # in CMake 3.0.0+
@@ -70,6 +71,7 @@ message(STATUS "${PROJECT_NAME} will be installed to ${CMAKE_INSTALL_PREFIX}")
 
 
 #--------------------
+if (NOT MSVC)
 include(CheckCXXCompilerFlag)
 CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
 CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
@@ -81,7 +83,7 @@ else()
   message(AUTHOR_WARNING "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
 endif()
 message(STATUS "Checking for C++11 compiler - available")
-
+endif()
 #---------------------
 
 set( SRCS
@@ -166,7 +168,7 @@ ENDIF (WIN32)
 message(STATUS "QT_Qmake_executable " ${QT_QMAKE_EXECUTABLE})
 if($QT_QMAKE_EXECUTABLE STREQUAL "")
   FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake)
-  if (NOT QT_QMAKE_EXECUTABL)
+  if (NOT QT_QMAKE_EXECUTABLE)
     message(WARNING "QT not found - abort.")
   endif()
 endif()
@@ -199,7 +201,7 @@ elseif("${DESIRED_QT_VERSION}" STREQUAL "4")
   #   QT4_INSTALLED is set to TRUE if qt4 is found and
   #   QT3_INSTALLED is set to TRUE if qt3 is found.
   FIND_PACKAGE(Qt COMPONENTS QtXml QT_USE_QTNETWORK QtXmlPatterns REQUIRED)
-
+  set(QT4_INSTALLED TRUE)
 endif()
 
 
diff --git a/forms/mainwindow.ui b/forms/mainwindow.ui
index e67b2c0..94eb76f 100644
--- a/forms/mainwindow.ui
+++ b/forms/mainwindow.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>JuPedSim</string>
+   <string>JPSeditor</string>
   </property>
   <property name="windowIcon">
    <iconset resource="Ressource.qrc">
diff --git a/src/main.cpp b/src/main.cpp
index 047ade3..9b8c61f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -28,6 +28,14 @@
 //main.cpp
 
 
+#ifdef _MSC_VER
+#    ifdef NDEBUG
+#        pragma comment(linker, "/SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup")
+#    else
+#        pragma comment(linker, "/SUBSYSTEM:CONSOLE")
+#    endif
+#endif
+
 #include "mainWindow.h"
 #include "GraphicView.h"
 #include <QApplication>
diff --git a/src/mainWindow.cpp b/src/mainWindow.cpp
index 8bd928f..a35ec68 100644
--- a/src/mainWindow.cpp
+++ b/src/mainWindow.cpp
@@ -69,6 +69,8 @@ MWindow :: MWindow() {
     //filename of saved project
     _filename="";
 
+    //WindowTitle
+    this->setWindowTitle("JPSeditor");
 
     setCentralWidget(mview);
     //this->setMaximumSize(1920,1080);

From 6e3d1d6f77d5cc34c363154cde76944a430d363e Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Thu, 7 Jan 2016 15:45:32 +0100
Subject: [PATCH 31/53] removing the pragma comment

---
 src/main.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index 9b8c61f..b76ab58 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -27,7 +27,7 @@
 
 //main.cpp
 
-
+/* for compiling a standalone windows exe with VS
 #ifdef _MSC_VER
 #    ifdef NDEBUG
 #        pragma comment(linker, "/SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup")
@@ -35,6 +35,8 @@
 #        pragma comment(linker, "/SUBSYSTEM:CONSOLE")
 #    endif
 #endif
+*/
+
 
 #include "mainWindow.h"
 #include "GraphicView.h"

From b7b910d5ca5363fed239bc58225cc5cf3819e1c8 Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Fri, 8 Jan 2016 11:55:35 +0100
Subject: [PATCH 32/53] Fixed function ShowRoomType

---
 src/roomwidget.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/roomwidget.cpp b/src/roomwidget.cpp
index 793e55f..57d8a33 100644
--- a/src/roomwidget.cpp
+++ b/src/roomwidget.cpp
@@ -799,8 +799,9 @@ void roomWidget::ChangeRoomType()
 void roomWidget::ShowRoomType(int& cRow) const
 {
     QString type = datamanager->get_roomlist()[cRow]->get_type();
+    int itemindex = ui->classBox->findText(type);
+    ui->classBox->setCurrentIndex(itemindex);
 
-    // ui->classBox->setCurrentText(type);
 }
 
 

From 9051f0cf1b8dc204defc8cb6f7172653661600b0 Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Fri, 8 Jan 2016 14:02:27 +0100
Subject: [PATCH 33/53] change cmake policy

---
 CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 66a2b08..014574d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,6 +17,8 @@ ENDIF (POLICY CMP0048)
 IF (POLICY CMP0043) # in CMake 3.0.0+
   CMAKE_POLICY (SET CMP0043 OLD) # keep PROJECT() from clearing VERSION variables
 ENDIF (POLICY CMP0043)
+CMAKE_POLICY (SET CMP0020 OLD) # keep old POLICY (2.8.10 and lower) The OLD behavior for this policy is not to link executables to
+							   #qtmain.lib automatically when they link to the QtCore IMPORTEDtarget 
 project(JPSeditor)
 
 

From c370089c43a98395af4aba4c21782b8693560066 Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Fri, 8 Jan 2016 14:07:21 +0100
Subject: [PATCH 34/53] if statement concerning cmake policy

---
 CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 014574d..69f0f49 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,8 +17,9 @@ ENDIF (POLICY CMP0048)
 IF (POLICY CMP0043) # in CMake 3.0.0+
   CMAKE_POLICY (SET CMP0043 OLD) # keep PROJECT() from clearing VERSION variables
 ENDIF (POLICY CMP0043)
+IF (POLICY CMP0020)
 CMAKE_POLICY (SET CMP0020 OLD) # keep old POLICY (2.8.10 and lower) The OLD behavior for this policy is not to link executables to
-							   #qtmain.lib automatically when they link to the QtCore IMPORTEDtarget 
+ENDIF (POLICY CMP0020)			#qtmain.lib automatically when they link to the QtCore IMPORTEDtarget 
 project(JPSeditor)
 
 

From 7e236c6b45ddaa491d68ffb72e42c9292149a85e Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Fri, 8 Jan 2016 14:32:27 +0100
Subject: [PATCH 35/53] fix open xml

---
 src/datamanager.cpp | 8 ++++++++
 src/mainWindow.cpp  | 9 +++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/datamanager.cpp b/src/datamanager.cpp
index d731d70..d00d14c 100644
--- a/src/datamanager.cpp
+++ b/src/datamanager.cpp
@@ -860,6 +860,14 @@ bool jpsDatamanager::readXML(QFile &file)
 
     QXmlStreamReader xmlReader(&file);
 
+    // skip header
+    xmlReader.readNext();
+    xmlReader.readNext();
+
+    // see if file starts with geometry
+    if (xmlReader.name() != "geometry")
+        return false;
+
     while(!xmlReader.atEnd() && !xmlReader.hasError())
     {
         /* Read next element.*/
diff --git a/src/mainWindow.cpp b/src/mainWindow.cpp
index a35ec68..65a1742 100644
--- a/src/mainWindow.cpp
+++ b/src/mainWindow.cpp
@@ -265,16 +265,17 @@ void MWindow::openFileXML()
     QFile file(fileName);
     if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
     {
-        QMessageBox::critical(this,
-                              "OpenFileXML",
-                              "Couldn't open xml-file",
-                              QMessageBox::Ok);
+
         return;
     }
 
 
     if (!dmanager->readXML(file))
     {
+        QMessageBox::critical(this,
+                              "OpenFileXML",
+                              "Couldn't open xml-file",
+                              QMessageBox::Ok);
         statusBar()->showMessage("XML-File could not be parsed!",10000);
     }
 

From 3291695c88013c83a24bf19ea2bae09c997d5944 Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Tue, 12 Jan 2016 11:41:50 +0100
Subject: [PATCH 36/53] dxf import with layers (Wall and Door)

---
 src/GraphicView.cpp | 1 +
 src/GraphicView.h   | 4 ++++
 src/datamanager.cpp | 8 +++++---
 src/datamanager.h   | 2 ++
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/GraphicView.cpp b/src/GraphicView.cpp
index 8113632..531a296 100644
--- a/src/GraphicView.cpp
+++ b/src/GraphicView.cpp
@@ -1039,6 +1039,7 @@ bool jpsGraphicsView::show_hide_roomCaption(QString name, qreal x, qreal y)
     return true;
 }
 
+
 void jpsGraphicsView::line_collision() ///FIX ME!!!
 {
     /// if no lines collided yet
diff --git a/src/GraphicView.h b/src/GraphicView.h
index f687b4f..2f6eddc 100644
--- a/src/GraphicView.h
+++ b/src/GraphicView.h
@@ -124,6 +124,8 @@ class jpsGraphicsView: public QGraphicsView {
     //RoomCaption
     bool show_hide_roomCaption(QString name, qreal x, qreal y);
 
+
+
 public slots:
     //Waypoints
     void StatAssoDef();
@@ -199,6 +201,8 @@ public slots:
     bool _assoDef;
     bool _gridmode;
 
+
+
 signals:
     void mouse_moved();
     void set_focus_textedit();
diff --git a/src/datamanager.cpp b/src/datamanager.cpp
index d00d14c..86cd8cb 100644
--- a/src/datamanager.cpp
+++ b/src/datamanager.cpp
@@ -1200,9 +1200,11 @@ bool jpsDatamanager::readDXF(std::string filename)
 
 void jpsDatamanager::addLine(const DL_LineData &d)
 {
-
-    mView->addLineItem(d.x1,d.y1,d.x2,d.y2);
-
+    DL_Attributes attributes = DL_CreationInterface::getAttributes();
+    if (attributes.getLayer()=="Wall" || attributes.getLayer()=="Door")
+        mView->addLineItem(d.x1,d.y1,d.x2,d.y2,QString::fromStdString(attributes.getLayer()));
+    else
+        mView->addLineItem(d.x1,d.y1,d.x2,d.y2);
 }
 
 
diff --git a/src/datamanager.h b/src/datamanager.h
index 86f0fc4..cf9a036 100644
--- a/src/datamanager.h
+++ b/src/datamanager.h
@@ -170,6 +170,8 @@ class jpsDatamanager: public DL_CreationAdapter
     double _frameRate;
     int _lastCMapFrame;
 
+
+
 };
 
 

From 59f2ae9089623dbdf202302723aedd3ae2d4fcf3 Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Tue, 12 Jan 2016 13:15:04 +0100
Subject: [PATCH 37/53] - layernames wall and door in upper and lower case is
 now possible (dxf import) - creating actionstack

---
 jpseditor.pro       | 8 ++++++--
 src/datamanager.cpp | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/jpseditor.pro b/jpseditor.pro
index 4a77643..f065215 100644
--- a/jpseditor.pro
+++ b/jpseditor.pro
@@ -57,7 +57,9 @@ HEADERS += \
     src/graphicscene.h \
     src/widgetsettings.h \
     src/jpsyahpointer.h \
-    src/jpsconnection.h
+    src/jpsconnection.h \
+    src/UndoFramework/actionstack.h \
+    src/UndoFramework/paintaction.h
 
 
 SOURCES += \
@@ -79,7 +81,9 @@ SOURCES += \
     src/graphicscene.cpp \
     src/widgetsettings.cpp \
     src/jpsyahpointer.cpp \
-    src/jpsconnection.cpp
+    src/jpsconnection.cpp \
+    src/UndoFramework/actionstack.cpp \
+    src/UndoFramework/paintaction.cpp
 
 
 RESOURCES +=  forms/Ressource.qrc
diff --git a/src/datamanager.cpp b/src/datamanager.cpp
index 86cd8cb..117bb25 100644
--- a/src/datamanager.cpp
+++ b/src/datamanager.cpp
@@ -1201,8 +1201,12 @@ bool jpsDatamanager::readDXF(std::string filename)
 void jpsDatamanager::addLine(const DL_LineData &d)
 {
     DL_Attributes attributes = DL_CreationInterface::getAttributes();
-    if (attributes.getLayer()=="Wall" || attributes.getLayer()=="Door")
-        mView->addLineItem(d.x1,d.y1,d.x2,d.y2,QString::fromStdString(attributes.getLayer()));
+    std::string layername = attributes.getLayer();
+    std::transform(layername.begin(), layername.end(), layername.begin(), ::tolower);
+    if (layername=="wall")
+        mView->addLineItem(d.x1,d.y1,d.x2,d.y2,"Wall");
+    else if (layername=="door")
+        mView->addLineItem(d.x1,d.y1,d.x2,d.y2,"Door");
     else
         mView->addLineItem(d.x1,d.y1,d.x2,d.y2);
 }

From fc8af57cb13c20ef5f97726d1b358a01b48caa48 Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Mon, 18 Jan 2016 17:32:01 +0100
Subject: [PATCH 38/53] add (copied) changelog and contribution guide

---
 CHANGELOG.md    |  96 ++++++++++++++++++--
 CONTRIBUTING.md | 228 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 318 insertions(+), 6 deletions(-)
 create mode 100644 CONTRIBUTING.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6521f6..bab618f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,10 +6,94 @@ All notable changes to this project will be documented in this file.
 
 
 ### Added
-#### JPSEditor  
+#### JPSCORE
+- CI with travis and Gitlab CI
+- Compilation checked on Visual Studio 12 2013 
+- Added more validation tests
+- Added statistics (calculate exit usage) for all exits
+- Added voronoi based algorithm for inserting agents coming from the source or from matsim
+- New option for the quickest path router. Sample options are:
+ ```<parameters default_strategy="local_shortest">```
+  ```<parameters default_strategy="global_shortest">``` 
+   ``` <parameters cba_gain="0.15" reference_peds_selection="single" congestion_ratio="0.8" queue_vel_escaping_jam="0.2" 
+       queue_vel_new_room="0.7" visibility_obstruction="4">
+```
+- New model with the generic name `Tordeux2015` and `id=3`. For use check the ini-files in the Utest-validation tests.
+- Tests are sorted in `rimea_tests`, `juelich_tests` and `validation_tests`.
+- Periodic boundary conditions with the option `<periodic>1</periodic>`.Works only with model 3.  
+- Added Floorfield to all exits, providing direction to target, direction to closest wall and cost estimates. Parameter to control wall-avoidance included.
+   
+#### JPSVIS
+- Added option to load  vtk files. Need to add the line ``` <gradient_field filename="floorfield.vtk"> 
+``` in the header of the trajectory file. Alternatively drag and drop a vtk file on JPSvis.
+ 
+- Fixed error displaying the total number of frames when using the scroolbar
+ 
+#### JPSREPORT
+- Added geometry information while plotting the voronoi cells
+- Added option to disable plotting
+- Issue a warning when the voronoi cell cannot be calculated 
+- Fixed error where all trajectories were colinear
 
-- Point Grid
-- Line Grid
-- Select all lines
-- Edit Room Type
-- Show and snap the origin
\ No newline at end of file
+#### JPSEDITOR
+ 
+
+## v0.7.0 [2015-07-15]
+
+### New Module
+- JuPedSim: Editor for the geometry
+
+### Added
+
+- Risk tolerance factor (value in [0 1]) for pedestrian. Pedestrians with high values are likely to take more risks.
+- Added pre-movement time of the agents. Only after this time, the concerned agents will start moving.
+- Sources for generating agents at runtime. Parameter are frequency (agents per seconds) and maximum number
+- Option to color the pedestrians by group, spotlight, velocity, group, knowledge, router, final\_goal, intermediate\_goal. Usage: ( 
+```<trajectories format="xml-plain" fps="8" color_mode="group"> ```)
+- More control over the triangulation specially to avoid skinny triangles. Usage: ```<navigation_mesh method="triangulation" minimum_distance_between_edges="0.5" minimum_angle_in_triangles="20" use_for_local_planning="true" />```
+- Improved statistics. The flow curve for the different exits can be computed at runtime.
+- Changelog file
+- Rimea testcases
+- Unit tests are now based on the Boost testing engine
+#### JPSVIS
+- Display the geometry structure individual room/subroom.
+- Now build on OSX/Linux/Windows 
+
+### Changed
+-  
+-  
+
+### Fixed
+- Visiblity in 3D
+- Numerous geometrical operations
+
+
+## v0.6.0 - 2015-01-31
+### Added
+- Steering the simulation with predefined events (closing or opening doors during the simulation)
+- Information sharing between the pedestrians. The agents now share their knowledge about closed doors.
+- Pre evacuation time for groups of agents.
+- Adjustable velocities on stairs and even terrain for group of agents.
+- Stability and performance improvement. The simulation is approx 40% faster for larger scenarios and you will notice it
+- New route choice model, cognitive map, giving agents the possibility to explore the environment and discover doors for instance.
+- Different sensors for improving the navigation of pedestrians (smoke/jam sensor).
+- New verification and validation tests.
+- General statistics over the evacuation (for instance areas egress time and door usage)
+- Support for Visual Studio and Xcode compilers.
+
+
+### Changed
+- refactor NumCPU and ExitCrossingStrategy tags to `num_threads and exit_crossing_strategy`
+
+
+
+## v0.5.0 - 2014-08-05
+First release of the the Juelich Pedestrian Simulator. Most noteworthy features:
+
+- Simulate pedestrians movement in a space continuous geometry
+- Forces based models for describing the pedestrians interactions
+- Shortest and quickest path route choice strategies
+- Loading and visualizing trajectories and geometries
+- Easy to use visualization interface
+- Making high quality videos directly from the visualization interface or generating png sequences
+- XML based input files
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..d0e607c
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,228 @@
+Contributing to JuPedSim
+========================
+
+This project is mainly developed by a small group of researchers and students from [Jülich Research Center](http://www.fz-juelich.de/en) and [BUW](http://www.uni-wuppertal.de/).
+However you are kindly invited not only to use JuPedSim but also contributing to our open-source-project.
+It does not matter if you are a researcher, student or just interested in pedestrian dynamics.
+There are only a few rules and advices we want to give to you:
+
+- [Advice for new contributors](#advice-for-new-contributors)
+    - [First steps](#first-steps)
+    - [Guidelines](#guidelines)
+    - [FAQ](#faq)
+
+- [Reporting bugs and requesting features](#reporting-bugs-and-requesting-features)
+    - [Using the issue tracker](#using-the-issue-tracker)
+    - [Reporting bugs](#reporting-bugs)
+    - [Requesting features](#requesting-features)
+
+- [Writing code](#writing-code)
+    - [Coding style](#coding-style)
+    - Unit tests
+
+- [Writing documentation](#wrinting-documentation)
+    - [Comments](#comments)
+    - Documenting new features
+
+- [Committing code](#commiting-code)
+    - Handling pull/merge requests
+    - [Committing guidelines](#commiting-guidelines)
+    - Reverting commits
+
+## Advice for new contributors
+
+### First steps
+
+### Guidelines
+
+### FAQ
+
+## Reporting bugs and requesting features
+If you got a question or a problem and need support from our team feel free to contact us.
+You can do this via [email](mailto:dev@jupedsim.org).
+
+If you think you found an issue or bug in JuPedSim please use our issue tracker.
+
+### Using the issue tracker
+
+The issue tracker is the preferred channel for bug reports, features requests and submitting pull requests, but please respect the following restrictions:
+
+- Please do not use the issue tracker for personal support requests. [Mail us](mailto:dev@jupedsim.org) if you need personal support.
+
+- Please do not derail or troll issues. Keep the discussion on topic and respect the opinions of others.
+
+If you use the issue tracker we have a list of labels you should use.
+
+### Reporting bugs
+
+If you find a bug in the source code or a mistake in the documentation, you can help us by submitting an issue to our repository.
+Even better you can submit a pull or merge request with a fix. Please use the following template and make sure you provide us as much information as possible:
+
+~~~.md
+[Short description of problem here]
+
+**Reproduction Steps:**
+
+1. [First Step]
+2. [Second Step]
+3. [Other Steps...]
+
+**Expected behavior:**
+
+[Describe expected behavior here]
+
+**Observed behavior:**
+
+[Describe observed behavior here]
+
+**Screenshots and GIFs**
+
+![Screenshots and GIFs which follow reproduction steps to demonstrate the problem](url)
+
+**JuPedSim version:** [Enter JuPedSim version here]
+**OS and version:** [Enter OS name and version here]
+**Compiler and version:** [Enter compiler name and version here]
+
+**Installed Libraries:**
+[Enter Boost version here]
+[Enter Vtk version here]
+[Enter Qt version here]
+
+**Additional information:**
+
+* Problem started happening recently, didn't happen in an older version of JuPedSim: [Yes/No]
+* Problem can be reliably reproduced, doesn't happen randomly: [Yes/No]
+* Problem happens with all files and projects, not only some files or projects: [Yes/No]
+* Problem happens with the attached ini and geometry files: [Yes/No]
+~~~
+
+### Requesting features
+
+Enhancement suggestions are tracked as issues. After you've determined which repository your enhancement suggestions is related to, create an issue on that repository and provide the following information:
+
+ * Use a clear and descriptive title for the issue to identify the suggestion.
+ * Provide a step-by-step description of the suggested enhancement in as many details as possible.
+ * Provide specific examples to demonstrate the steps. Include copy/pasteable snippets which you use in those examples, as Markdown code blocks.
+ * Describe the current behavior and explain which behavior you expected to see instead and why.
+
+If you want to support us by writing the enhancement yourself consider what kind of change it is:
+
+- **Major changes** that you wish to contribute to the project should be discussed first on our **dev mailing list** so that we can better coordinate our efforts, prevent duplication of work, and help you to craft the change so that it is successfully accepted into the project.
+- **Small changes** can be crafted and submitted to our repository as a **pull or merge request**.
+
+Nevertheless open an issue for documentation purposes with the following template:
+
+~~~.md
+[Short description of suggestion]
+
+**Steps which explain the enhancement**
+
+1. [First Step]
+2. [Second Step]
+3. [Other Steps...]
+
+**Current and suggested behavior**
+
+[Describe current and suggested behavior here]
+
+**Why would the enhancement be useful to most users**
+
+[Explain why the enhancement would be useful to most users]
+
+[List some other text editors or applications where this enhancement exists]
+
+**Screenshots and GIFs**
+
+![Screenshots and GIFs which demonstrate the steps or part of JuPedSim the enhancement suggestion is related to](url)
+
+**JuPedSim Version:** [Enter JuPedSim version here]
+**OS and Version:** [Enter OS name and version here]~
+
+~~~
+
+## Writing Code
+
+### Coding style
+
+In JuPedSim we try to code according to the *Stroustrup* style of formatting/indenting.
+If you want (or have) to write code in JuPedSim you really **need** to respect that style.
+This is important not just aesthetically but also practically. Diff commits are much more clearer and cleaner.
+
+The code is formated using the automatic formatter [astyle](http://astyle.sourceforge.net/astyle.html)  with the option `--style=stroustrup`:
+
+> Stroustrup style formatting/indenting uses stroustrup brackets.
+> Brackets are broken from function definitions only.
+> Brackets are attached to everything else including
+> namespaces, classes, and statements within a function, arrays, structs, and enums.
+> This style frequently is used with an indent of 5 spaces.
+
+Here is an **example:**
+
+```c++
+int Foo(bool isBar)
+{
+     if (isBar) {
+          bar();
+          return 1;
+     } else
+          return 0;
+}
+```
+
+#### Tabs vs Spaces
+This can be a long and religious discussion, to make it short *DO NOT* use tabs, just spaces please.
+
+Here are some hints to configure your editor in order to use the *stroustrup* style
+
+- **Emacs**:
+    Add this to your ```.emacs```
+```lisp
+(setq c-default-style "stroustrup" c-basic-offset 5)
+(setq indent-tabs-mode nil)
+```
+- **Vim**:
+    Set in your config file these variables
+```javascript
+:set autoindent
+:set cindent
+:set expandtab
+:set shiftwidth=5
+:set softtabstop=5
+```
+
+- **Eclipse**:
+    Here is a [plugin](http://astyleclipse.sourceforge.net/) for astyle in eclipse.
+    Read also
+    [How to change indentation width in eclipse?](https://superuser.com/questions/462221/how-do-i-reliably-change-the-indentation-width-in-eclipse)
+
+- **Clion**
+<!-- TODO -->
+
+
+## Writing Documentation
+
+### Comments
+Comments have to be written in **English** everywhere. Please use markdown where applicable.
+
+## Commiting Code
+
+### Commiting guidelines
+Please write clear and concise commit messages so that
+your co-developers can directly grasp what changes on the code are you committing/pushing. Please do this with respect
+to the following points:
+- Name every class (file if you only change a single file) you changed and right after that a brief description of your
+change.
+- Use markdown if you want do make a longer description than two sentences.
+- Reference issues and pull requests liberally if your commit is connected to one.
+- When only changing documentation start with `:memo:`
+- Consider starting the commit message with an applicable emoji:
+    - :art: `:art:` when improving the format/structure of the code
+    - :racehorse: `:racehorse:` when improving performance
+    - :memo: `:memo:` when writing docs
+    - :penguin: `:penguin:` when fixing something on Linux
+    - :apple: `:apple:` when fixing something on Mac OS
+    - :checkered_flag: `:checkered_flag:` when fixing something on Windows
+    - :bug: `:bug:` when fixing a bug
+    - :fire: `:fire:` when removing code or files
+    - :green_heart: `:green_heart:` when fixing the CI build
+    - :white_check_mark: `:white_check_mark:` when adding tests
\ No newline at end of file

From c9703fcc4105462443fa184e0b820345aa5c0ab9 Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Tue, 19 Jan 2016 15:09:38 +0100
Subject: [PATCH 39/53] working on undo framework (issue #25)

---
 jpseditor.pro       |  6 ++++--
 src/GraphicView.cpp | 18 ++++++++++++++++++
 src/GraphicView.h   |  9 ++++++++-
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/jpseditor.pro b/jpseditor.pro
index f065215..9562618 100644
--- a/jpseditor.pro
+++ b/jpseditor.pro
@@ -59,7 +59,8 @@ HEADERS += \
     src/jpsyahpointer.h \
     src/jpsconnection.h \
     src/UndoFramework/actionstack.h \
-    src/UndoFramework/paintaction.h
+    src/UndoFramework/paintaction.h \
+    src/UndoFramework/action.h
 
 
 SOURCES += \
@@ -83,7 +84,8 @@ SOURCES += \
     src/jpsyahpointer.cpp \
     src/jpsconnection.cpp \
     src/UndoFramework/actionstack.cpp \
-    src/UndoFramework/paintaction.cpp
+    src/UndoFramework/paintaction.cpp \
+    src/UndoFramework/action.cpp
 
 
 RESOURCES +=  forms/Ressource.qrc
diff --git a/src/GraphicView.cpp b/src/GraphicView.cpp
index 531a296..6bf33a1 100644
--- a/src/GraphicView.cpp
+++ b/src/GraphicView.cpp
@@ -1039,6 +1039,24 @@ bool jpsGraphicsView::show_hide_roomCaption(QString name, qreal x, qreal y)
     return true;
 }
 
+void jpsGraphicsView::RecordLineAction(const QString& name, const QString& type, const QLine &oldLine)
+{
+    _undoStack.PushNewAction(LineAction(name,type,oldLine));
+}
+
+void jpsGraphicsView::Undo()
+{
+    const LineAction recentAction = _undoStack.GetRecentAction();
+
+
+    if (recentAction.GetName()=="LineDeleted")
+        addLineItem(recentAction.GetOldLine().p1().x(),recentAction.GetOldLine().p1().y(),recentAction.GetOldLine().p2().x(),
+                    recentAction.GetOldLine().p2().y(),recentAction.GetType());
+
+    _redoStack.PushNewAction(LineAction("LineAdded",recentAction.GetType(),QLine(0,0,0,0)));
+
+}
+
 
 void jpsGraphicsView::line_collision() ///FIX ME!!!
 {
diff --git a/src/GraphicView.h b/src/GraphicView.h
index 2f6eddc..3d939af 100644
--- a/src/GraphicView.h
+++ b/src/GraphicView.h
@@ -36,6 +36,8 @@
 #include "jpsLineItem.h"
 #include "jpslandmark.h"
 #include "jpsconnection.h"
+#include "./UndoFramework/actionstack.h"
+
 using ptrConnection = std::shared_ptr<jpsConnection>;
 
 class jpsGraphicsView: public QGraphicsView {
@@ -124,7 +126,9 @@ class jpsGraphicsView: public QGraphicsView {
     //RoomCaption
     bool show_hide_roomCaption(QString name, qreal x, qreal y);
 
-
+    //Undo Framework
+    void RecordLineAction(const QString &name, const QString &type, const QLine& oldLine);
+    void Undo();
 
 public slots:
     //Waypoints
@@ -201,6 +205,9 @@ public slots:
     bool _assoDef;
     bool _gridmode;
 
+    //Undo/Redo
+    ActionStack _undoStack;
+    ActionStack _redoStack;
 
 
 signals:

From 1dfc94d0aa1730c6028851da733624218441d542 Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Wed, 20 Jan 2016 09:46:07 +0100
Subject: [PATCH 40/53] Adding :new:

---
 CONTRIBUTING.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d0e607c..67245f0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -216,6 +216,7 @@ change.
 - Reference issues and pull requests liberally if your commit is connected to one.
 - When only changing documentation start with `:memo:`
 - Consider starting the commit message with an applicable emoji:
+    - :new: `:new:` when adding a new feature
     - :art: `:art:` when improving the format/structure of the code
     - :racehorse: `:racehorse:` when improving performance
     - :memo: `:memo:` when writing docs

From dc028ef8ab03f86e26699b2154c8191f1dcf854f Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Wed, 20 Jan 2016 14:20:00 +0100
Subject: [PATCH 41/53] :new: Start Undo Framework

---
 .idea/.name                       |   1 +
 forms/Ressource.qrc               |   1 +
 forms/Undo-icon.png               | Bin 0 -> 23524 bytes
 forms/mainwindow.ui               |  23 +++++++++++++++++++++++
 src/GraphicView.cpp               |  10 ++++++++--
 src/GraphicView.h                 |   6 ++++--
 src/UndoFramework/action.cpp      |  30 ++++++++++++++++++++++++++++++
 src/UndoFramework/action.h        |  23 +++++++++++++++++++++++
 src/UndoFramework/actionstack.cpp |  23 +++++++++++++++++++++++
 src/UndoFramework/actionstack.h   |  20 ++++++++++++++++++++
 src/UndoFramework/paintaction.cpp |  22 ++++++++++++++++++++++
 src/UndoFramework/paintaction.h   |  19 +++++++++++++++++++
 src/mainWindow.cpp                |   3 ++-
 13 files changed, 176 insertions(+), 5 deletions(-)
 create mode 100644 .idea/.name
 create mode 100644 forms/Undo-icon.png
 create mode 100644 src/UndoFramework/action.cpp
 create mode 100644 src/UndoFramework/action.h
 create mode 100644 src/UndoFramework/actionstack.cpp
 create mode 100644 src/UndoFramework/actionstack.h
 create mode 100644 src/UndoFramework/paintaction.cpp
 create mode 100644 src/UndoFramework/paintaction.h

diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..d2398cc
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+jupedsim
\ No newline at end of file
diff --git a/forms/Ressource.qrc b/forms/Ressource.qrc
index c9b94b3..647c8bb 100644
--- a/forms/Ressource.qrc
+++ b/forms/Ressource.qrc
@@ -39,5 +39,6 @@
         <file>statue.jpg</file>
         <file>statue_specs.jpg</file>
         <file>anglesnap.PNG</file>
+        <file>Undo-icon.png</file>
     </qresource>
 </RCC>
diff --git a/forms/Undo-icon.png b/forms/Undo-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9994fc9040a3c99b19e61b291f6f5bcaf3c62d3
GIT binary patch
literal 23524
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

literal 0
HcmV?d00001

diff --git a/forms/mainwindow.ui b/forms/mainwindow.ui
index 94eb76f..4258bd9 100644
--- a/forms/mainwindow.ui
+++ b/forms/mainwindow.ui
@@ -100,6 +100,8 @@
    </attribute>
    <addaction name="actionSelect_Mode"/>
    <addaction name="separator"/>
+   <addaction name="actionUndo"/>
+   <addaction name="separator"/>
    <addaction name="actionWall"/>
    <addaction name="actionDoor"/>
    <addaction name="separator"/>
@@ -503,6 +505,27 @@
     <string>Show Point of Origin</string>
    </property>
   </action>
+  <action name="actionUndo">
+   <property name="enabled">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset>
+     <normaloff>Undo-icon.png</normaloff>Undo-icon.png</iconset>
+   </property>
+   <property name="text">
+    <string>Undo</string>
+   </property>
+   <property name="toolTip">
+    <string>Undo</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Z</string>
+   </property>
+   <property name="visible">
+    <bool>true</bool>
+   </property>
+  </action>
  </widget>
  <resources>
   <include location="Ressource.qrc"/>
diff --git a/src/GraphicView.cpp b/src/GraphicView.cpp
index 6bf33a1..f5a0d46 100644
--- a/src/GraphicView.cpp
+++ b/src/GraphicView.cpp
@@ -1039,7 +1039,7 @@ bool jpsGraphicsView::show_hide_roomCaption(QString name, qreal x, qreal y)
     return true;
 }
 
-void jpsGraphicsView::RecordLineAction(const QString& name, const QString& type, const QLine &oldLine)
+void jpsGraphicsView::RecordLineAction(const QString& name, const QString& type, const QLineF &oldLine)
 {
     _undoStack.PushNewAction(LineAction(name,type,oldLine));
 }
@@ -1053,7 +1053,7 @@ void jpsGraphicsView::Undo()
         addLineItem(recentAction.GetOldLine().p1().x(),recentAction.GetOldLine().p1().y(),recentAction.GetOldLine().p2().x(),
                     recentAction.GetOldLine().p2().y(),recentAction.GetType());
 
-    _redoStack.PushNewAction(LineAction("LineAdded",recentAction.GetType(),QLine(0,0,0,0)));
+    _redoStack.PushNewAction(LineAction("LineAdded",recentAction.GetType(),QLineF(0,0,0,0)));
 
 }
 
@@ -1405,6 +1405,12 @@ void jpsGraphicsView::delete_marked_lines()
 
 
         }
+        QString type;
+        if (marked_lines.back()->is_Door())
+             type = "Door";
+        else
+             type = "Wall";
+        RecordLineAction("LineDeleted",type,marked_lines.back()->get_line()->line());
         marked_lines.clear();
 
         //intersect_point_vector.clear();
diff --git a/src/GraphicView.h b/src/GraphicView.h
index 3d939af..aead041 100644
--- a/src/GraphicView.h
+++ b/src/GraphicView.h
@@ -127,8 +127,8 @@ class jpsGraphicsView: public QGraphicsView {
     bool show_hide_roomCaption(QString name, qreal x, qreal y);
 
     //Undo Framework
-    void RecordLineAction(const QString &name, const QString &type, const QLine& oldLine);
-    void Undo();
+    void RecordLineAction(const QString &name, const QString &type, const QLineF &oldLine);
+
 
 public slots:
     //Waypoints
@@ -141,6 +141,8 @@ public slots:
     void unmarkLandmark();
     //Line operations
     void SelectAllLines();
+    //Undo Redo
+    void Undo();
 
 protected:
     //Mouse events
diff --git a/src/UndoFramework/action.cpp b/src/UndoFramework/action.cpp
new file mode 100644
index 0000000..43f7b4b
--- /dev/null
+++ b/src/UndoFramework/action.cpp
@@ -0,0 +1,30 @@
+#include "action.h"
+
+Action::Action()
+{
+
+}
+
+Action::Action(const QString &name, const QString &type)
+{
+    _name=name;
+    _type=type;
+
+
+}
+
+Action::~Action()
+{
+
+}
+
+const QString &Action::GetName() const
+{
+    return _name;
+
+}
+
+const QString &Action::GetType() const
+{
+    return _type;
+}
diff --git a/src/UndoFramework/action.h b/src/UndoFramework/action.h
new file mode 100644
index 0000000..c38c6d6
--- /dev/null
+++ b/src/UndoFramework/action.h
@@ -0,0 +1,23 @@
+#ifndef ACTION_H
+#define ACTION_H
+#include <QString>
+
+class Action
+{
+public:
+    Action();
+    Action(const QString& name, const QString& type);
+    ~Action();
+    //Getter
+    const QString& GetName() const;
+    const QString& GetType() const;
+
+
+private:
+    QString _name;
+    QString _type;
+
+
+};
+
+#endif // ACTION_H
diff --git a/src/UndoFramework/actionstack.cpp b/src/UndoFramework/actionstack.cpp
new file mode 100644
index 0000000..420c9c1
--- /dev/null
+++ b/src/UndoFramework/actionstack.cpp
@@ -0,0 +1,23 @@
+#include "actionstack.h"
+
+ActionStack::ActionStack()
+{
+
+}
+
+ActionStack::~ActionStack()
+{
+
+}
+
+LineAction ActionStack::GetRecentAction()
+{
+   return _actionstack.pop();
+}
+
+void ActionStack::PushNewAction(const LineAction &action)
+{
+    _actionstack.push_back(action);
+
+}
+
diff --git a/src/UndoFramework/actionstack.h b/src/UndoFramework/actionstack.h
new file mode 100644
index 0000000..3a677f1
--- /dev/null
+++ b/src/UndoFramework/actionstack.h
@@ -0,0 +1,20 @@
+#ifndef ACTIONSTACK_H
+#define ACTIONSTACK_H
+
+#include <QStack>
+#include "action.h"
+#include "paintaction.h"
+
+class ActionStack
+{
+public:
+    ActionStack();
+    ~ActionStack();
+
+    LineAction GetRecentAction();
+    void PushNewAction(const LineAction& action);
+private:
+    QStack<LineAction> _actionstack;
+};
+
+#endif // ACTIONSTACK_H
diff --git a/src/UndoFramework/paintaction.cpp b/src/UndoFramework/paintaction.cpp
new file mode 100644
index 0000000..d40877c
--- /dev/null
+++ b/src/UndoFramework/paintaction.cpp
@@ -0,0 +1,22 @@
+#include "paintaction.h"
+
+LineAction::LineAction()
+{
+
+}
+
+LineAction::LineAction(const QString &name, const QString &type, const QLineF &oldLine) : Action(name,type)
+{
+    _oldLine=oldLine;
+}
+
+LineAction::~LineAction()
+{
+
+}
+
+QLineF LineAction::GetOldLine() const
+{
+    return _oldLine;
+}
+
diff --git a/src/UndoFramework/paintaction.h b/src/UndoFramework/paintaction.h
new file mode 100644
index 0000000..d87f0a3
--- /dev/null
+++ b/src/UndoFramework/paintaction.h
@@ -0,0 +1,19 @@
+#ifndef PAINTACTION_H
+#define PAINTACTION_H
+
+#include "action.h"
+#include <QLine>
+
+class LineAction : public Action
+{
+public:
+    LineAction();
+    LineAction(const QString& name, const QString& type, const QLineF& oldLine);
+    ~LineAction();
+
+    QLineF GetOldLine() const;
+private:
+    QLineF _oldLine;
+};
+
+#endif // PAINTACTION_H
diff --git a/src/mainWindow.cpp b/src/mainWindow.cpp
index 65a1742..7b1d525 100644
--- a/src/mainWindow.cpp
+++ b/src/mainWindow.cpp
@@ -143,7 +143,8 @@ MWindow :: MWindow() {
     //CMap
     connect(actionRun_visualisation,SIGNAL(triggered(bool)),this,SLOT(RunCMap()));
     connect(_cMapTimer,SIGNAL(timeout()),this,SLOT(UpdateCMap()));
-
+    //Undo
+    //connect(actionUndo,SIGNAL(triggered(bool)),mview,SLOT(Undo()));
 }
 
 MWindow::~MWindow()

From 4967cb59fed4758add03dec1df47ff97acbf552c Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Wed, 20 Jan 2016 15:03:24 +0100
Subject: [PATCH 42/53] Take out Undo Framework again since the code is not
 compiling on mac

---
 forms/mainwindow.ui |  4 ++--
 src/GraphicView.cpp | 30 +++++++++++++++---------------
 src/GraphicView.h   |  4 ++--
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/forms/mainwindow.ui b/forms/mainwindow.ui
index 4258bd9..6a1b77b 100644
--- a/forms/mainwindow.ui
+++ b/forms/mainwindow.ui
@@ -510,8 +510,8 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset>
-     <normaloff>Undo-icon.png</normaloff>Undo-icon.png</iconset>
+    <iconset resource="Ressource.qrc">
+     <normaloff>:/Undo-icon.png</normaloff>:/Undo-icon.png</iconset>
    </property>
    <property name="text">
     <string>Undo</string>
diff --git a/src/GraphicView.cpp b/src/GraphicView.cpp
index f5a0d46..2f8e26b 100644
--- a/src/GraphicView.cpp
+++ b/src/GraphicView.cpp
@@ -229,7 +229,7 @@ void jpsGraphicsView::mousePressEvent(QMouseEvent *mouseEvent)
         }
         else
         {
-            ///LineEdit
+            //LineEdit
             if (_currentTrackedPoint!=nullptr && line_tracked==1)
             {
                 EditLine(_currentTrackedPoint);
@@ -238,7 +238,7 @@ void jpsGraphicsView::mousePressEvent(QMouseEvent *mouseEvent)
             }
             else
             {
-                ///Select_mode
+                //Select_mode
                 currentSelectRect=Scene->addRect(translated_pos.x(),translated_pos.y(),0,0,QPen(Qt::blue,0));
                 currentSelectRect->setTransform(QTransform::fromTranslate(translation_x,translation_y), true);
                 leftbutton_hold=true;
@@ -1039,23 +1039,23 @@ bool jpsGraphicsView::show_hide_roomCaption(QString name, qreal x, qreal y)
     return true;
 }
 
-void jpsGraphicsView::RecordLineAction(const QString& name, const QString& type, const QLineF &oldLine)
-{
-    _undoStack.PushNewAction(LineAction(name,type,oldLine));
-}
+//void jpsGraphicsView::RecordLineAction(const QString& name, const QString& type, const QLineF &oldLine)
+//{
+//    _undoStack.PushNewAction(LineAction(name,type,oldLine));
+//}
 
-void jpsGraphicsView::Undo()
-{
-    const LineAction recentAction = _undoStack.GetRecentAction();
+//void jpsGraphicsView::Undo()
+//{
+//    const LineAction recentAction = _undoStack.GetRecentAction();
 
 
-    if (recentAction.GetName()=="LineDeleted")
-        addLineItem(recentAction.GetOldLine().p1().x(),recentAction.GetOldLine().p1().y(),recentAction.GetOldLine().p2().x(),
-                    recentAction.GetOldLine().p2().y(),recentAction.GetType());
+//    if (recentAction.GetName()=="LineDeleted")
+//        addLineItem(recentAction.GetOldLine().p1().x(),recentAction.GetOldLine().p1().y(),recentAction.GetOldLine().p2().x(),
+//                    recentAction.GetOldLine().p2().y(),recentAction.GetType());
 
-    _redoStack.PushNewAction(LineAction("LineAdded",recentAction.GetType(),QLineF(0,0,0,0)));
+//    _redoStack.PushNewAction(LineAction("LineAdded",recentAction.GetType(),QLineF(0,0,0,0)));
 
-}
+//}
 
 
 void jpsGraphicsView::line_collision() ///FIX ME!!!
@@ -1410,7 +1410,7 @@ void jpsGraphicsView::delete_marked_lines()
              type = "Door";
         else
              type = "Wall";
-        RecordLineAction("LineDeleted",type,marked_lines.back()->get_line()->line());
+        //RecordLineAction("LineDeleted",type,marked_lines.back()->get_line()->line());
         marked_lines.clear();
 
         //intersect_point_vector.clear();
diff --git a/src/GraphicView.h b/src/GraphicView.h
index aead041..5466f7c 100644
--- a/src/GraphicView.h
+++ b/src/GraphicView.h
@@ -127,7 +127,7 @@ class jpsGraphicsView: public QGraphicsView {
     bool show_hide_roomCaption(QString name, qreal x, qreal y);
 
     //Undo Framework
-    void RecordLineAction(const QString &name, const QString &type, const QLineF &oldLine);
+    //void RecordLineAction(const QString &name, const QString &type, const QLineF &oldLine);
 
 
 public slots:
@@ -142,7 +142,7 @@ public slots:
     //Line operations
     void SelectAllLines();
     //Undo Redo
-    void Undo();
+    //void Undo();
 
 protected:
     //Mouse events

From a6ed6651b31fc888564446659112a38d4593849f Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Wed, 20 Jan 2016 15:19:16 +0100
Subject: [PATCH 43/53] Forgot to remove Actionstack in GRAPHICVIEW_H

---
 src/GraphicView.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/GraphicView.h b/src/GraphicView.h
index 5466f7c..5f8d6be 100644
--- a/src/GraphicView.h
+++ b/src/GraphicView.h
@@ -208,8 +208,8 @@ public slots:
     bool _gridmode;
 
     //Undo/Redo
-    ActionStack _undoStack;
-    ActionStack _redoStack;
+    //ActionStack _undoStack;
+    //ActionStack _redoStack;
 
 
 signals:

From 5fdcfa449c57b1ddca7b1e3d470335cc937b17e7 Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Thu, 28 Jan 2016 11:27:29 +0100
Subject: [PATCH 44/53] :new: Creation of HLines (automatic detection of
 belonging room) :memo: edit changelog, authors and readme

---
 AUTHORS                           |  12 ++
 CHANGELOG.md                      | 104 +++-------------
 README.md                         |  71 +++--------
 forms/Ressource.qrc               |   1 +
 forms/mainwindow.ui               |  41 ++++++
 jpseditor.pro                     |   8 +-
 src/GraphicView.cpp               | 155 ++++++++++++++++++-----
 src/GraphicView.h                 |  18 ++-
 src/UndoFramework/actionstack.cpp |   7 +-
 src/UndoFramework/actionstack.h   |   3 +-
 src/UndoFramework/paintaction.cpp |  22 ----
 src/UndoFramework/paintaction.h   |  19 ---
 src/datamanager.cpp               | 200 ++++++++++++++++++++++--------
 src/datamanager.h                 |   8 +-
 src/jpsLineItem.cpp               |  32 ++++-
 src/jpsLineItem.h                 |   6 +-
 src/jpscrossing.cpp               |   2 +
 src/mainWindow.cpp                |  22 +++-
 src/mainWindow.h                  |   1 +
 src/rooms.cpp                     |  52 +++++---
 src/rooms.h                       |  10 +-
 src/roomwidget.cpp                |  26 ++--
 src/roomwidget.h                  |   4 +-
 23 files changed, 513 insertions(+), 311 deletions(-)
 delete mode 100644 src/UndoFramework/paintaction.cpp
 delete mode 100644 src/UndoFramework/paintaction.h

diff --git a/AUTHORS b/AUTHORS
index 89b7a4a..a56f59a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,11 +1,23 @@
 JuPedSim contributors:
+(Date: 27.01.2016)
 
 Erik Andresen
 Mohcine Chraibi
+Arne Graf
 David Haensel
+Weichen Liao
 Ulrich Kemloh
+Maximilian Osterkamp
 Andrea Portz
 Oliver Schmidts
+Benjamin Schröder
 Denis Shhikhalev
+Antoine Tordeux
 Jun Zhang
 
+JPSeditor contributors:
+(Date: 27.01.2016)
+
+Erik Andresen
+Maximilian Osterkamp
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bab618f..e9318ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,94 +6,18 @@ All notable changes to this project will be documented in this file.
 
 
 ### Added
-#### JPSCORE
-- CI with travis and Gitlab CI
-- Compilation checked on Visual Studio 12 2013 
-- Added more validation tests
-- Added statistics (calculate exit usage) for all exits
-- Added voronoi based algorithm for inserting agents coming from the source or from matsim
-- New option for the quickest path router. Sample options are:
- ```<parameters default_strategy="local_shortest">```
-  ```<parameters default_strategy="global_shortest">``` 
-   ``` <parameters cba_gain="0.15" reference_peds_selection="single" congestion_ratio="0.8" queue_vel_escaping_jam="0.2" 
-       queue_vel_new_room="0.7" visibility_obstruction="4">
-```
-- New model with the generic name `Tordeux2015` and `id=3`. For use check the ini-files in the Utest-validation tests.
-- Tests are sorted in `rimea_tests`, `juelich_tests` and `validation_tests`.
-- Periodic boundary conditions with the option `<periodic>1</periodic>`.Works only with model 3.  
-- Added Floorfield to all exits, providing direction to target, direction to closest wall and cost estimates. Parameter to control wall-avoidance included.
-   
-#### JPSVIS
-- Added option to load  vtk files. Need to add the line ``` <gradient_field filename="floorfield.vtk"> 
-``` in the header of the trajectory file. Alternatively drag and drop a vtk file on JPSvis.
- 
-- Fixed error displaying the total number of frames when using the scroolbar
- 
-#### JPSREPORT
-- Added geometry information while plotting the voronoi cells
-- Added option to disable plotting
-- Issue a warning when the voronoi cell cannot be calculated 
-- Fixed error where all trajectories were colinear
-
 #### JPSEDITOR
- 
-
-## v0.7.0 [2015-07-15]
-
-### New Module
-- JuPedSim: Editor for the geometry
-
-### Added
-
-- Risk tolerance factor (value in [0 1]) for pedestrian. Pedestrians with high values are likely to take more risks.
-- Added pre-movement time of the agents. Only after this time, the concerned agents will start moving.
-- Sources for generating agents at runtime. Parameter are frequency (agents per seconds) and maximum number
-- Option to color the pedestrians by group, spotlight, velocity, group, knowledge, router, final\_goal, intermediate\_goal. Usage: ( 
-```<trajectories format="xml-plain" fps="8" color_mode="group"> ```)
-- More control over the triangulation specially to avoid skinny triangles. Usage: ```<navigation_mesh method="triangulation" minimum_distance_between_edges="0.5" minimum_angle_in_triangles="20" use_for_local_planning="true" />```
-- Improved statistics. The flow curve for the different exits can be computed at runtime.
-- Changelog file
-- Rimea testcases
-- Unit tests are now based on the Boost testing engine
-#### JPSVIS
-- Display the geometry structure individual room/subroom.
-- Now build on OSX/Linux/Windows 
-
-### Changed
--  
--  
-
-### Fixed
-- Visiblity in 3D
-- Numerous geometrical operations
-
-
-## v0.6.0 - 2015-01-31
-### Added
-- Steering the simulation with predefined events (closing or opening doors during the simulation)
-- Information sharing between the pedestrians. The agents now share their knowledge about closed doors.
-- Pre evacuation time for groups of agents.
-- Adjustable velocities on stairs and even terrain for group of agents.
-- Stability and performance improvement. The simulation is approx 40% faster for larger scenarios and you will notice it
-- New route choice model, cognitive map, giving agents the possibility to explore the environment and discover doors for instance.
-- Different sensors for improving the navigation of pedestrians (smoke/jam sensor).
-- New verification and validation tests.
-- General statistics over the evacuation (for instance areas egress time and door usage)
-- Support for Visual Studio and Xcode compilers.
-
-
-### Changed
-- refactor NumCPU and ExitCrossingStrategy tags to `num_threads and exit_crossing_strategy`
-
-
-
-## v0.5.0 - 2014-08-05
-First release of the the Juelich Pedestrian Simulator. Most noteworthy features:
-
-- Simulate pedestrians movement in a space continuous geometry
-- Forces based models for describing the pedestrians interactions
-- Shortest and quickest path route choice strategies
-- Loading and visualizing trajectories and geometries
-- Easy to use visualization interface
-- Making high quality videos directly from the visualization interface or generating png sequences
-- XML based input files
\ No newline at end of file
+- First approaches of an undo/redo framework
+	- Undo/Redo working when line added or deleted
+- DXF import with different layers - Not working properly with AutoCAD ?! 
+- Bug fixes
+- CAD features
+	- Point and line grid
+	- object snap
+	- Orthomode
+	- Zooming 
+	- Line editing
+	- Length of line is displayed
+	- ...
+- Room and door declarations
+	
diff --git a/README.md b/README.md
index 4c04dd7..c99fd77 100644
--- a/README.md
+++ b/README.md
@@ -1,29 +1,33 @@
-JuPedSim v0.6 alpha
+JuPedSim v0.8 alpha
+JPSeditor v0.8 alpha
 ====================
 
-Ulrich Kemloh drafted this on 25 Jun 2014
+Erik Andresen drafted this on 27 Jun 2016
 
-We are proud to announce the first alpha release of our software JuPedSim for simulating pedestrians evacuations. Please note that it is a pre release version for developers only. We are working hard towards the final release for this version. Two modules are shipped with this pre-release:
+We are proud to announce the first alpha release of our software JPSeditor (part of JuPedSim for simulating pedestrians evacuations). Please note that it is a pre release version for developers only. We are working hard towards the final release for this version.
+
+JPSeditor is a graphical user interface to create the geometry of a scenario simulated by JuPedSim. It comes with set of CAD- and further tools to simplify the creation of proper xml-files 
+incorporating information about the scenario' geometry.
 
-- *jpscore*: command line simulation core
-- *jpsvis*: visualization module
 
 Features
 ========
 
-- Simulate pedestrians movement in a space continuous geometry
-- Forces-based models for describing the pedestrians interactions
-- Shortest and quickest path route choice strategies
-- Loading and visualizing trajectories and geometries
-- Easy to use visualization interface
-- Making high quality videos directly from the visualization interface or generating png screenshots
-- XML based input files
+- DXF Import / Export
+- CAD features
+	- Point and line grid
+	- object snap
+	- Orthomode
+	- Zooming 
+	- Line editing
+	- ...
+- Tools for room and door declarations
 
 
-Showcase
+Tutorial
 ========
 
-To highlight some features of JuPedSim we have uploaded some videos on our [YouTube channel](https://www.youtube.com/user/JuPedSim).
+To highlight some features of JuPedSim we have uploaded some videos on our [YouTube channel](https://www.youtube.com/user/JuPedSim) including a tutorial showing how to use the editor.
 
 
 Installing
@@ -39,39 +43,7 @@ As JuPedSim comes with no installer, you just need to delete the unziped directo
 Running
 =======
 
-    jpscore.exe my_simulation_ini.xml
-
-from the command line (or also dropping the file on the executable) will generate a trajectory file, which you can visualize with `jpsvis`.
-You will find some projects samples in the downloaded files and further information in the manual.
-
-Compiling from sources
-======================
-
-You can compile the simulation core for your specific platform with the supplied cmake script.
-The only requirement is a compiler supporting the new standard c++11.
-
-Windows (tested on Win7 with MinGW 4.8)
----------------------------------------
-
-    cmake -G "MinGW Makefiles" CMakeList.txt
-    make-mingw32.exe
-
-Linux (tested on Ubuntu 14.04 with gcc 4.8)
----------------
-
-    cmake CMakeList.txt
-    make
-
-OSX (tested on OSX Maverick with clang 5.1 and Yosemite with clang 6.1)
----------------------
-
-    cmake   CMakeList.txt
-    make
-
-Note that the OpenMP acceleration might be missing under OSX
-
-For the visualization module (`jpsvis`) at least Qt version 4.5 and VTK version 4.8 are required.
-You can download the latest version of QT [here](https://www.qt.io/download/) and the latest version of VTK [here](http://www.vtk.org/download/).
+Start the application by clicking on the binary file. (For example .exe)
 
 System Requirements
 ==============
@@ -79,11 +51,6 @@ System Requirements
 There is no special hardware/software requirements for running JuPedSim. The distributed binaries however, are only available for windows at the moment. For compiling from sources you need a compiler with c++11 support is needed for the core. Qt version >=4.5 and VTK >5.8 are needed for the visualization.
 
 
-Known Issues
-============
-
-Some verification tests are still failing. The actual cdash-board can be found [here](http://my.cdash.org/index.php?project=JuPedSim) 
-Occasionaly jpscore crashes if the input file is not valid. Make sure to validate your XML input files with the supplied XSD files.
 
 Frequently Asked Questions
 ===========================
diff --git a/forms/Ressource.qrc b/forms/Ressource.qrc
index 647c8bb..ecefdd3 100644
--- a/forms/Ressource.qrc
+++ b/forms/Ressource.qrc
@@ -40,5 +40,6 @@
         <file>statue_specs.jpg</file>
         <file>anglesnap.PNG</file>
         <file>Undo-icon.png</file>
+        <file>Redo-Icon.png</file>
     </qresource>
 </RCC>
diff --git a/forms/mainwindow.ui b/forms/mainwindow.ui
index 6a1b77b..97af0c1 100644
--- a/forms/mainwindow.ui
+++ b/forms/mainwindow.ui
@@ -101,9 +101,11 @@
    <addaction name="actionSelect_Mode"/>
    <addaction name="separator"/>
    <addaction name="actionUndo"/>
+   <addaction name="actionRedo"/>
    <addaction name="separator"/>
    <addaction name="actionWall"/>
    <addaction name="actionDoor"/>
+   <addaction name="actionHLine"/>
    <addaction name="separator"/>
    <addaction name="actiongridmode"/>
    <addaction name="separator"/>
@@ -526,6 +528,45 @@
     <bool>true</bool>
    </property>
   </action>
+  <action name="actionRedo">
+   <property name="icon">
+    <iconset resource="Ressource.qrc">
+     <normaloff>:/Redo-Icon.png</normaloff>:/Redo-Icon.png</iconset>
+   </property>
+   <property name="text">
+    <string>Redo</string>
+   </property>
+   <property name="toolTip">
+    <string>Redo</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+U</string>
+   </property>
+  </action>
+  <action name="actionHLine">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="enabled">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="Ressource.qrc">
+     <normaloff>:/Wall.png</normaloff>:/Wall.png</iconset>
+   </property>
+   <property name="text">
+    <string>HLine</string>
+   </property>
+   <property name="toolTip">
+    <string>HLine</string>
+   </property>
+   <property name="shortcut">
+    <string>H</string>
+   </property>
+   <property name="iconVisibleInMenu">
+    <bool>true</bool>
+   </property>
+  </action>
  </widget>
  <resources>
   <include location="Ressource.qrc"/>
diff --git a/jpseditor.pro b/jpseditor.pro
index 9562618..7186b31 100644
--- a/jpseditor.pro
+++ b/jpseditor.pro
@@ -59,8 +59,8 @@ HEADERS += \
     src/jpsyahpointer.h \
     src/jpsconnection.h \
     src/UndoFramework/actionstack.h \
-    src/UndoFramework/paintaction.h \
-    src/UndoFramework/action.h
+    src/UndoFramework/action.h \
+    src/UndoFramework/lineaction.h
 
 
 SOURCES += \
@@ -84,8 +84,8 @@ SOURCES += \
     src/jpsyahpointer.cpp \
     src/jpsconnection.cpp \
     src/UndoFramework/actionstack.cpp \
-    src/UndoFramework/paintaction.cpp \
-    src/UndoFramework/action.cpp
+    src/UndoFramework/action.cpp \
+    src/UndoFramework/lineaction.cpp
 
 
 RESOURCES +=  forms/Ressource.qrc
diff --git a/src/GraphicView.cpp b/src/GraphicView.cpp
index 2f8e26b..1bbc9fb 100644
--- a/src/GraphicView.cpp
+++ b/src/GraphicView.cpp
@@ -64,6 +64,7 @@ jpsGraphicsView::jpsGraphicsView(QWidget* parent):QGraphicsView(parent)
     statWall=false;
     statDoor=false;
     statExit=false;
+    _statHLine=false;
     statLandmark=false;
     markedLandmark=nullptr;
     currentLandmarkRect=nullptr;
@@ -206,9 +207,9 @@ void jpsGraphicsView::mousePressEvent(QMouseEvent *mouseEvent)
     if (mouseEvent->button() == Qt::LeftButton)
     {
 
-        if (statWall==true || statDoor==true || statExit==true)
+        if (statWall || statDoor || statExit || _statHLine)
         {
-            /// If line is edited currently
+            // If line is edited currently
             if (_statLineEdit)
             {
                 for (jpsLineItem* line:line_vector)
@@ -774,11 +775,11 @@ void jpsGraphicsView::catch_lines()
 
 void jpsGraphicsView::drawLine()
 {
-    if (current_line==nullptr) /// if the mouse was pressed first of two times
+    if (current_line==nullptr) // if the mouse was pressed first of two times
     {
-        ///Determining first point of line
+        //Determining first point of line
 
-        /// all two points of the line are inited with the cursorcoordinates
+        // all two points of the line are inited with the cursorcoordinates
         current_line = Scene->addLine(translated_pos.x(),translated_pos.y(),translated_pos.x(),translated_pos.y(),currentPen);
         //current_line->translate(translation_x,translation_y);
         current_line->setTransform(QTransform::fromTranslate(translation_x,translation_y), true);
@@ -804,19 +805,22 @@ void jpsGraphicsView::drawLine()
             }
         }
 
-        lineItem->set_type(statWall,statDoor,statExit);
+        lineItem->set_type(statWall,statDoor,statExit,_statHLine);
         line_vector.push_back(lineItem);
 
-        ///reset pointer
+        //reset pointer
         current_line=nullptr;
 
+        //Undo
+        RecordUndoLineAction("LineAdded",lineItem->GetType(),lineItem->get_line()->line());
+
         drawLine();
 
 
 
     }
 
-    ///Vline
+    //Vline
     if (_currentVLine!=nullptr)
     {
         delete _currentVLine;
@@ -849,16 +853,16 @@ void jpsGraphicsView::disable_drawing()
     statExit=false;
     statLandmark=false;
     _statLineEdit=false;
-    /// if drawing was canceled by pushing ESC
+    // if drawing was canceled by pushing ESC
     if (current_line!=nullptr)
     {
-        ///not completed line will be deleted
+        //not completed line will be deleted
         delete current_line;
         current_line=nullptr;
     }
     if (_currentVLine!=nullptr)
     {
-        ///VLine will be deleted
+        //VLine will be deleted
         delete _currentVLine;
         _currentVLine=nullptr;
     }
@@ -910,6 +914,11 @@ jpsLineItem* jpsGraphicsView::addLineItem(const qreal &x1,const qreal &y1,const
 
 }
 
+jpsLineItem *jpsGraphicsView::addLineItem(const QLineF &line, const QString &type)
+{
+    return addLineItem(line.p1().x(),line.p1().y(),line.p2().x(),line.p2().y(),type);
+}
+
 void jpsGraphicsView::locate_intersection(jpsLineItem *item1, jpsLineItem *item2)
 {
 
@@ -1039,26 +1048,65 @@ bool jpsGraphicsView::show_hide_roomCaption(QString name, qreal x, qreal y)
     return true;
 }
 
-//void jpsGraphicsView::RecordLineAction(const QString& name, const QString& type, const QLineF &oldLine)
-//{
-//    _undoStack.PushNewAction(LineAction(name,type,oldLine));
-//}
+void jpsGraphicsView::RecordUndoLineAction(const QString& name, const QString& type, const QLineF &oldLine)
+{
+    _undoStack.PushNewAction(LineAction(name,type,oldLine));
+}
+
+void jpsGraphicsView::RecordRedoLineAction(const QString &name, const QString &type, const QLineF &oldLine)
+{
+    _redoStack.PushNewAction(LineAction(name,type,oldLine));
+}
+
+void jpsGraphicsView::Undo()
+{
+    if (!_undoStack.IsEmpty())
+    {
+        const LineAction recentAction = _undoStack.GetRecentAction();
+
+        if (recentAction.GetName()=="LineDeleted")
+        {
+            addLineItem(recentAction.GetOldLine().p1().x(),recentAction.GetOldLine().p1().y(),recentAction.GetOldLine().p2().x(),
+                        recentAction.GetOldLine().p2().y(),recentAction.GetType());
+
+            RecordRedoLineAction("LineAdded",recentAction.GetType(),QLineF(0,0,0,0));
+        }
+        else if (recentAction.GetName()=="LineAdded")
+        {
+            RecordRedoLineAction("LineDeleted",line_vector.back()->GetType(),line_vector.back()->get_line()->line());
+            RemoveLineItem(line_vector.back());
+        }
+    }
+
+}
+
+void jpsGraphicsView::Redo()
+{
+    if (!_redoStack.IsEmpty())
+    {
+        const LineAction recentAction = _redoStack.GetRecentAction();
+
+        if (recentAction.GetName()=="LineDeleted")
+        {
+            addLineItem(recentAction.GetOldLine().p1().x(),recentAction.GetOldLine().p1().y(),recentAction.GetOldLine().p2().x(),
+                        recentAction.GetOldLine().p2().y(),recentAction.GetType());
 
-//void jpsGraphicsView::Undo()
-//{
-//    const LineAction recentAction = _undoStack.GetRecentAction();
+            RecordUndoLineAction("LineAdded",recentAction.GetType(),QLineF(0,0,0,0));
+        }
 
+        else if (recentAction.GetName()=="LineAdded")
+        {
+            RecordUndoLineAction("LineDeleted",line_vector.back()->GetType(),line_vector.back()->get_line()->line());
+            RemoveLineItem(line_vector.back());
 
-//    if (recentAction.GetName()=="LineDeleted")
-//        addLineItem(recentAction.GetOldLine().p1().x(),recentAction.GetOldLine().p1().y(),recentAction.GetOldLine().p2().x(),
-//                    recentAction.GetOldLine().p2().y(),recentAction.GetType());
+        }
 
-//    _redoStack.PushNewAction(LineAction("LineAdded",recentAction.GetType(),QLineF(0,0,0,0)));
 
-//}
+    }
+}
 
 
-void jpsGraphicsView::line_collision() ///FIX ME!!!
+void jpsGraphicsView::line_collision() //FIX ME!!!
 {
     /// if no lines collided yet
     if (!lines_collided && current_line!=nullptr)
@@ -1395,22 +1443,20 @@ void jpsGraphicsView::delete_marked_lines()
         for (int i=0; i<marked_lines.size(); ++i)
         {
 
+            RecordUndoLineAction("LineDeleted",marked_lines[i]->GetType(),marked_lines[i]->get_line()->line());
 
             RemoveIntersections(marked_lines[i]);
 
+
             delete marked_lines[i]->get_line();
             //marked_lines[i]->set_line(nullptr);
             delete marked_lines[i];
             line_vector.removeOne(marked_lines[i]);
 
 
+
         }
-        QString type;
-        if (marked_lines.back()->is_Door())
-             type = "Door";
-        else
-             type = "Wall";
-        //RecordLineAction("LineDeleted",type,marked_lines.back()->get_line()->line());
+
         marked_lines.clear();
 
         //intersect_point_vector.clear();
@@ -1421,6 +1467,30 @@ void jpsGraphicsView::delete_marked_lines()
 
 }
 
+void jpsGraphicsView::RemoveLineItem(jpsLineItem *mline)
+{
+    RemoveIntersections(mline);
+    line_vector.removeOne(mline);
+    delete mline->get_line();
+    delete mline;
+    emit lines_deleted();
+
+}
+
+void jpsGraphicsView::RemoveLineItem(const QLineF &line)
+{
+    for (jpsLineItem* lineItem:line_vector)
+    {
+        if (lineItem->get_line()->line()==line)
+        {
+            unmark_all_lines();
+            select_line(lineItem);
+            delete_marked_lines();
+        }
+    }
+
+}
+
 void jpsGraphicsView::RemoveIntersections(jpsLineItem *lineItem)
 {
     QList<QPointF *> points = lineItem->get_intersectionVector();
@@ -1565,6 +1635,7 @@ void jpsGraphicsView::en_disableWall()
     statWall=!statWall;
     statDoor=false;
     statExit=false;
+    _statHLine=false;
     statLandmark=false;
     if (statWall==false)
     {
@@ -1598,6 +1669,7 @@ void jpsGraphicsView::en_disableDoor()
     statExit=false;
     statWall=false;
     statLandmark=false;
+    _statHLine=false;
     if (statDoor==false)
     {
         emit no_drawing();
@@ -1619,6 +1691,7 @@ void jpsGraphicsView::en_disableExit()
     statExit=!statExit;
     statDoor=false;
     statWall=false;
+    _statHLine=false;
     statLandmark=false;
     if (statExit==false)
     {
@@ -1630,6 +1703,28 @@ void jpsGraphicsView::en_disableExit()
     }
 }
 
+bool jpsGraphicsView::statusHLine()
+{
+    return _statHLine;
+}
+
+void jpsGraphicsView::en_disableHLine()
+{
+    _statHLine=!_statHLine;
+    statExit=false;
+    statDoor=false;
+    statWall=false;
+    statLandmark=false;
+    if (_statHLine==false)
+    {
+        emit no_drawing();
+    }
+    else
+    {
+        currentPen.setColor(Qt::darkCyan);
+    }
+}
+
 bool jpsGraphicsView::statusLandmark()
 {
     return statLandmark;
diff --git a/src/GraphicView.h b/src/GraphicView.h
index 5f8d6be..06be9be 100644
--- a/src/GraphicView.h
+++ b/src/GraphicView.h
@@ -63,6 +63,8 @@ class jpsGraphicsView: public QGraphicsView {
     void en_disableDoor();
     bool statusExit();
     void en_disableExit();
+    bool statusHLine();
+    void en_disableHLine();
     bool statusLandmark();
     void en_disableLandmark();
 
@@ -96,9 +98,12 @@ class jpsGraphicsView: public QGraphicsView {
     void drawLine();
     qreal calc_d_point(const QLineF &line, const qreal &x, const qreal &y);
     void delete_marked_lines();
+    void RemoveLineItem(jpsLineItem *mline);
+    void RemoveLineItem(const QLineF &line);
     void RemoveIntersections(jpsLineItem* lineItem);
     // lines read from dxf-file
     jpsLineItem *addLineItem(const qreal &x1, const qreal &y1, const qreal &x2, const qreal &y2, const QString &type="");
+    jpsLineItem *addLineItem(const QLineF &line, const QString &type="");
     QList<jpsLineItem *> get_markedLines();
     QList<jpsLineItem *> get_line_vector();
     void unmark_all_lines();
@@ -127,8 +132,8 @@ class jpsGraphicsView: public QGraphicsView {
     bool show_hide_roomCaption(QString name, qreal x, qreal y);
 
     //Undo Framework
-    //void RecordLineAction(const QString &name, const QString &type, const QLineF &oldLine);
-
+    void RecordUndoLineAction(const QString &name, const QString &type, const QLineF &oldLine);
+    void RecordRedoLineAction(const QString &name, const QString &type, const QLineF &oldLine);
 
 public slots:
     //Waypoints
@@ -142,7 +147,8 @@ public slots:
     //Line operations
     void SelectAllLines();
     //Undo Redo
-    //void Undo();
+    void Undo();
+    void Redo();
 
 protected:
     //Mouse events
@@ -155,6 +161,7 @@ public slots:
 
 private:
     QGraphicsLineItem* current_line;
+    QPolygonF polygon;
     //std::vector<jpsLineItem> line_vector;
     QList<QPointF *> intersect_point_vector;
     //QList<QPointF> grid_point_vector;
@@ -174,6 +181,7 @@ public slots:
     bool statDoor;
     bool statExit;
     bool statLandmark;
+    bool _statHLine;
     qreal catch_radius;
     qreal _scaleFactor;
     qreal gl_scale_f;
@@ -208,8 +216,8 @@ public slots:
     bool _gridmode;
 
     //Undo/Redo
-    //ActionStack _undoStack;
-    //ActionStack _redoStack;
+    ActionStack _undoStack;
+    ActionStack _redoStack;
 
 
 signals:
diff --git a/src/UndoFramework/actionstack.cpp b/src/UndoFramework/actionstack.cpp
index 420c9c1..84bf454 100644
--- a/src/UndoFramework/actionstack.cpp
+++ b/src/UndoFramework/actionstack.cpp
@@ -11,7 +11,7 @@ ActionStack::~ActionStack()
 }
 
 LineAction ActionStack::GetRecentAction()
-{
+{ 
    return _actionstack.pop();
 }
 
@@ -21,3 +21,8 @@ void ActionStack::PushNewAction(const LineAction &action)
 
 }
 
+bool ActionStack::IsEmpty()
+{
+    return _actionstack.isEmpty();
+}
+
diff --git a/src/UndoFramework/actionstack.h b/src/UndoFramework/actionstack.h
index 3a677f1..364f7f5 100644
--- a/src/UndoFramework/actionstack.h
+++ b/src/UndoFramework/actionstack.h
@@ -3,7 +3,7 @@
 
 #include <QStack>
 #include "action.h"
-#include "paintaction.h"
+#include "lineaction.h"
 
 class ActionStack
 {
@@ -13,6 +13,7 @@ class ActionStack
 
     LineAction GetRecentAction();
     void PushNewAction(const LineAction& action);
+    bool IsEmpty();
 private:
     QStack<LineAction> _actionstack;
 };
diff --git a/src/UndoFramework/paintaction.cpp b/src/UndoFramework/paintaction.cpp
deleted file mode 100644
index d40877c..0000000
--- a/src/UndoFramework/paintaction.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "paintaction.h"
-
-LineAction::LineAction()
-{
-
-}
-
-LineAction::LineAction(const QString &name, const QString &type, const QLineF &oldLine) : Action(name,type)
-{
-    _oldLine=oldLine;
-}
-
-LineAction::~LineAction()
-{
-
-}
-
-QLineF LineAction::GetOldLine() const
-{
-    return _oldLine;
-}
-
diff --git a/src/UndoFramework/paintaction.h b/src/UndoFramework/paintaction.h
deleted file mode 100644
index d87f0a3..0000000
--- a/src/UndoFramework/paintaction.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef PAINTACTION_H
-#define PAINTACTION_H
-
-#include "action.h"
-#include <QLine>
-
-class LineAction : public Action
-{
-public:
-    LineAction();
-    LineAction(const QString& name, const QString& type, const QLineF& oldLine);
-    ~LineAction();
-
-    QLineF GetOldLine() const;
-private:
-    QLineF _oldLine;
-};
-
-#endif // PAINTACTION_H
diff --git a/src/datamanager.cpp b/src/datamanager.cpp
index 117bb25..da93a7b 100644
--- a/src/datamanager.cpp
+++ b/src/datamanager.cpp
@@ -277,6 +277,32 @@ void jpsDatamanager::writeXML(QFile &file)
     delete stream;
 }
 
+void jpsDatamanager::writeRoutingXML(QFile &file) // Construction side
+{
+    QXmlStreamWriter* stream = new QXmlStreamWriter(&file);
+    QList<jpsLineItem* > hLines;
+
+    for (jpsLineItem* line:mView->get_line_vector())
+    {
+        if (line->IsHLine())
+        {
+            hLines.push_back(line);
+        }
+    }
+
+
+    writeRoutingHeader(stream);
+
+    stream->writeStartElement("Hlines");
+    writeHLines(stream,hLines);
+    stream->writeEndElement();//Hlines
+
+    stream->writeEndDocument();
+
+    delete stream;
+
+}
+
 void jpsDatamanager::AutoSaveXML(QFile &file)
 {
     QXmlStreamWriter* stream = new QXmlStreamWriter(&file);
@@ -310,13 +336,87 @@ void jpsDatamanager::writeHeader(QXmlStreamWriter *stream)
     stream->writeStartDocument("1.0",true);
 
     stream->writeStartElement("geometry");
-    stream->writeAttribute("version", "0.5");
+    stream->writeAttribute("version", "0.8");
     stream->writeAttribute("caption","corner");
     stream->writeAttribute("xmlns:xsi","http://www.w3.org/2001/XMLSchema-instance");
     stream->writeAttribute("xsi:noNamespaceSchemaLocation","http://xsd.jupedsim.org/jps_geometry.xsd");
     stream->writeAttribute("unit","m");
 }
 
+void jpsDatamanager::writeRoutingHeader(QXmlStreamWriter *stream)
+{
+    stream->setAutoFormatting(true);
+    stream->writeStartDocument("1.0",true);
+
+    stream->writeStartElement("routing");
+    stream->writeAttribute("version", "0.8");
+    //stream->writeAttribute("caption","corner");
+    stream->writeAttribute("xmlns:xsi","http://www.w3.org/2001/XMLSchema-instance");
+    stream->writeAttribute("xsi:noNamespaceSchemaLocation","http://xsd.jupedsim.org/jps_routing.xsd");
+    stream->writeAttribute("unit","m");
+}
+
+void jpsDatamanager::writeHLines(QXmlStreamWriter *stream, QList<jpsLineItem *> &hLines)
+{
+    for (jpsLineItem *lineItem:hLines)
+    {
+        stream->writeStartElement("Hline");
+        stream->writeAttribute("room_id","0");
+        QString rid = RoomIDHLine(lineItem);
+        if (rid.contains("Warning"))
+        {
+            QMessageBox::critical(mView,
+                                  "WriteHLines",
+                                  rid,
+                                  QMessageBox::Ok);
+        }
+        stream->writeAttribute("subroom_id",rid);
+
+            //Vertices
+            stream->writeStartElement("vertex");
+            stream->writeAttribute("px",QString::number(lineItem->get_line()->line().p1().x()));
+            stream->writeAttribute("py",QString::number(lineItem->get_line()->line().p1().y()));
+            stream->writeEndElement(); //vertex
+
+            stream->writeStartElement("vertex");
+            stream->writeAttribute("px",QString::number(lineItem->get_line()->line().p2().x()));
+            stream->writeAttribute("py",QString::number(lineItem->get_line()->line().p2().y()));
+            stream->writeEndElement(); //vertex
+
+        stream->writeEndElement(); //Hline
+    }
+}
+
+QString jpsDatamanager::RoomIDHLine(jpsLineItem *lineItem)
+{
+
+    for (jpsRoom* room:roomlist)
+    {
+        QPolygonF rPolygon = room->RoomAsPolygon();
+        if (rPolygon.containsPoint(lineItem->get_line()->line().p1(),Qt::OddEvenFill) ||
+                rPolygon.contains(lineItem->get_line()->line().p1()))
+        {
+            if (rPolygon.containsPoint(lineItem->get_line()->line().p2(),Qt::OddEvenFill)||
+                    rPolygon.contains(lineItem->get_line()->line().p2()))
+                return QString::number(room->get_id());
+            else
+                return "Warning! HLine intersects walls";
+        }
+        else if (rPolygon.containsPoint(lineItem->get_line()->line().p2(),Qt::OddEvenFill)||
+                 rPolygon.contains(lineItem->get_line()->line().p2()))
+        {
+            if (rPolygon.containsPoint(lineItem->get_line()->line().p1(),Qt::OddEvenFill)||
+                    rPolygon.contains(lineItem->get_line()->line().p1()))
+                return QString::number(room->get_id());
+            else
+                return "Warning! HLine intersects walls";
+        }
+
+    }
+    return "Warning! HLine outside geometry";
+
+}
+
 void jpsDatamanager::writeRooms(QXmlStreamWriter *stream, QList<jpsLineItem *> &lines)
 {
     ///rooms
@@ -365,7 +465,7 @@ void jpsDatamanager::writeRooms(QXmlStreamWriter *stream, QList<jpsLineItem *> &
     }
 
 
-    ///Crossings
+    //Crossings
     writeCrossings(stream,lines);
 
     stream->writeEndElement();//crossings
@@ -756,29 +856,29 @@ jpsGraphicsView * jpsDatamanager::get_view()
     return mView;
 }
 
-void jpsDatamanager::AutoAssignCrossings()
-{
-    QList<jpsCrossing* > crossings = crossingList;
+//void jpsDatamanager::AutoAssignCrossings()
+//{
+//    QList<jpsCrossing* > crossings = crossingList;
 
-    for (jpsCrossing *crossing: crossings)
-    {
-        int roomCounter=0;
-        for (jpsRoom *room : roomlist)
-        {
-            if (room->ContainsDoor(crossing->get_cLine()) && roomCounter==0)
-            {
-                crossing->add_rooms(room);
-                roomCounter++;
+//    for (jpsCrossing *crossing: crossings)
+//    {
+//        int roomCounter=0;
+//        for (jpsRoom *room : roomlist)
+//        {
+//            if (room->ContainsDoor(crossing->get_cLine()) && roomCounter==0)
+//            {
+//                crossing->add_rooms(room);
+//                roomCounter++;
 
-            }
-            else if (room->ContainsDoor(crossing->get_cLine()) && roomCounter==1)
-            {
-                crossing->add_rooms(crossing->get_roomList()[0],room);
-                crossings.removeOne(crossing);
-                break;
-            }
-        }
-    }
+//            }
+//            else if (room->ContainsDoor(crossing->get_cLine()) && roomCounter==1)
+//            {
+//                crossing->add_rooms(crossing->get_roomList()[0],room);
+//                crossings.removeOne(crossing);
+//                break;
+//            }
+//        }
+//    }
 
 
 
@@ -822,38 +922,38 @@ void jpsDatamanager::AutoAssignCrossings()
 
 
 
-}
+//}
 
-void jpsDatamanager::AutoAssignExits()
-{
-    for (jpsExit *exit: exitList)
-    {
-        for (jpsRoom *room: roomlist)
-        {
-            QList<jpsLineItem* > walls = room->get_listWalls();
+//void jpsDatamanager::AutoAssignExits()
+//{
+//    for (jpsExit *exit: exitList)
+//    {
+//        for (jpsRoom *room: roomlist)
+//        {
+//            QList<jpsLineItem* > walls = room->get_listWalls();
 
-            int pointCounter = 0;
+//            int pointCounter = 0;
 
-            for (jpsLineItem* wall: walls)
-            {
-                if (wall->get_line()->line().p1()==exit->get_cLine()->get_line()->line().p1() ||
-                       wall->get_line()->line().p1()==exit->get_cLine()->get_line()->line().p2() ||
-                        wall->get_line()->line().p2()==exit->get_cLine()->get_line()->line().p1() ||
-                        wall->get_line()->line().p2()==exit->get_cLine()->get_line()->line().p2())
-                {
-                    pointCounter++;
-                }
-            }
+//            for (jpsLineItem* wall: walls)
+//            {
+//                if (wall->get_line()->line().p1()==exit->get_cLine()->get_line()->line().p1() ||
+//                       wall->get_line()->line().p1()==exit->get_cLine()->get_line()->line().p2() ||
+//                        wall->get_line()->line().p2()==exit->get_cLine()->get_line()->line().p1() ||
+//                        wall->get_line()->line().p2()==exit->get_cLine()->get_line()->line().p2())
+//                {
+//                    pointCounter++;
+//                }
+//            }
 
-            if (pointCounter==2)
-            {
-                exit->add_rooms(room);
-                break;
-            }
-        }
-    }
+//            if (pointCounter==2)
+//            {
+//                exit->add_rooms(room);
+//                break;
+//            }
+//        }
+//    }
 
-}
+//}
 
 bool jpsDatamanager::readXML(QFile &file)
 {
diff --git a/src/datamanager.h b/src/datamanager.h
index cf9a036..fd35fa6 100644
--- a/src/datamanager.h
+++ b/src/datamanager.h
@@ -97,8 +97,8 @@ class jpsDatamanager: public DL_CreationAdapter
 
 
     // Auto Assign
-    void AutoAssignCrossings();
-    void AutoAssignExits();
+//    void AutoAssignCrossings();
+//    void AutoAssignExits();
 
 
     // Read XML
@@ -112,8 +112,12 @@ class jpsDatamanager: public DL_CreationAdapter
 
     // Write XML
     void writeXML(QFile &file);
+    void writeRoutingXML(QFile &file);
     void AutoSaveXML(QFile &file);
     void writeHeader(QXmlStreamWriter *stream);
+    void writeRoutingHeader(QXmlStreamWriter *stream);
+    void writeHLines(QXmlStreamWriter *stream, QList<jpsLineItem* >& hLines);
+    QString RoomIDHLine(jpsLineItem* lineItem);
     void writeRooms(QXmlStreamWriter *stream, QList<jpsLineItem* >& lines);
     void AutoSaveRooms(QXmlStreamWriter *stream, QList<jpsLineItem* >& lines);
     void writeCrossings(QXmlStreamWriter *stream, QList<jpsLineItem* >& lines);
diff --git a/src/jpsLineItem.cpp b/src/jpsLineItem.cpp
index 2089667..10301c4 100644
--- a/src/jpsLineItem.cpp
+++ b/src/jpsLineItem.cpp
@@ -58,6 +58,16 @@ QString jpsLineItem::get_name()
     return mName;
 }
 
+QString jpsLineItem::GetType()
+{
+    if (is_Door())
+        return "Door";
+    else if (is_Wall())
+        return "Wall";
+    else if (IsHLine())
+        return "HLine";
+}
+
 void jpsLineItem::set_id(int id)
 {
     mId=id;
@@ -68,7 +78,7 @@ void jpsLineItem::set_name(QString name)
     mName=name;
 }
 
-void jpsLineItem::set_type(bool wall, bool door, bool exit)
+void jpsLineItem::set_type(bool wall, bool door, bool exit, bool hline)
 {
     if (wall==true)
     {
@@ -82,6 +92,8 @@ void jpsLineItem::set_type(bool wall, bool door, bool exit)
     {
         set_Exit();
     }
+    else
+        SetHLine();
 }
 
 void jpsLineItem::set_Wall()
@@ -89,6 +101,7 @@ void jpsLineItem::set_Wall()
     wall=true;
     door=false;
     exit=false;
+    _hLine=false;
     defaultColor="black";
 }
 
@@ -97,6 +110,7 @@ void jpsLineItem::set_Door()
     door=true;
     wall=false;
     exit=false;
+    _hLine=false;
     defaultColor="blue";
 }
 
@@ -105,10 +119,21 @@ void jpsLineItem::set_Exit()
     exit=true;
     wall=false;
     door=false;
+    _hLine=false;
     defaultColor="darkMagenta";
 
 }
 
+void jpsLineItem::SetHLine()
+{
+    exit=false;
+    wall=false;
+    door=false;
+    _hLine=true;
+    defaultColor="darkCyan";
+
+}
+
 void jpsLineItem::set_defaultColor(QString color)
 {
     defaultColor=color;
@@ -129,6 +154,11 @@ bool jpsLineItem::is_Exit()
     return exit;
 }
 
+bool jpsLineItem::IsHLine()
+{
+    return _hLine;
+}
+
 void jpsLineItem::add_intersectionPoint(QPointF *point)
 {
     intersectionVector.push_back(point);
diff --git a/src/jpsLineItem.h b/src/jpsLineItem.h
index d381b61..3ebb525 100644
--- a/src/jpsLineItem.h
+++ b/src/jpsLineItem.h
@@ -42,16 +42,19 @@ class jpsLineItem
     int get_id();
     QString get_defaultColor();
     QString get_name();
+    QString GetType();
     void set_id(int id);
     void set_name(QString name);
-    void set_type(bool wall, bool door, bool exit);
+    void set_type(bool wall, bool door, bool exit, bool hline=false);
     void set_Wall();
     void set_Door();
     void set_Exit();
+    void SetHLine();
     void set_defaultColor(QString color);
     bool is_Wall();
     bool is_Door();
     bool is_Exit();
+    bool IsHLine();
     void add_intersectionPoint(QPointF *point);
     void remove_intersectionPoint(QPointF *point);
     QList<QPointF *> get_intersectionVector();
@@ -70,6 +73,7 @@ class jpsLineItem
     bool wall;
     bool door;
     bool exit;
+    bool _hLine;
     QList<QPointF *> intersectionVector;
     QList<jpsLineItem* > intersectLineVector;
     /*
diff --git a/src/jpscrossing.cpp b/src/jpscrossing.cpp
index 9fb5198..a5f7e9a 100644
--- a/src/jpscrossing.cpp
+++ b/src/jpscrossing.cpp
@@ -70,9 +70,11 @@ void jpsCrossing::add_rooms(jpsRoom *room1, jpsRoom *room2)
 {
     roomList.clear();
     roomList.push_back(room1);
+    room1->AddDoor(this);
     if (room2!=0L)
     {
         roomList.push_back(room2);
+        room2->AddDoor(this);
     }
 
 
diff --git a/src/mainWindow.cpp b/src/mainWindow.cpp
index 7b1d525..153e93f 100644
--- a/src/mainWindow.cpp
+++ b/src/mainWindow.cpp
@@ -106,6 +106,7 @@ MWindow :: MWindow() {
     connect(actionWall,SIGNAL(triggered(bool)),this,SLOT(en_disableWall()));
     connect(actionDoor,SIGNAL(triggered(bool)),this,SLOT(en_disableDoor()));
     connect(actionExit,SIGNAL(triggered(bool)),this,SLOT(en_disableExit()));
+    connect(actionHLine,SIGNAL(triggered(bool)),this,SLOT(en_disableHLine()));
     connect(actionObjectsnap,SIGNAL(triggered(bool)),this,SLOT(objectsnap()));
     connect(actionDelete_lines,SIGNAL(triggered(bool)),this,SLOT(delete_lines()));
     connect(actionDelete_single_line,SIGNAL(triggered(bool)),this,SLOT(delete_marked_lines()));
@@ -143,8 +144,9 @@ MWindow :: MWindow() {
     //CMap
     connect(actionRun_visualisation,SIGNAL(triggered(bool)),this,SLOT(RunCMap()));
     connect(_cMapTimer,SIGNAL(timeout()),this,SLOT(UpdateCMap()));
-    //Undo
-    //connect(actionUndo,SIGNAL(triggered(bool)),mview,SLOT(Undo()));
+    //Undo Redo
+    connect(actionUndo,SIGNAL(triggered(bool)),mview,SLOT(Undo()));
+    connect(actionRedo,SIGNAL(triggered(bool)),mview,SLOT(Redo()));
 }
 
 MWindow::~MWindow()
@@ -335,6 +337,13 @@ void MWindow::saveFile(){
             return;
         }
         dmanager->writeXML(file);
+
+        //routing (hlines)
+        QString fileNameRouting = fileName+"routing.xml";
+        QFile routingFile(fileNameRouting);
+        if (routingFile.open(QIODevice::WriteOnly|QIODevice::Text))
+            dmanager->writeRoutingXML(routingFile);
+
         //file.write(coord_string.toUtf8());//textEdit->toPlainText().toUtf8());
         statusBar()->showMessage(tr("XML-File successfully saved!"),10000);
     }
@@ -399,12 +408,20 @@ void MWindow::en_disableLandmark()
     mview->en_disableLandmark();
 }
 
+void MWindow::en_disableHLine()
+{
+    this->disableDrawing();
+    actionHLine->setChecked(true);
+    mview->en_disableHLine();
+}
+
 void MWindow::disableDrawing()
 {
     this->actionWall->setChecked(false);
     this->actionDoor->setChecked(false);
     this->actionExit->setChecked(false);
     this->actionLandmark->setChecked(false);
+    this->actionHLine->setChecked(false);
 }
 
 void MWindow::objectsnap()
@@ -517,6 +534,7 @@ void MWindow::remove_all_lines()
 void MWindow::ShowLineLength()
 {
     length_edit->setText(QString::number(mview->ReturnLineLength()));
+    length_edit->selectAll();
 }
 
 void MWindow::rotate()
diff --git a/src/mainWindow.h b/src/mainWindow.h
index cec9493..75e99c3 100644
--- a/src/mainWindow.h
+++ b/src/mainWindow.h
@@ -88,6 +88,7 @@ protected slots:
     void en_disableDoor();
     void en_disableExit();
     void en_disableLandmark();
+    void en_disableHLine();
     void disableDrawing();
     void objectsnap();
 
diff --git a/src/rooms.cpp b/src/rooms.cpp
index f58763c..19f533f 100644
--- a/src/rooms.cpp
+++ b/src/rooms.cpp
@@ -30,6 +30,7 @@
 #include <QtGui>
 #include <iostream>
 #include <QGraphicsLineItem>
+#include "jpscrossing.h"
 
 
 jpsRoom::jpsRoom(int id_room)
@@ -88,9 +89,9 @@ void jpsRoom::activate()
     }
 }
 
-QList<QPointF> jpsRoom::get_vertices()
+QVector<QPointF> jpsRoom::get_vertices() const
 {
-    QList<QPointF> vertices;
+    QVector<QPointF> vertices;
 
     for (int i=0; i<item_list.size(); i++)
     {
@@ -103,13 +104,26 @@ QList<QPointF> jpsRoom::get_vertices()
             vertices.push_back(item_list[i]->get_line()->line().p2());
         }
     }
+    for (jpsCrossing* crossing:_doorList)
+    {
+        if (vertices.contains(crossing->get_cLine()->get_line()->line().p1())==false)
+        {
+            vertices.push_back(crossing->get_cLine()->get_line()->line().p1());
+        }
+
+        if (vertices.contains(crossing->get_cLine()->get_line()->line().p1())==false)
+        {
+            vertices.push_back(crossing->get_cLine()->get_line()->line().p1());
+        }
+
+    }
 
     return vertices;
 }
 
 QPointF jpsRoom::get_center()
 {
-    QList<QPointF> vertices = get_vertices();
+    QVector<QPointF> vertices = get_vertices();
     qreal sum_x=0;
     qreal sum_y=0;
 
@@ -198,21 +212,31 @@ QList<QPointF> jpsRoom::GetDoorVertices() const
     return vertices;
 }
 
-bool jpsRoom::ContainsDoor(jpsLineItem *lineItem) const
+void jpsRoom::AddDoor(jpsCrossing *door)
 {
-    QList<QPointF> vertices = GetDoorVertices();
-
-    for (QPointF vertex:vertices)
-    {
-        if (lineItem->get_line()->contains(vertex))
-        {
-            return true;
-        }
-    }
-    return false;
+    _doorList.push_back(door);
+}
 
+QPolygonF jpsRoom::RoomAsPolygon() const
+{
+    return QPolygonF(get_vertices());
 }
 
+//bool jpsRoom::ContainsDoor(jpsLineItem *lineItem) const
+//{
+//    QList<QPointF> vertices = GetDoorVertices();
+
+//    for (QPointF vertex:vertices)
+//    {
+//        if (lineItem->get_line()->contains(vertex))
+//        {
+//            return true;
+//        }
+//    }
+//    return false;
+
+//}
+
 
 
 void jpsRoom::set_id(int id_room)
diff --git a/src/rooms.h b/src/rooms.h
index f39baba..33f8d03 100644
--- a/src/rooms.h
+++ b/src/rooms.h
@@ -32,6 +32,8 @@
 #include <QGraphicsView>
 #include "jpsLineItem.h"
 
+class jpsCrossing;
+
 class jpsRoom
 {
 
@@ -45,7 +47,7 @@ class jpsRoom
     void change_name(QString name);
     QList<jpsLineItem*> get_listWalls();
     void activate();
-    QList<QPointF> get_vertices();
+    QVector<QPointF> get_vertices() const;
     void set_id(int id_room);
     int get_id();
     QPointF get_center();
@@ -53,7 +55,9 @@ class jpsRoom
     QString get_type();
     void set_type(const QString &string);
     QList<QPointF> GetDoorVertices() const;
-    bool ContainsDoor(jpsLineItem* lineItem) const;
+    //bool ContainsDoor(jpsLineItem* lineItem) const;
+    void AddDoor(jpsCrossing *door);
+    QPolygonF RoomAsPolygon() const;
 
 
 private:
@@ -62,6 +66,8 @@ class jpsRoom
     QString name;
     QList<jpsLineItem*> item_list;
     QString _type;
+    QList<jpsCrossing* > _doorList;
+
 };
 
 
diff --git a/src/roomwidget.cpp b/src/roomwidget.cpp
index 57d8a33..2b705cd 100644
--- a/src/roomwidget.cpp
+++ b/src/roomwidget.cpp
@@ -85,7 +85,7 @@ roomWidget::roomWidget(QWidget *parent, jpsDatamanager *dmanager, jpsGraphicsVie
     connect(ui->roomBox2,SIGNAL(activated(int)),this,SLOT(add_rooms_to_crossing()));
     connect(ui->removeCrossingButton,SIGNAL(clicked(bool)),this,SLOT(delete_crossing()));
     connect(ui->crossingList,SIGNAL(itemClicked(QListWidgetItem*)),this,SLOT(select_crossing()));
-    connect(ui->auto_assign_doors,SIGNAL(clicked(bool)),this,SLOT(autoAssignDoors()));
+    //connect(ui->auto_assign_doors,SIGNAL(clicked(bool)),this,SLOT(autoAssignDoors()));
     //tab exit
 //    connect(ui->addExitButton,SIGNAL(clicked(bool)),this,SLOT(new_exit()));
 //    connect(ui->exitList,SIGNAL(itemClicked(QListWidgetItem*)),this,SLOT(enable_roomSelectionExits()));
@@ -767,20 +767,20 @@ void roomWidget::highlight_obs()
 
 }
 
-void roomWidget::autoAssignDoors()
-{
-    datamanager->AutoAssignCrossings();
-    show_all();
-    enable_roomSelectionCrossings();
-}
+//void roomWidget::autoAssignDoors()
+//{
+//    datamanager->AutoAssignCrossings();
+//    show_all();
+//    enable_roomSelectionCrossings();
+//}
 
-void roomWidget::autoAssignExits()
-{
-    datamanager->AutoAssignExits();
-    show_all();
-    enable_roomSelectionExits();
+//void roomWidget::autoAssignExits()
+//{
+//    datamanager->AutoAssignExits();
+//    show_all();
+//    enable_roomSelectionExits();
 
-}
+//}
 
 void roomWidget::ChangeRoomType()
 {
diff --git a/src/roomwidget.h b/src/roomwidget.h
index 7c8b072..ba13658 100644
--- a/src/roomwidget.h
+++ b/src/roomwidget.h
@@ -85,8 +85,8 @@ protected slots:
     bool shhi_roomCaption();
     void highlight_room();
     void highlight_obs();
-    void autoAssignDoors();
-    void autoAssignExits();
+//    void autoAssignDoors();
+//    void autoAssignExits();
     void ChangeRoomType();
 
 

From b7ba70b29344bb5235b53679e799d042a15be8d6 Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Thu, 28 Jan 2016 12:47:31 +0100
Subject: [PATCH 45/53] Upload missing files

---
 forms/Redo-Icon.png              | Bin 0 -> 11609 bytes
 src/UndoFramework/lineaction.cpp |  22 ++++++++++++++++++++++
 src/UndoFramework/lineaction.h   |  19 +++++++++++++++++++
 src/mainWindow.cpp               |   1 +
 4 files changed, 42 insertions(+)
 create mode 100644 forms/Redo-Icon.png
 create mode 100644 src/UndoFramework/lineaction.cpp
 create mode 100644 src/UndoFramework/lineaction.h

diff --git a/forms/Redo-Icon.png b/forms/Redo-Icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d9e0d48c4cfb9ea6f428dda81cb8ff8782f584b
GIT binary patch
literal 11609
zcmV-fEvC|mP)<h;3K|Lk000e1NJLTq004jh004jp1^@s6!#-il001BWNkl<ZcmeHw
zd7K<am1fj^UwvO{U9DTPWD5fx#)}NLz?gf%Klo!|mSGr<VSca!%g&ks4`X(QWx;C<
z1_l@~HrQM?o&f{KW4ws9*M}q@@*!EWT7BQ$)m`0nSMB>E@?}O=SGNx9D2a;h%sAeQ
z7ZLA!ab#v>mJoGU*FaqZbq&-tP}e|R1AmMfaGd9juB?A$TyI`ki|Ao3`HwHSoWg2J
z8>r_}pn;|z)#{DB`oTO-BfzrRXZi*2pDzXgAbhb)ukQ>-n!4O>Z->(pSmSoOx*aZO
zgVX73a=BbVuh%6+i7_jSY_2GZrDC>RDvp;+rHNvpFj~wn^cHiO!9r$qbnLl%2E^R+
zNy<^A1K`6T*x1-$DCxp=wPXOSc-FSRdDo2_{l3`69)IZNKEL;6(Qu$G6!f)4qEUA!
z;1vNnyk56F98QODImrMBHr0*GqEIM`a=9#W*@DRC3nG)wi3K|5W@p7hCNq&rrAM>r
z+~Gn#y)QF6@pw9U_+awDKMzm^@^nB936v&v!5Tv?7=Q+RSD^E?pWfjKC3Xh`zSlR#
z!<!nK;<4t&hzN)L!bt#^sE6kYWs%7iMV@+ip$MQ$qC^mt=%m0W*r+3WJx<Ew5N<cZ
zF6sNcPV$|?;V6qD8OZ!XR!q;#i}BG(F*mnxY;JDux$MI1zc0*>{C@J`>z^Y*3y?+*
z^~CscK^eojGyoI$u3ca2aYqtw4247QYHo;Z@9b>xHzmS?hIInEBxX|u>aj&Rqyumo
z&H;#;_#wsNpq?(1jFY`t(kzG$9|qxa!6;n9?{kSz$Rh$ixA6HKqEsxB5oE;ZSW=9S
zO(bV#l20zAW`3EOJ^JqxkNgviAxj6Q2~>cMfr96+vuo<?w8I3x<2B#BBoJ%<i-vgU
ztt-1*+B#a}vX>|43Ia!lhHms~=?G-y$`W{$W~4|KG6I8xIgO|U9yCrbmpNn^1xAIS
z-z_3x4~;e+noa~p1Ti!;Erv%%r)Fnn_N3>A?nplSvj^wL9+@=6K`a{s7gy^(H{Q_N
z*{d!JmW2ZNV50Sd%}tSOH>~Z5#iKzQic4a0hUVx@L2@|=aK;>&Fqgw|?Gdngy_qU`
z_@qw=D$U|k(hN=#q{m?l0WyYI)GMN75EyYLC+9?O@1Pi;nA)G7oBY9S-$QpL58j6L
z0y``u)zHK#wd2c%ues_QJ74_m2cI<Ri6)mUjhuzbcJBI0moL`-Us_rd@7vhZDS@Aw
z$xGmi#S#Gy(5)&lC;;C~H3ABJ)$2`~(FTSS`4!F1!Ez-#1es(NP_k8K4;ceSg+$Cp
zQ-)I{lWB46*svHL9yvNcJ9S%n^r73wpZH#{Q4|b-uP7*36Aq0kuYTP(|H|d^zvJ+|
z@7+ytq)|^3C9HDKq+`{(SH1a1|EZy^{d+sMt$oABHSPX|v_tfdWJGEqFMGPffrS~f
z%RxZas}g(@oT|_wp9QaywpgYiShZV{akBVO4S7&%k*1(@x+s#f7@dmp%45ZfM$z8h
zoN#%<uP(USt_gL%+Lg;?UM$QW#e&hT1lPnFjVgCvdCLc)iME^Qig;@B(9eHJX?%5a
zMh!p~-nHw?J*_YM@K@HZZvXV9+gCR@%5Kp&oDp*-@L<DXIY7w3ONzn5y&nAF(R1m*
zD@jHs$WjUF%oZfc7LU%NhiObQ43jP=b0smC%F%RH5I(<0tmteM%`J_IvNO2b8Qrie
z*!IfV+1~qJr2H5Kpk!Ooy4<r6M&rueSKRV}mX7Y5x9!;M9qu0(oH%&*PmQwA{0Ok}
zEqA=FslEG$JGZa>)2`NpqkkkTrjj{{oYmV=Ps{1x%T$AGfv<S=Tz2q5v8Xl#AjBkF
zJXYy?h#4&jJV531FoZnaQz+6^gkN-bH;Z^Y(Vi>$-s<n%y}=jnKAakQWSpc`-f7ee
zIFn&iUiSP%bH~l=w`}o7Vt&#4!V9C5hwizHXfRL$LKM%)6tHU5pZObhUH9qkuJ-@^
z@*S%i^Ldx(A5P0_c3g%j#|l<4Q_Tbtb0EMSRtMD(K;6sCrOB+2hbRk?g6-uR88wgT
zm9i}sWe5(DlZKEZzbG0SLZYj)+2Qp^Hf2lExB5FS&(DtSe_rIsQj{SqEzlBuIzniG
z1izuF^XBfJO<sq`Bm7<=jvan+bn=CJenxbFk4xIqY5-Eb-Phcb@UFb{8=E(-`sn7K
zHuunYPGF(uq`tsCs1i)p3=jKMG0CEEV?bo8d9s6V@vtn(r~@wxmsK=n*aIxXCc(~P
z4j;see?uJZRitQYa8M)L+GC=rr72V>`F497U%AEU?>LwqeQb;bac5hufQs@?I*J+*
z_}~0MLsQ4i-Rm}b3mAmxrdK%Vf&q+F8o=pVu*iZNFT0^L8124o`{tEbG{?i@=s<?<
z+7;!^7pp0T){F#G8w8f57-S24D<_8lKJqD6OP(nUj1XXw%m9nfe5ToQYjgye#~x%R
z7($+IP>oHbX?>6vO^trB<KhkCSYyK*j`~BFgc{ae-}m6hu=s+5urqPV2)V|v-+uGT
zo(*2=c67Is)+;mu$QH<x-Wba&QL$5Xvf!0her;3Z$}P9QY}=a4Bf)?;Hk6SoXeW0Q
zDP7fo3o=!%_f#S-1-{<vE89|C7P#zXa@ooU&CF>h$(WX33szy2rJ$*DTA0UZ;1F$X
zaS?AwgcowotNm@eT0|+eFEb;r6tFf}uHb4#ESDx5f}T%v{#RG_P|q*B)Uyz(nTKwP
zhXXVM9H9~5&^=fLV)#FOQ$XwPn^z}V*W9)9qP08y9<QA5p%EMQ6+oc%)rWkv^LVR#
z3k{nVx!22r!LyX({I=X0Gt((a3u+9Df~F+mM>Q7G1-fb|ibNtPTHBhO`Lcg!(YtD=
z*WdKi{ODd@Aez}02|V!x)KCul3j7V8eAy|%2LWcboB_P#DWK_9U+8FTT>JeUn^$f1
zy4-YapC;?Cti7y?nJ8OLS~629P}%EEnrwrvCySz|N&%8&(ai$Q0Ml$aO{#6QU{;OF
zxtPRpW>E&uRJxTskEf6+(M(gq=B=wlC>*%F*XRF{JJ#`u!9Caiit>ROi^NmCd4&As
z)ztH2)bqQ0Hh3`S7m5X=^Ko6+C+-Tj2&xMDve7kH{!^@J#pdsB-PHZ30iRC{jAkl&
zJ+j*imr7G;E7?S@1Ya*yANF-wrt*;)hb+ckmM%vzAeWg_BO{-YR|{$kGRP!d3P4wf
zqOx@OxZugty@Qd_1u;txnO3cC6PqvEwldzn<GXZ!<UbP&t<B|ujtBuK<G^2Dy&K?n
zO7Qcv&dk%A3->M-i9=Eqw5ueYU>&x+)9Y^B^rekGD|RQsfzuAYTIjJltp@4JH-TSv
z$mhH)tFnEdlVdg&t9sVU)<H*RrWw+tI4PDiOn14(_+*xjdAe~F6Bk{wE!@<#@y71g
z-1Kqc@zViAI2j{AF$(-9fWO|8L(ea$Z49hC%O~z7+^HCVY~z~s@BaA8uC_n#Y>tS5
zvFyq9d_&nw_59=ZdNk%G_j(ASiWqf4j9sOvFu0)Wz;inMN->f~r!s*rX>>}?=EcZZ
zN<?A-vHg-Q?w0P&pILd;*Z*G7^G6cFMsPe#AkG4R?RpQd_9@+T@(w1Ito~4MSqqcS
zf#Vg%eC(^j-~7X?+S(dFy}rANz|UEaY?(_o*^H<`SD~%6L8Ma#9~qAeJ~tLHRC5L$
zp5`QI6z61)gQXhqT#AjKGRY^{$Xvky8Muu+G?Ee?+Jmrt=O#z{s*QiO^2#rM_5_Up
z63eTv{uT}UT{m~Hr3Ih7)KkMg!wtXEA*CAF)zT{S>hUt3=!N5rH*a0n5uTXAA_q_L
zbQW9Ww1F?BGVn`Sv#JF+b?7SVX4KDKO_>8pmARJ#9+J5v6LiR6L13tGpy9^R(CECt
zwuG(Q*NOJk8$Ya!AQUEc4;|H}16ef*enaP1SFBy{rHf5k@X@w6qVQoeI^@ugin<_r
zG6n!qu29>Wf7rCHb3-BT5J_6)ns;`kaIjbo$}zgSs)!l2^GP;kDhQIZ=u!ry$Z0_)
zTQtdPJAuYIYy^rJ`QT|Hn45E&aZ2D}6KOc~tTK&GawH?)1YMI&SuDqyrChpSK#RlS
zkp($gY$GG+SOX*YU!M_ltw5Q0I$&w=RnKn(`0Hr3?+`@-UlXe}t1^|vSk>Xsi5h^a
zz}xP8dwWa6dzvBvF*21sKKNXUQNC1`R!t^XoAafDO$Nl^tcFNBolGBLDgb35&2q>?
zhv9L$%%><yhCw)y9)F^}U5czIm&->vdD_c3JeHQ%fZMjOCnMPO;qKRb9t%SlfR7H0
z1i(mwA1Cm;*R1o<y;ZuyM<cJ<C@zG3%Aq@%OebljI^iTnfR&ejzC9di_#YcqH9JSA
z^Jd3Z;!uL+OaOp}K{`J8vX)W^=a*RlDh05OONygLxM{yufVP0kEnETG!WHz02p#Z4
z0XIGPa1)P<+N<oF<#7!W=hB#_fCq;vN9RE*;tag37YhKf(lJdkE=|M;gC~o_beUKr
z-mMp{70ulnKe=Mp|9l_i!m|SyL3!2dzx|hSda$#Cz?awgbg5@HKrd^laAg&=I4taV
z4r0sh_N^aVx4NyTP;iKOdJJj}{UBS86{^ru=_dxh!E1^t%N@W@0^3KoGI4lmcQ1?q
zn>6yY%{!N)N3uCugrWdhh(kCDc(2z-{9X!EA0d9|3%xB**JEYMi!?Z{tBNb&k<N7H
zk%otKNyKRhXUJVlU4lT#pcH7A^C%fXM_Wj2zj%{#Z$AIo!k>I*boimq{hV&Ge<ab=
z`Q`34J#>c;b3Q%BH!Fx1EFrt15=(KNhyj#Wz2Un%8WV{Rw9_NcWAse_OoGqK#!DVy
z>dhVkJ(HtNqO_MkIXjojrc?dtbZV%OT^K23W=Cn4OR`LpVIem^=L$xnF5&XKe6d!y
zKiJ{(hr0a!@Tzbm>W@UCB24@I(2KM5__lzHbEwZyrZffv5Tqk6)k`O-yrnd_RQgiD
zXk|#rM*eKBEJnr`L|0o_Y}>vmyf?G(Iqz$3x;W9g`Xk+I0lt%r7<c&e0x2vji5inb
zn4QkXX;u8=834pMywT>5^>jDKlc^FZj<!}y;Y*Ytd!k;_Vm@omw`c$cv5=pDr$?71
z+K4$mJwrE7CP!0KWBb#|{>M{;k3KO!@$6_}`p`77rs+VFaVRwHD)4w>YZKwtovq=O
zuh{92v|k>IG+r8wHN>OQh<rkZ_X}|63<X;?F@zcQu@R^s)9D$^L<Fi6EZnNm)u@!F
zEoUR+^E47f#QII^R`nf=f4pn;YLPSV?NeT~7LLWRuct|dij(BinHBwb22k#P)AwK1
z(v-M17W9f^qk8YR7a;4!;2Y)W+pn2>De(Q&;}a2=$Pyq&`-jVu6C?ZPCJz64=DEA~
z%nv_0K>6j<EAp|G3HQzcx_(epst2XZBcD7nH=R5(Fn#F9`zY<U*oHT)iLbiqwZTO9
zTcWY1EsYIL^iF_>rUq+7;1S4FFr?~ku?`Jt1p!eQkxZ_j$sCNN%C2G#dIzE?yi;k>
zy{bb5!U-`mU!=}JtNkh>s-;<$VN{Dej2cz4ONQkPK<1%$@jkS&vnen=hl*71{ih1P
zR5lGKO;Os1?<$L<Lt|oec<_;A|06#f-FwSJBEP`z?cp9LcCo;hd)dfm@KL;7n}z{U
zI@*AhAQn`)<iUS?nvMhB#HKr1E`IM7$>#O%r=46EH8eEPn?oLYl#3y@QWWKctE$1O
zi56HkgzR#yn3BPgkYy%Gw|6LzqWcAEx3p2d%tQ<ZGt1z-vYsb-TFwB<U9bPvMTuDW
znh4FE{WIMA?Zt5=WVu{1tkjltiU#m~)ax5#ZZVl$5J!*o9h>ZZ=-b1O-1r*<cmSQD
z13e$$p9t{8w#cDCHUb!eJ2(B@(7*%#?GA6_%KJNZe&X7>*){KPXzb|1)IiHbn&vRT
z7_MqlswNu1>ol8oG%MA5q|R;>iAC+ibe8zBh}9UX2f3!F<S%6aD5@NcwY{giqbW8=
z!%&ebW#8PPbvxOWRr%G1eNfcUuUY{1NXSidy;B_S8!e6Wz3_|S$G`Hm`Jugi#0szh
zJcF+f`Ov6ctCVmY2Y!qeKou2WWANlAkB#)+_tCF5^t|aexvkg!^<1L!olQ;cZm-uP
z3N-9m(-q}1orZ#urZCdettwg}MVDut)s%~XMxY>KT8fRcYGf&9Lr^vHQU*Y`e812Y
ziH6@1kNCwPJ?5<h->kq1gRgRcJwZdh+g%n1Ug(=0IsAWb8vNbg-A&YaI<T<A-g<zq
zKPQJCEnQON6dcQd4}*YVp$zZT;eR_w$KQ1A`uqdA^tQiCG<SDLB4J{p@c>VAq+6`M
zrGU38s`8jQIRFL@bHIq3$wsO0Z0uUP3|7lf$wTp_*w7oQI$zVet6G~AD{;#bEB{I-
zQ#9}^=~kTcs_X2gxR-{tl6dO*7f1T{{p3>w{++}-XB@NS!w_Hq`jF2;DETEj$l~<_
z3;;%lV}9Vl>wY%+^lk4PA3AvN_}D1DEK0+L1AWA<J^-(VW~4)$IyeM=^#?v9yDowg
zr69$_Y>)wG$$~U;%%J(0X_=4nfwiiWLKai1830&afk5QiwuZ2LGgq6jq=agPRU7&-
zgeqPIeq+o_H*!kiz@gsZp}jx&uVZ_^{(ndyz{X+^;G_3r3SfY$6-DIJ;vgI4U}`{_
zFoN9VGe0?a=-v;0XlCTOo5qIwb6I*p)gg_*0E)pgRd0a+lo)suFtY_vD;);tGDs<K
zVBte1(20wYAX7G`>pqvpzLakkY?P<RkyPQT89=#p_t!VYqW)KU=q}s>twd#IDl*#d
z^i`28tBgzv{20A)>u?su(+7_Z4?lVPrzQ{F_81YNbnf+7>~XJ0JI|IwSug~Y4P(rS
z^z_V;U%dZ@nUQ^;oESYevoKFnpc4=2xSgtc3<lEWpRRM_mQDgr1g4pKQJ^xLNhdz;
z*-T@AD}5!O&Mdpa=b}LeshX>103s4;e|2+XLp+ng99S(IB^nZ|^?WOb0w4G60|AG4
z?#STu(7qpDH~FLlAIfI%xz|@M&60OULns@D07FFGvVHe`^495Nd;Vf-ymvS?M|&L|
zxQI}rnyP38@I+P4KtdwGY4DLtgTi3blfbnc&^#i@JenvqvQPq}PJY=q%rv?FMG2Ox
zGysTn`9h&LH%9&R{+@c=Xt8tiIYre#uZN;QNh%dz=ZMn{+CzO~xsgK;d~xdOTOT1F
zC>is<9CpdaFbw6NYsW^wqd{SC&kets9r(lhr^XH+NzKj6k-!89O|&)MNHEhOPML~o
z7!jBTUvs8RVvxCr&R|!L2*@U-+GKHA%lTS?MzGQV%3W98v?d((Z+FuTnhb4ghC#8D
zg>r;^9v$rI7Wkky(Y!x2krKnbPu@Pf=Z0TUHU?jx@9iSAGR{$urv%isIPm*_+%tLj
zSMQx1>wP{oJ5M*QXkn=7#YB|>Q4msAGr<<*HZkZRLIDi8T{d$o&}9cVBwLhaLR<w~
zeJ%b)mx10`$F_Jh+?vnR(>SV?_237YESxa(L#CBt2}KBbV|1;brJE|pjvje*@PU8$
z4kcq~P0@j#j}<r+y_5(dol}Q;@dD8^_V_oRqQ{Hx6Xo6CbvoB>2uFf+uK)uDX+ix{
zL%1o1whfP4p`z*xPRU)t!@TU<$a+K%FJ&<hA`2pBSXULd*Z{oYS0$)%X<Ga(?UXQX
zuEl5deh)p0#m%0l5BJZGJ@ez63h5zyRt3GjmV3U{6cs`fVFc2RJ^Hn$JTBiyoG#Dz
zU9MFf0on~+ltw`9mI^kMY<N6EA~U*+?Q<NE3_eYX+`GXq9gEY4VS}V)Gg6lK3{i`i
zbOUgRE${Sryxvy^>D~9qDeO42oNnD{SVi55(E=azc*G+{r{~2)|A9NEpSkl1V!&{U
zYkWDZlE0jV5xHg@bPXeb?;U*j%Z~_O@Gt4c*sU#{s~hqqr%2P|YP1>OuEHHtFydr9
zaYoD>CCtd8G+KPo8dE;FA?3O-^cp_is76$N;L7mvvMu7uHrQ9v86U)CUD&d!7?N%P
z<*w$-y6M|{t6jv14HV38flmTSBGo|&R^=Hnq$-C`v0*bt|KQMzBaeO^H+rzjN6%;Q
zWxW*ld2vR4VX&CC#NdNB{LXddmp<-rdA=Epb^7Ph^vO9wpY^OX1Tcx&QVYd7VkwbR
zz=ypamNQfY1`ZPF7)c;T+6M*X7tbg{A3c*{j>CYkAqtB;xiL!SwWM=MHvr*^wyp?=
z0?kFb^S5~ZM-~)c&8bBUC@_#XeN$&}A}J>O9=kO&abTE|G52HMM-!n)qe&Dxe;n$}
z(}Ab&{=d0v^&7v@?e=*8o;Dpgr|GR=TdPP>rmjrjDa}kIX+~ITRZll`V)B{+BMa38
z_~5l~+@(dYV#lKb3<O)}a1~af{H2l&YG$`z7<z)C&EZhcjW=A`S-qbm8n79jSsRYS
z$JQ;(b)%!h&yGEQ%l(wZw_7m^@KDO)&o>`UL>thi;?ZAx@Rrnc-}lS8SrMhLmP$QP
z+kuzt?J8izRk{S-paXctr_^Au%QQI^fG+=7Ch<{T^Pr%d9tdsrAqkxj(@zE;u%Ju%
z8QNozrCa)Tw83d5L9B3l0vm$#Bn<cekzj!js&cZCwusCsQ&2D#eq+-qF*E$kU4^-!
z2_nEi&)1=!TdMm|0eXlu?D75oa(!~L|6z|KBR8o^Mj%O!0aX#i4L~IU3>J?x1WM2W
zmmoltp<<aIGPHwb+jxyU7zOx{d{s`EBG@@xZqIsrQZ-LorOfUwsU*pUJS7^H(vxxP
z*hQaJ8=V;In|$Kd2Z#$pK8AlN3rf@3DSF;Iv;{|T=I8@s$=*GmnwuINjQGm(leB0R
zFqV#d2Hph8pf3x$<XIkUX-AL`-fH|NgTX{RmCiDNo~t7sm#ZD$#giK*AyGOC7_gb>
zfo4V&7v`i8eS{#nKp$fs@BM9N;+Y|$pyyu*L%(XI{VWZDl1jsm-nciDn!LY|Ny&|@
zj0pEsE3OQK4FYPEh9Uz>IOkEu0S0xLSjs%gFl1(v07jNy;Uk>|NiOTeD}!=-_p1_K
zk2{LhMM17GET*MGx(%Qn`1bC=z(jiP$nP-sqxS>+3$6F->VOdx*1zM9zm3E?-|Y!T
z#0<UrhgG*yxMGzcO8}5gPGO~ph$;pZH)tk{PBU{Lj~1yG)EO`jEWytPAe{b|gvaBG
zE9@Cs%7q|2EeUBH<+AZ*Zmcts)8hvw4*mQfr33g2wfA$g9UHFw*?$kmT0R?2w2Eo^
z+%3Kp#DFRcl;-7G1!Z35Q4uB1B<tW2sUoVFan=ZCUW;mmK+{;wbOcNTaQR$ex7!`S
zc5HxcX3!<;VNDG91JwKH7BciCwQmpY>BEB_7{G<x`vLxS1pep3i8cbCK3`8uZ|F_w
zPAN;CHN8~=Z<0)fE5%ksS*RqMc@VQj7DWwV%ByxZ4Z!V;Mcp317w^}Zxe%lRI0<DT
z%p3-z<iU4nrpJ@%sbhb5n9^~ngx-&70K?=3=Qh0S?&~6v=FbJ=En<rHOcto)V5C*f
zm;lT;sfZCZ(xk^}oJ-@ENe10aHUkwvSI9BMX&y3anKg=O0CZD<etCs9MKju9((_Pw
z5%2~N?mE$yQTkTi?2&~RAMB%KzE-~A!0+j~+UI`Rhd&#QH~y_Z+AP7xsHwm|dEgge
zM+v6dDPV@7Yq&)jmQ6OZERv(LSyKSryKTYE1XU#Y$Lamx1Pkm1H-8rBet3Fz;+cGU
z1aIx2=kraUs&+&4^Un43eAMT;^mSj3CR#u2k0itt{g4H~NAH#jmM7J$<MntOj+`G^
z4H>2=8zakBe${goerYr)!xU=eG)Dl3!xQw<C18#o150GB3q)BdePBR#i7E-irdb%k
zByF3bZ{Xn#9Pa(_FPITPg8vEvKh|P_PmMQsOEYk+WsXBxoTdkjG!qjFSYb1S+<JBy
zuS~Ra8!U!A;Dml%m4|4W0Vqt3?9!8<Yl65dLzo$+2;ShGOU*B&hMs(ZNC2Kk04e7@
zKFOwH*!R5rbvH(1tsnBy>snLvVT=-iFZ(?>$eBG}Mht~l0xx-02An~L9u=EPmq<~f
znH9+vlMP7bkz}J>6Bxwdz$6b9tvs6sAPFqds0%Y!_I|}n^`eq7ZItQ4H=9ilW=EdF
zH*wMHFNEP=s=j0A2ZFwhZ~I~--uxkVFeZn6+#;_EK6DM`upT+65<!u4jZCbPsAwFN
zqpym{GvbC(n6`ib9OdV1GR`A6)7h8A#V6AM=oh(ca+dA=8mF7G73t|uCOy}mo<4|8
zA8Y{U^YD)rmhl}#f7|wNM;qGT;SNN^^c;N{1K=C&*TDk{GT9(XPbEmLBWR{Eikt@=
zU@+2UHcm50l1>6lnqd@@%}hkhaGD{YT=_`Y%FSHX6hLpmr18Wk7ILY25KE=p$~dIp
z`Ew?p7lrh6FGX?P&%^(5Y>zl=*GcdLZ9BdbYi#?EF8?y%L%C8hN;@jd4O4(srs1ia
zO_v6P0!ihSNo*)cLI#T4WNAiVCm1r6M<i8`YJiv{0R5uoIC{P8w%{}@2x)r8%B^KC
z+M1H4FLmTnlgB6*_kKN#QH}G$lWOk1<{uM*#!J2zYiND5(-)RKA6kI&&0dc%nq(ki
z0%Itf5tclN;9o@yMGz=j+zKmRDVhOhKCI@TS&k!U;A9BZNu0EZ$0Sg|Gyn&^vO{mB
z(pGZS0+b=A0fSqXsTIsZFal)h5->a4Zn#;}000dXNkl<ZH$Z9UvjNB^uiABEJk+rH
zRs#P`!V?lRH0(>Q6ZJ&EXT2zWDTP_!f@%P-ND45GK?Ze@<)yj8TqYZU8`%{>7HX!b
zDsWV0qB2PiCn*MXHVq)3o1e|+vvl{)j}H@>4*A*XVVOn}@gb&MKAX<YjpO<s2EfN6
zc9v6vK6F#=dHd~MzDVnL8XDVoms|n*3|<BJXfG;n0A}Jw0hMm2OIDoVG#(i>(%`|F
zvJlZgN0gD1*mFTzI*$q<=}Ko-Q?^V%M$4H7;4EiT^j>_L@bsA(3_ccQWm6&5Z2E9f
zAwOH5AIElYfR8%p^-#>UdzO0ZdHc7z0<rcVCmK60D>}Wji-vy9jGBR-BOQ544=Qfz
zhyp78ICP`^x(p<7UPUHZO1ufWjUN$cmV7ga3}(cfxs^Dai67*poM`~1`LQJZ*zz3p
z=(v<e8Fdu(ur3Ujfb@x``P}>%HhqE(MsU73*;Mp=fFEz@xU4|nC-L(y)PmCizElJW
zgFFjeEodTcrP+98MCFHa%{o!oHvQWoC`@xopq5|-Ih$i<Xx~h}RG!8AWH5RLe3`t|
z9#y+yF+ZQ4K8l?`$i`W%Qff1V%FAIN;Kv%;FDp0{__DgHX;#o^tBDr{SU1X78FV@_
zBd*gefd&zt6|_f`NR?mm7zq@HGhaopCo7^XSW1?aQ1xQC6${Qh0yyTLzk9a$A3iZg
z-{9LqPlf1K4s~QhaCJl#5e8E#mNO!s#_pf<#Q;!w34SoqC5Qb2sbW5zr_a(++o??w
zUfOl5d?Zm8Lm$RES;m!OiOZmYhdYLqCZ#BTXx$)4&lGD0R53aavdDZm8II{3w<nva
zSjgjNaAmtxstqGH0FdY<muzpA-Um=m_lzM%mTbzi1#lM-8%WB<0&V%uVcRzx3aIsI
zpuFYJ?%P2>rTVi#w0Vt#ewN-%w{{bB4}_bm^lJf!hA{}d3Esef2xKVol8HFvKdC?k
zk&W?In$e9)A1uKS&5_RzL6n7L>6F+-Ve`XQM8~LLiBLH`S*IB4r`_5m`Q=gDBYHLf
z$yqAo4&&Q-KKo5UqjcR<MPQ)7m&0fjP$j7*f)Nayre~~`Fs)omZDmL9*5vTB&gtB|
zw_MD5$|d}ap8ZY-J`*F|B9pF2utk^314*XD3Jq0JmlUI9*~CjRi&A7YZGBH;ak#wn
z$*~3O(}V%A5zz0rTCSYWBoET<KoO#E?y?nCsg}%v8xUD~e=vhDRx9SESgjIjC**kM
z_SgTKs`DE<0(9uV+EF{TJiRr6IRJP#T;Jk(jkyMp;1$yoed%mE=?ME`AevSnBYaZx
z9c~*B3};14D;W!03$xU|kM`ng5BTf{nX>HWyn&UX7o<a*`AIDd00v<j0i3f#4-X_(
zUOGz8cVlvXuQG}QZ2U;X(SZeefdtpdP}X^80Z;}Mz&*jZ<Ab(b&<^e9w!=3^0NLt^
zy|+)azwASYX<PVutQzszR^4HBi<d@v2k;A-McN3mXv);tYds7Fpn*8fI}1KV<x0@?
zyt4ml3B`PN;n4-^;V#<bfrTw=20b4yjUF3Hixhn>9#;zZY&)$i<r6_o#`ze8V*VJ8
zMcC*D00oqasmZ;mg-i*%eBqD?hpk_I!x@pJha>XtC>eyzKt|wjy2HXtUrVsqWuE$}
z_BBvx0M7K-0lE^%4AF~%{7gcQ0)zC^aMSd&XILBXsDS3-OPcicEDtRwa76(U4z?Q#
z)?F=YKsNx?(=qV-8~U@^?DKd-+)e8M4E>{%IWa~D!j@AJObfJV3<esyaVf>l#>t6w
zzxFgxX#nWCIr>Wb{R?!N=cCU~V8|aDr@Op5q*_@1c#*>$a79|#06^6^YOm4t8d(~s
zW&q_(YT)5iI+f1RUcWy28F>A7b`-J}zWB5{eKsu`2-6SVDBvxkRZcxrqZ+7Y0IrDx
zw?CWCW?z`0PddqGLi*Tmz^jtzO=5gYh(0ap4aDjOP@^C(SFK6|0B?Ej(1X*tbn1Qw
zT?qu}Cr<fwv1(l#ACsc*=sMl870r|vERb1^m6GeO)-+Jf0C0z_oKE)Lmn&v+(THt_
z7?Ct=X&AsFuuMN{<O#QQ5)tz120%(UUtBc<z(UYDviJ7=`P{;@Au<5m6q3%sUY`+g
zGpJ18%JT-|9mJ!L0Gg$!?Dcc)X`q?`pqAy-k^3gI3$ypqcLPL_ew~x20lf*hHH;rM
zD$!!m9f++U8Xm9!_&WHyqG~w2lmTEG5b5#fewoe9&qwKJW0X@*0%h2M7(Z}CdkN{|
zP=O9lyeC04P$0K%1X5A8eOk%@Fbz14+;ja?`CR&;AWZ}KdYIhwqP2$+&eN}II9<M$
zX!ni=<fEf*0Ggg^Ik=Popw2W3jMIMq;XBLDVmT7RVi0!0j^U>-Rnm(gPIn*?Ol)W&
zDr7Dvmj%@Q8qmOUK*>>HWZxaX&E-=sgrfm^0%))^_R`0D0r+7FkJHz(cAWt}7@4aE
znpv;HQW`j(0hFf>+&Pk6nEa84e#lv03^Ka7BEUkhSfqOf;kFG1@K_AijbJIQ*HHR$
z27qeHdjhGx{XfkYQWKGAkRAvz^r{u60nlzUx)N9?ypae|AoqB(m4N#BoNC~NKsx&C
zPae!=l0Ws+V$et566PJyTyxA7*-Vbs0m0Qx>tEMKQ8oa(wQz>IUo#pwo&f+`i~_~E
zktcspEY8nGXf04V3ShR+<>+y-E6^0_yr`S_0X$Cw6s)^i)xhx#0QHuO!58oT$lh#b
z`knw8fS2}uSeJxqgGf>CAM^@;^X5w^59HQw3PF1{?oQMIuyHa!JGl3s%VL2>0jve6
zoAUrqK7KKyRB#Aiq-6*3VtZJ91gLTFQN0r}0Px9C;OISny*HnkzAH$-Dd=?@YXMNn
z;f`RQz7*p0MAjuXT-8oVkd1@Qgo1TfYZ^Ei15l&D(FeX-E~h3V^!T6G0*r7rougaA
z!S?v7%hysvA-g^b)EeRy^*K=kKsL1&xcAdf=Q9)E4a9uH@5RrgAX#<ue4cIyIem^m
z`^A@05@hQeMZs2gHKu`+H2}O@RvzE`<8PG<GriG7Sh&=yLDB*W^n2??`qHRB-28HH
zqyw*))klCD1H7_20O(|$b8hglWW%O676P&6t4s7!RhH&{d@BeJpPTjh-I08H?7r0C
z6C;#_sRM@^DkxBQwWEPkF#y!wwUFw6A-?vCOGBZ=s?0)GemWHdm_axe_LdyZ=O>@J
zdp|`1z8pEoue%!4z{yMjTy^y1V(Rdo<m}MCFO=Qc`B>cA51Px<cXaVwpmEJE;=@LQ
z`ZPdFs8x5WBLIxRHT~?r_BU?3wj~&EzO<Anh+KhwLX`*suUokNu5fyG<ky+;=cg#C
zJ`L2U1)Qn@aC00bSNXX}=Z@C}L(#@GO$F*FR2?E54TZ{X?=w@+{_E3q17LO4o_{J+
z0Jj3q2ukCRe6MeA?9k`Ru6#a`2+{k5>dT=H`t(4kY28)CgJ}SlgD<5l%3gP8LIW>#
z1VEi!lTZERaMO-=b%tY27nf)au#m~quV{K`8gNH*^W*m|j6RF6h}WlqGlAesl=)H(
zz`V38m*$@cbzb_~NF?5po~NmRUKxwTq9Nf49G*BJuLdw;)UO6!B4DRG`{@{#<>TV9
zy+0b9>3{q>`sJWhb90!U3l!;n0f+E6t=%pB^0l%0G;q4nI}P$)>Ik4$!8!HpJ-zX*
zZ}A0VEtfm-^$;2bJOOWWF_-&YYT(gfVy;gEy2ffCe7X#Prvk_PWZ#pK)qiqPB;L5T
zM7xB%!JxP73yn`aapyzSUhvhYff@jwt8lsufaQt&OmEH^X?!x!ykU1J6i&G5X>if$
ziqG}_zhCC&N9lcIISOFfV52ef)&pl>1E<{ps0q%w7ymF3?0&^DPqgigevjKza(Ws|
z{@DJRgZCaJdVMi?_Hkaa#M5m6=+!t}QwM(jVtm6jMOUcdihwWRDAG%YqmTW|uZYI$
z02o5uonsB0ZUf-vzzCe<`|o+8VauCayutVm`dxuG`gO7UXfas%({h}r?w<n<oGAl9
zQ^*K%<y?CF(O}2U9qv%`Mt3kVIkxY%Jw`k0i@|dMcx91i*Z_pcj33Il!qLZqO&ee1
z_C_ww&X3-e9(#^|UZ%bntVHB2$Iqkza8n$!M<1FFwr$<-ORRZ!pmFWk*#6reB_g&G
zVm(lI=THM@+5oIY;q$*7Osv21h&R@CZ9bF!O?vc6{J=zg1UQG_pRJ<N(_v_MD(JcB
z&+mWl*7yAKjTH7GPRHrE9Zh2Du9h_bBfzr&d}JW7cK4T77~#4BkRr~d<1PJXqYfww
z2YS4`Oe7yuKz$k@C7dgFrq=+=wTssW%kk7{7qAA-=IC<)tFhj+x(4bRsB7R<HSqrd
XCEWUiZD1qo00000NkvXXu0mjfpLRmW

literal 0
HcmV?d00001

diff --git a/src/UndoFramework/lineaction.cpp b/src/UndoFramework/lineaction.cpp
new file mode 100644
index 0000000..a8cca4b
--- /dev/null
+++ b/src/UndoFramework/lineaction.cpp
@@ -0,0 +1,22 @@
+#include "lineaction.h"
+
+LineAction::LineAction()
+{
+
+}
+
+LineAction::LineAction(const QString &name, const QString &type, const QLineF &oldLine) : Action(name,type)
+{
+    _oldLine=oldLine;
+}
+
+LineAction::~LineAction()
+{
+
+}
+
+QLineF LineAction::GetOldLine() const
+{
+    return _oldLine;
+}
+
diff --git a/src/UndoFramework/lineaction.h b/src/UndoFramework/lineaction.h
new file mode 100644
index 0000000..63e0cb7
--- /dev/null
+++ b/src/UndoFramework/lineaction.h
@@ -0,0 +1,19 @@
+#ifndef LINEACTION_H
+#define LINEACTION_H
+
+#include "action.h"
+#include <QLine>
+
+class LineAction : public Action
+{
+public:
+    LineAction();
+    LineAction(const QString& name, const QString& type, const QLineF& oldLine);
+    ~LineAction();
+
+    QLineF GetOldLine() const;
+private:
+    QLineF _oldLine;
+};
+
+#endif // PAINTACTION_H
diff --git a/src/mainWindow.cpp b/src/mainWindow.cpp
index 153e93f..e063547 100644
--- a/src/mainWindow.cpp
+++ b/src/mainWindow.cpp
@@ -508,6 +508,7 @@ void MWindow::en_selectMode()
     actionWall->setChecked(false);
     actionDoor->setChecked(false);
     actionExit->setChecked(false);
+    actionHLine->setChecked(false);
     actionLandmark->setChecked(false);
     length_edit->clearFocus();
 }

From 3dae851c3b19418775be91526be6d7284eb7e145 Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Thu, 28 Jan 2016 15:36:15 +0100
Subject: [PATCH 46/53] bugfixes

---
 src/datamanager.cpp | 20 ++++++++++----------
 src/rooms.cpp       | 45 +++++++++++++++++++++++++++++++++++++++++++++
 src/rooms.h         |  5 +++++
 3 files changed, 60 insertions(+), 10 deletions(-)

diff --git a/src/datamanager.cpp b/src/datamanager.cpp
index da93a7b..ab537bb 100644
--- a/src/datamanager.cpp
+++ b/src/datamanager.cpp
@@ -392,7 +392,7 @@ QString jpsDatamanager::RoomIDHLine(jpsLineItem *lineItem)
 
     for (jpsRoom* room:roomlist)
     {
-        QPolygonF rPolygon = room->RoomAsPolygon();
+        QPolygonF rPolygon = room->RoomAsSortedPolygon();
         if (rPolygon.containsPoint(lineItem->get_line()->line().p1(),Qt::OddEvenFill) ||
                 rPolygon.contains(lineItem->get_line()->line().p1()))
         {
@@ -402,15 +402,15 @@ QString jpsDatamanager::RoomIDHLine(jpsLineItem *lineItem)
             else
                 return "Warning! HLine intersects walls";
         }
-        else if (rPolygon.containsPoint(lineItem->get_line()->line().p2(),Qt::OddEvenFill)||
-                 rPolygon.contains(lineItem->get_line()->line().p2()))
-        {
-            if (rPolygon.containsPoint(lineItem->get_line()->line().p1(),Qt::OddEvenFill)||
-                    rPolygon.contains(lineItem->get_line()->line().p1()))
-                return QString::number(room->get_id());
-            else
-                return "Warning! HLine intersects walls";
-        }
+//        else if (rPolygon.containsPoint(lineItem->get_line()->line().p2(),Qt::OddEvenFill)||
+//                 rPolygon.contains(lineItem->get_line()->line().p2()))
+//        {
+//            if (rPolygon.containsPoint(lineItem->get_line()->line().p1(),Qt::OddEvenFill)||
+//                    rPolygon.contains(lineItem->get_line()->line().p1()))
+//                return QString::number(room->get_id());
+//            else
+//                return "Warning! HLine intersects walls";
+//        }
 
     }
     return "Warning! HLine outside geometry";
diff --git a/src/rooms.cpp b/src/rooms.cpp
index 19f533f..8500dba 100644
--- a/src/rooms.cpp
+++ b/src/rooms.cpp
@@ -219,9 +219,54 @@ void jpsRoom::AddDoor(jpsCrossing *door)
 
 QPolygonF jpsRoom::RoomAsPolygon() const
 {
+
     return QPolygonF(get_vertices());
 }
 
+QPolygonF jpsRoom::RoomAsSortedPolygon() const
+{
+    QList<jpsLineItem*> lines = item_list;
+    for (jpsCrossing* crossing:_doorList)
+    {
+        lines.push_back(crossing->get_cLine());
+    }
+//    std::cout << lines.size() << std::endl;
+    QVector<QPointF> points;
+
+    points.push_back(lines.first()->get_line()->line().p1());
+    points.push_back(lines.first()->get_line()->line().p2());
+
+    lines.pop_front();
+
+    for (int i=0; i<lines.size(); i++)
+    {
+        if (lines[i]->get_line()->line().p1() == points.last())
+        {
+            //points.push_back(line->get_line()->line().p1());
+            points.push_back(lines[i]->get_line()->line().p2());
+            lines.removeOne(lines[i]);
+            i=-1;
+        }
+        else if (lines[i]->get_line()->line().p2() == points.last())
+        {
+            //points.push_back(line->get_line()->line().p1());
+            points.push_back(lines[i]->get_line()->line().p1());
+            lines.removeOne(lines[i]);
+            i=-1;
+        }
+    }
+
+
+//    for (QPointF point:points)
+//    {
+//        std::cout << point.x() << " " << point.y() << std::endl;
+
+//    }
+//    std::cout << "----------------------------" << std::endl;
+
+    return QPolygonF(points);
+}
+
 //bool jpsRoom::ContainsDoor(jpsLineItem *lineItem) const
 //{
 //    QList<QPointF> vertices = GetDoorVertices();
diff --git a/src/rooms.h b/src/rooms.h
index 33f8d03..88f2be0 100644
--- a/src/rooms.h
+++ b/src/rooms.h
@@ -58,6 +58,11 @@ class jpsRoom
     //bool ContainsDoor(jpsLineItem* lineItem) const;
     void AddDoor(jpsCrossing *door);
     QPolygonF RoomAsPolygon() const;
+    /**
+     * @brief RoomAsSortedPolygon
+     * @return SortedPolygon: QPolygonF
+     */
+    QPolygonF RoomAsSortedPolygon() const;
 
 
 private:

From 1ed508689d1a616f46e3621899fb0ac04051244e Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Thu, 28 Jan 2016 15:57:40 +0100
Subject: [PATCH 47/53] write ids of hlines. start with 1000

---
 src/GraphicView.cpp |  2 +-
 src/datamanager.cpp |  3 +++
 src/rooms.cpp       | 10 +++++-----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/GraphicView.cpp b/src/GraphicView.cpp
index 1bbc9fb..352e1c7 100644
--- a/src/GraphicView.cpp
+++ b/src/GraphicView.cpp
@@ -814,7 +814,7 @@ void jpsGraphicsView::drawLine()
         //Undo
         RecordUndoLineAction("LineAdded",lineItem->GetType(),lineItem->get_line()->line());
 
-        drawLine();
+        //drawLine();
 
 
 
diff --git a/src/datamanager.cpp b/src/datamanager.cpp
index ab537bb..3b699f9 100644
--- a/src/datamanager.cpp
+++ b/src/datamanager.cpp
@@ -358,9 +358,11 @@ void jpsDatamanager::writeRoutingHeader(QXmlStreamWriter *stream)
 
 void jpsDatamanager::writeHLines(QXmlStreamWriter *stream, QList<jpsLineItem *> &hLines)
 {
+    int id=1000;
     for (jpsLineItem *lineItem:hLines)
     {
         stream->writeStartElement("Hline");
+        stream->writeAttribute("id",QString::number(id));
         stream->writeAttribute("room_id","0");
         QString rid = RoomIDHLine(lineItem);
         if (rid.contains("Warning"))
@@ -384,6 +386,7 @@ void jpsDatamanager::writeHLines(QXmlStreamWriter *stream, QList<jpsLineItem *>
             stream->writeEndElement(); //vertex
 
         stream->writeEndElement(); //Hline
+        id++;
     }
 }
 
diff --git a/src/rooms.cpp b/src/rooms.cpp
index 8500dba..146555e 100644
--- a/src/rooms.cpp
+++ b/src/rooms.cpp
@@ -257,12 +257,12 @@ QPolygonF jpsRoom::RoomAsSortedPolygon() const
     }
 
 
-//    for (QPointF point:points)
-//    {
-//        std::cout << point.x() << " " << point.y() << std::endl;
+    for (QPointF point:points)
+    {
+        std::cout << point.x() << " " << point.y() << std::endl;
 
-//    }
-//    std::cout << "----------------------------" << std::endl;
+    }
+    std::cout << "----------------------------" << std::endl;
 
     return QPolygonF(points);
 }

From 68abac4181be61dd73169d996602a9a7cdb9f6fb Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Mon, 1 Feb 2016 12:21:38 +0100
Subject: [PATCH 48/53] Issue #25 Undo/Redo LineEdit

---
 CHANGELOG.md                     |   3 +-
 forms/HLine.png                  | Bin 0 -> 1634 bytes
 forms/Ressource.qrc              |   1 +
 forms/mainwindow.ui              |  12 ++++--
 src/GraphicView.cpp              |  67 ++++++++++++++++++++++++++-----
 src/GraphicView.h                |   7 +++-
 src/UndoFramework/lineaction.cpp |   8 +++-
 src/UndoFramework/lineaction.h   |   4 +-
 src/datamanager.cpp              |   1 +
 src/mainWindow.cpp               |  10 ++++-
 10 files changed, 93 insertions(+), 20 deletions(-)
 create mode 100644 forms/HLine.png

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9318ad..1af4217 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,9 +4,9 @@ All notable changes to this project will be documented in this file.
 
 ## v0.8.0 [Unreleased]
 
-
 ### Added
 #### JPSEDITOR
+- 1.2.16 Create and save HLines
 - First approaches of an undo/redo framework
 	- Undo/Redo working when line added or deleted
 - DXF import with different layers - Not working properly with AutoCAD ?! 
@@ -18,6 +18,7 @@ All notable changes to this project will be documented in this file.
 	- Zooming 
 	- Line editing
 	- Length of line is displayed
+	- Show origin
 	- ...
 - Room and door declarations
 	
diff --git a/forms/HLine.png b/forms/HLine.png
new file mode 100644
index 0000000000000000000000000000000000000000..81b9f3dce14be3bb072beb30858f16af605a42ff
GIT binary patch
literal 1634
zcmXw4dpJ~i7#^9Xjt<7L)ln&G4<m(RRU(&h9cSHQhzK)uS=%z}u8YNtVai4tA=S=2
zgsq+)ilKHk9y8hP=CP$vcH=4RE^3~zwUPEaf9xOg&i8x2_j|v~A2YJhV1Gk{H3kd@
z!!Us76UJcZG2w$OUjod>*<LYx>7|GHdoix{uKNof%!Aw@E`!lhwqilB6yAu47oE;v
zU>WpB?~el;au|%I?*e?d{G7Pyp_q!{4inGacVlYiN>{tal?{aTo;G{b^wX`27Ueb0
z6UAn)>{Ig@o$+>6sa@@<pIojryOCX7RK(U_r)4brKU~PD>-1RsFjJlP{!Qnn^uW#=
zj(x+$SoehMCu^3={NF!!QfO;to#aZH)-$AiKyu|di|p$QkN5YG6{NgAJK`kUs*d$y
z>mOH#0|u$10nOF%fMbR>mL&zx{3_X6Pl5iI%Y}-|Ed-MceWb$*@urDVK+bqQ9lui3
z@ymWX9-X4&1TTb(ChcgHSg^usBf%{9;TABfx2gg&zZo#IxIlne`Tffv=Oqbfd5emc
zN5z4Baz6*;cPiv;Z5NeGEf*%#@Il_}rviDD1ucJY_6Eoss2GsXB-w#HpaR^x(0{>w
zB!hsWk=O_teTrz@(njNFV}J?j6JX{L^&6PsKc;{g8h#7RdYb6o`c8E3>^U0STj?7N
zWNrprz0DSI&n%6NZS*=58CwCZo#^KNb2JvW+5^sK(Y3DI>DrioXte((0-Oh?=~L`E
z90j;xn!a@B5WREW&`m(2T6+8!uyQ_TBpkee<zbqqa$SgUunKc$YZ~Ob8a%6Baz)#0
zP8{<^kM8a^6b_bPDW)1bxu^<PDJ1?SN)KWe4}EAe`mONKKqSP(JBG?RiysN=UZL$P
z$Kqx_rrlh(Y3}!j7MxMrNU6JAXGJ<GCGTWPeFC+VzLh(iz>~wfJ%yY=BvGc^OrX}%
z3b}|y_SZ?ylqhlHygypW8RZK(-pD~yZ$qlu6J5#?7?DYhlCQMo=dc5qcN|q6hz8gQ
z+{vVR385`Ng+-cp+fh+GRK^i(C6knrF>QGv=E&9@p?F^CNgGRJ@@l<=uWc^HuA6Aq
zP&^*Gf@5h-K4_4%Y8@&uM^nu%iWiKY;aGZ*4-^tiD{>+DmeO<^C7V3YL)uD4w@@5^
zv@z7nSBQrozA}LW(N9QE%R|rM(%oK}LfjiMED<n>Sqo{ljna@*`yv-gMl-2HeyDwz
zmxnN?2-}Nk9?SbG@r!km9<7c^%vwqPZIo{0E+52|tvOB&O7PdA-R@e^Nldj-YHuUh
zA?yf7)?%8K)ZiK1J*-=$)vYC_0?|&6AYJIp(IXdv5GKhf(7XotL3N6YEIhsqq4D<b
zxyUh9B1(;1o)(5Ki663M5h9Hrq@HKVxX5suFQiO9CWbCCPF^p@a$+ZNc~|(e9tHE_
zlP_3=u22fnfsB(}M13^^q~^!LB{dlXX?!tA*<(;z*AER*zB7w(h<pO1hye0n(`qs1
z9MA&q+}rT8k{I|V1#uiP-yaDRsMdfjVxUzp$A5*k)mE7(mC&FD@@@t69>0%^v8avv
zfUJxKvIx7QU_QMEU8C$^U<>gake{#mMZtU<WhTaW`=f!Z-3Fv&6?mqdGY9hPWFT+k
z0{O}c%HP(Sh%wISEH3w4IRQNkc9JY2^nNtt(}Lj?d?$B!_m4n+-zJ#<k|8Y3-(kff
z`nvLgG=2j`&vM{?eRn6J=s;X47nz-*P)c#B5%l}qVBbSiGLWX0(bA(F7SSx82WikS
z_)oozgmrA=A(fTx1}UX2q}+~!%i+m(xKeK(Ou0Q9=I^*(uo#F;jpRXrX*L{uzGI~r
z8@y+tnRpk6OpVWvrS0t5u=sv5#H_iojO<daciCHHUZQ6t%opP$#i=hAm!*7IFw;d`
S{SN*Y7y-V)KG(bw3jYIPV}7at

literal 0
HcmV?d00001

diff --git a/forms/Ressource.qrc b/forms/Ressource.qrc
index ecefdd3..239132d 100644
--- a/forms/Ressource.qrc
+++ b/forms/Ressource.qrc
@@ -41,5 +41,6 @@
         <file>anglesnap.PNG</file>
         <file>Undo-icon.png</file>
         <file>Redo-Icon.png</file>
+        <file>HLine.png</file>
     </qresource>
 </RCC>
diff --git a/forms/mainwindow.ui b/forms/mainwindow.ui
index 97af0c1..803f47c 100644
--- a/forms/mainwindow.ui
+++ b/forms/mainwindow.ui
@@ -53,8 +53,12 @@
     </property>
     <addaction name="actionSelect_Mode"/>
     <addaction name="separator"/>
+    <addaction name="actionUndo"/>
+    <addaction name="actionRedo"/>
+    <addaction name="separator"/>
     <addaction name="actionWall"/>
     <addaction name="actionDoor"/>
+    <addaction name="actionHLine"/>
     <addaction name="separator"/>
     <addaction name="actiongridmode"/>
     <addaction name="actionObjectsnap"/>
@@ -519,7 +523,7 @@
     <string>Undo</string>
    </property>
    <property name="toolTip">
-    <string>Undo</string>
+    <string>Undo PaintEvent</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+Z</string>
@@ -537,10 +541,10 @@
     <string>Redo</string>
    </property>
    <property name="toolTip">
-    <string>Redo</string>
+    <string>Redo PaintEvent</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+U</string>
+    <string>Ctrl+Y</string>
    </property>
   </action>
   <action name="actionHLine">
@@ -552,7 +556,7 @@
    </property>
    <property name="icon">
     <iconset resource="Ressource.qrc">
-     <normaloff>:/Wall.png</normaloff>:/Wall.png</iconset>
+     <normaloff>:/HLine.png</normaloff>:/HLine.png</iconset>
    </property>
    <property name="text">
     <string>HLine</string>
diff --git a/src/GraphicView.cpp b/src/GraphicView.cpp
index 352e1c7..0d8e51c 100644
--- a/src/GraphicView.cpp
+++ b/src/GraphicView.cpp
@@ -46,6 +46,7 @@ jpsGraphicsView::jpsGraphicsView(QWidget* parent):QGraphicsView(parent)
     translation_x=0;
     translation_y=0;//this->height();
     anglesnap=false;
+    id_counter=0;
     _scaleFactor=1.0;
     _gridSize=1.0;
     gl_scale_f=.01*_scaleFactor;
@@ -792,6 +793,8 @@ void jpsGraphicsView::drawLine()
     {
 
         jpsLineItem* lineItem= new jpsLineItem(current_line);
+        lineItem->set_id(id_counter);
+        id_counter++;
 
         // if there is already a drawn line
         if (line_vector.size()>=1)
@@ -812,7 +815,7 @@ void jpsGraphicsView::drawLine()
         current_line=nullptr;
 
         //Undo
-        RecordUndoLineAction("LineAdded",lineItem->GetType(),lineItem->get_line()->line());
+        RecordUndoLineAction("LineAdded",lineItem->GetType(),lineItem->get_id(),lineItem->get_line()->line());
 
         //drawLine();
 
@@ -875,6 +878,8 @@ jpsLineItem* jpsGraphicsView::addLineItem(const qreal &x1,const qreal &y1,const
     current_line=Scene->addLine(x1,y1,x2,y2);
     current_line->setTransform(QTransform::fromTranslate(translation_x,translation_y), true);
     jpsLineItem* newLine = new jpsLineItem(current_line);
+    newLine->set_id(id_counter);
+    id_counter++;
 
     if (type=="Door")
     {
@@ -979,6 +984,7 @@ void jpsGraphicsView::EditLine(QPointF* point)
 
         if (marked_lines.first()->get_line()->line().p1()==*point)
         {
+            RecordUndoLineAction("LineEdited",marked_lines.first()->GetType(),marked_lines.first()->get_id(),marked_lines.first()->get_line()->line());
             current_line=marked_lines[0]->get_line();
             marked_lines[0]->get_line()->setLine(marked_lines[0]->get_line()->line().x2(),marked_lines[0]->get_line()->line().y2(),translated_pos.x(),translated_pos.y());
             //current_line=Scene->addLine(marked_lines[0]->get_line()->line().p2().x(),
@@ -989,6 +995,7 @@ void jpsGraphicsView::EditLine(QPointF* point)
 
         else if (marked_lines.first()->get_line()->line().p2()==*point)
         {
+            RecordUndoLineAction("LineEdited",marked_lines.first()->GetType(),marked_lines.first()->get_id(),marked_lines.first()->get_line()->line());
             current_line=marked_lines[0]->get_line();
             marked_lines[0]->get_line()->setLine(marked_lines[0]->get_line()->line().x1(),marked_lines[0]->get_line()->line().y1(),translated_pos.x(),translated_pos.y());
 
@@ -1004,6 +1011,7 @@ void jpsGraphicsView::EditLine(QPointF* point)
         //line_tracked=1;
         RemoveIntersections(marked_lines.first());
         _statLineEdit=true;
+
         //delete_marked_lines();
         en_disableWall();
 
@@ -1048,14 +1056,40 @@ bool jpsGraphicsView::show_hide_roomCaption(QString name, qreal x, qreal y)
     return true;
 }
 
-void jpsGraphicsView::RecordUndoLineAction(const QString& name, const QString& type, const QLineF &oldLine)
+void jpsGraphicsView::RecordUndoLineAction(const QString& name, const QString& type, const int& itemID, const QLineF &oldLine)
+{
+    _undoStack.PushNewAction(LineAction(name,type,itemID,oldLine));
+}
+
+void jpsGraphicsView::RecordRedoLineAction(const QString &name, const QString &type, const int& itemID, const QLineF &oldLine)
 {
-    _undoStack.PushNewAction(LineAction(name,type,oldLine));
+    _redoStack.PushNewAction(LineAction(name,type,itemID,oldLine));
+}
+
+void jpsGraphicsView::UndoLineEdit(const int& lineID, const QLineF& old_line)
+{
+    for (jpsLineItem* lineItem:line_vector)
+    {
+        if (lineItem->get_id()==lineID)
+        {
+           RecordRedoLineAction("LineEdited",lineItem->GetType(),lineItem->get_id(),lineItem->get_line()->line());
+           lineItem->get_line()->setLine(old_line);
+           break;
+        }
+    }
 }
 
-void jpsGraphicsView::RecordRedoLineAction(const QString &name, const QString &type, const QLineF &oldLine)
+void jpsGraphicsView::RedoLineEdit(const int &lineID, const QLineF &old_line)
 {
-    _redoStack.PushNewAction(LineAction(name,type,oldLine));
+    for (jpsLineItem* lineItem:line_vector)
+    {
+        if (lineItem->get_id()==lineID)
+        {
+           RecordUndoLineAction("LineEdited",lineItem->GetType(),lineItem->get_id(),lineItem->get_line()->line());
+           lineItem->get_line()->setLine(old_line);
+           break;
+        }
+    }
 }
 
 void jpsGraphicsView::Undo()
@@ -1069,13 +1103,18 @@ void jpsGraphicsView::Undo()
             addLineItem(recentAction.GetOldLine().p1().x(),recentAction.GetOldLine().p1().y(),recentAction.GetOldLine().p2().x(),
                         recentAction.GetOldLine().p2().y(),recentAction.GetType());
 
-            RecordRedoLineAction("LineAdded",recentAction.GetType(),QLineF(0,0,0,0));
+            RecordRedoLineAction("LineAdded",recentAction.GetType(),id_counter-1,QLineF(0,0,0,0));
         }
         else if (recentAction.GetName()=="LineAdded")
         {
-            RecordRedoLineAction("LineDeleted",line_vector.back()->GetType(),line_vector.back()->get_line()->line());
+            RecordRedoLineAction("LineDeleted",line_vector.back()->GetType(),line_vector.back()->get_id(),
+                                 line_vector.back()->get_line()->line());
             RemoveLineItem(line_vector.back());
         }
+        else if (recentAction.GetName()=="LineEdited")
+        {
+            UndoLineEdit(recentAction.GetItemID(),recentAction.GetOldLine());
+        }
     }
 
 }
@@ -1091,15 +1130,21 @@ void jpsGraphicsView::Redo()
             addLineItem(recentAction.GetOldLine().p1().x(),recentAction.GetOldLine().p1().y(),recentAction.GetOldLine().p2().x(),
                         recentAction.GetOldLine().p2().y(),recentAction.GetType());
 
-            RecordUndoLineAction("LineAdded",recentAction.GetType(),QLineF(0,0,0,0));
+            RecordUndoLineAction("LineAdded",recentAction.GetType(),id_counter-1,QLineF(0,0,0,0));
         }
 
         else if (recentAction.GetName()=="LineAdded")
         {
-            RecordUndoLineAction("LineDeleted",line_vector.back()->GetType(),line_vector.back()->get_line()->line());
+            RecordUndoLineAction("LineDeleted",line_vector.back()->GetType(),line_vector.back()->get_id(),
+                                 line_vector.back()->get_line()->line());
             RemoveLineItem(line_vector.back());
 
         }
+        else if (recentAction.GetName()=="LineEdited")
+        {
+            RedoLineEdit(recentAction.GetItemID(),recentAction.GetOldLine());
+
+        }
 
 
     }
@@ -1443,7 +1488,7 @@ void jpsGraphicsView::delete_marked_lines()
         for (int i=0; i<marked_lines.size(); ++i)
         {
 
-            RecordUndoLineAction("LineDeleted",marked_lines[i]->GetType(),marked_lines[i]->get_line()->line());
+            RecordUndoLineAction("LineDeleted",marked_lines[i]->GetType(),marked_lines[i]->get_id(),marked_lines[i]->get_line()->line());
 
             RemoveIntersections(marked_lines[i]);
 
@@ -1571,6 +1616,8 @@ void jpsGraphicsView::take_l_from_lineEdit(const qreal &length)
         line.setLength(length);
         current_line->setLine(line);
         jpsLineItem* jpsline = new jpsLineItem(current_line);
+        jpsline->set_id(id_counter);
+        id_counter++;
         jpsline->set_type(statWall,statDoor,statExit);
         line_vector.push_back(jpsline);
         current_line=nullptr;
diff --git a/src/GraphicView.h b/src/GraphicView.h
index 06be9be..e72eb84 100644
--- a/src/GraphicView.h
+++ b/src/GraphicView.h
@@ -132,8 +132,10 @@ class jpsGraphicsView: public QGraphicsView {
     bool show_hide_roomCaption(QString name, qreal x, qreal y);
 
     //Undo Framework
-    void RecordUndoLineAction(const QString &name, const QString &type, const QLineF &oldLine);
-    void RecordRedoLineAction(const QString &name, const QString &type, const QLineF &oldLine);
+    void RecordUndoLineAction(const QString &name, const QString &type, const int &itemID, const QLineF &oldLine);
+    void RecordRedoLineAction(const QString &name, const QString &type, const int &itemID, const QLineF &oldLine);
+    void UndoLineEdit(const int &lineID, const QLineF &old_line);
+    void RedoLineEdit(const int &lineID, const QLineF &old_line);
 
 public slots:
     //Waypoints
@@ -197,6 +199,7 @@ public slots:
     QList<jpsLineItem *> marked_lines;
     QGraphicsTextItem* current_caption;
     QList<QGraphicsTextItem* > caption_list;
+    int id_counter;
 
     //Landmark and waypoints
     QList<jpsLandmark* > LLandmarks;
diff --git a/src/UndoFramework/lineaction.cpp b/src/UndoFramework/lineaction.cpp
index a8cca4b..9bc9523 100644
--- a/src/UndoFramework/lineaction.cpp
+++ b/src/UndoFramework/lineaction.cpp
@@ -5,9 +5,10 @@ LineAction::LineAction()
 
 }
 
-LineAction::LineAction(const QString &name, const QString &type, const QLineF &oldLine) : Action(name,type)
+LineAction::LineAction(const QString &name, const QString &type, const int &itemID, const QLineF &oldLine) : Action(name,type)
 {
     _oldLine=oldLine;
+    _itemID=itemID;
 }
 
 LineAction::~LineAction()
@@ -20,3 +21,8 @@ QLineF LineAction::GetOldLine() const
     return _oldLine;
 }
 
+int LineAction::GetItemID() const
+{
+    return _itemID;
+}
+
diff --git a/src/UndoFramework/lineaction.h b/src/UndoFramework/lineaction.h
index 63e0cb7..e61f266 100644
--- a/src/UndoFramework/lineaction.h
+++ b/src/UndoFramework/lineaction.h
@@ -8,12 +8,14 @@ class LineAction : public Action
 {
 public:
     LineAction();
-    LineAction(const QString& name, const QString& type, const QLineF& oldLine);
+    LineAction(const QString& name, const QString& type, const int& itemID, const QLineF& oldLine);
     ~LineAction();
 
     QLineF GetOldLine() const;
+    int GetItemID() const;
 private:
     QLineF _oldLine;
+    int _itemID;
 };
 
 #endif // PAINTACTION_H
diff --git a/src/datamanager.cpp b/src/datamanager.cpp
index 3b699f9..3b58cea 100644
--- a/src/datamanager.cpp
+++ b/src/datamanager.cpp
@@ -358,6 +358,7 @@ void jpsDatamanager::writeRoutingHeader(QXmlStreamWriter *stream)
 
 void jpsDatamanager::writeHLines(QXmlStreamWriter *stream, QList<jpsLineItem *> &hLines)
 {
+    // to be sure that id is unique (considering crossings, transitions)
     int id=1000;
     for (jpsLineItem *lineItem:hLines)
     {
diff --git a/src/mainWindow.cpp b/src/mainWindow.cpp
index e063547..7d9317f 100644
--- a/src/mainWindow.cpp
+++ b/src/mainWindow.cpp
@@ -183,6 +183,13 @@ void MWindow::AutoSave()
         dmanager->AutoSaveXML(file);
         //file.write(coord_string.toUtf8());//textEdit->toPlainText().toUtf8());
         statusBar()->showMessage(tr("Backup file generated!"),10000);
+
+        //routing (hlines)
+        QString fileNameRouting = file.fileName();
+        fileNameRouting=fileNameRouting.split(".").first()+"_routing.xml";
+        QFile routingFile(fileNameRouting);
+        if (routingFile.open(QIODevice::WriteOnly|QIODevice::Text))
+            dmanager->writeRoutingXML(routingFile);
     }
 }
 
@@ -339,7 +346,8 @@ void MWindow::saveFile(){
         dmanager->writeXML(file);
 
         //routing (hlines)
-        QString fileNameRouting = fileName+"routing.xml";
+        QString fileNameRouting=fileName.split(".").first()+"_routing.xml";
+
         QFile routingFile(fileNameRouting);
         if (routingFile.open(QIODevice::WriteOnly|QIODevice::Text))
             dmanager->writeRoutingXML(routingFile);

From 4112bb6b7bfceaf306c2ab2a48aa31f2d27a293f Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Mon, 1 Feb 2016 13:29:24 +0100
Subject: [PATCH 49/53] :new: Read HLines (<>routing.xml)

---
 src/GraphicView.cpp |  4 +++
 src/datamanager.cpp | 84 +++++++++++++++++++++++++++++++++++++++++++--
 src/datamanager.h   |  2 ++
 src/mainWindow.cpp  | 13 +++++--
 4 files changed, 98 insertions(+), 5 deletions(-)

diff --git a/src/GraphicView.cpp b/src/GraphicView.cpp
index 0d8e51c..dcb7784 100644
--- a/src/GraphicView.cpp
+++ b/src/GraphicView.cpp
@@ -889,6 +889,10 @@ jpsLineItem* jpsGraphicsView::addLineItem(const qreal &x1,const qreal &y1,const
     {
         newLine->set_Exit();
     }
+    else if (type=="HLine")
+    {
+        newLine->SetHLine();
+    }
     else
     {
         newLine->set_Wall();
diff --git a/src/datamanager.cpp b/src/datamanager.cpp
index 3b58cea..5f35521 100644
--- a/src/datamanager.cpp
+++ b/src/datamanager.cpp
@@ -1034,12 +1034,92 @@ bool jpsDatamanager::readXML(QFile &file)
      * and resets its internal state to the initial state. */
     xmlReader.clear();
 
-    ///AutoZoom to drawing
-    mView->AutoZoom();
+    return true;
+}
+
+bool jpsDatamanager::readRoutingXML(QFile &file)
+{
+    QXmlStreamReader xmlReader(&file);
+
+    // skip header
+    xmlReader.readNext();
+    xmlReader.readNext();
+
+    // see if file starts with geometry
+    if (xmlReader.name() != "routing")
+        return false;
+
+    while(!xmlReader.atEnd() && !xmlReader.hasError())
+    {
+        /* Read next element.*/
+        QXmlStreamReader::TokenType token = xmlReader.readNext();
+        /* If token is just StartDocument, we'll go to next.*/
+        if(token == QXmlStreamReader::StartDocument)
+        {
+            continue;
+        }
+
+        /* If token is StartElement, we'll see if we can read it.*/
+        if(token == QXmlStreamReader::StartElement)
+        {
+            /* If it's named Hlines, we'll go to the next.*/
+            if(xmlReader.name() == "Hlines")
+            {
+                continue;
+            }
+
+            if(xmlReader.name() == "Hline")
+            {
+                this->parseHline(xmlReader);
+            }
+        }
+    }
+    /* Error handling. */
+    if(xmlReader.hasError())
+    {
+        QMessageBox::critical(mView,
+                              "QXSRExample::parseXML",
+                              xmlReader.errorString(),
+                              QMessageBox::Ok);
+        return false;
+    }
+    /* Removes any device() or data from the reader
+     * and resets its internal state to the initial state. */
+    xmlReader.clear();
 
     return true;
 }
 
+void jpsDatamanager::parseHline(QXmlStreamReader &xmlReader)
+{
+
+    while(!(xmlReader.tokenType() == QXmlStreamReader::EndElement &&
+                xmlReader.name() == "Hline"))
+    {
+        xmlReader.readNext();
+
+        if (xmlReader.tokenType()==QXmlStreamReader::StartElement &&
+                         xmlReader.name() == "vertex")
+        {
+
+            // get coords from vertices
+            qreal x1=xmlReader.attributes().value("px").toString().toFloat();
+            qreal y1=xmlReader.attributes().value("py").toString().toFloat();
+
+            // go to next vertex
+            xmlReader.readNext();
+            xmlReader.readNext();
+            xmlReader.readNext();
+
+            qreal x2=xmlReader.attributes().value("px").toString().toFloat();
+            qreal y2=xmlReader.attributes().value("py").toString().toFloat();
+            // add Line to graphview
+            mView->addLineItem(x1,y1,x2,y2,"HLine");
+        }
+
+    }
+}
+
 void jpsDatamanager::parseSubRoom(QXmlStreamReader &xmlReader)
 {
     // new subroom
diff --git a/src/datamanager.h b/src/datamanager.h
index fd35fa6..d1a14ca 100644
--- a/src/datamanager.h
+++ b/src/datamanager.h
@@ -103,6 +103,8 @@ class jpsDatamanager: public DL_CreationAdapter
 
     // Read XML
     bool readXML(QFile &file);
+    bool readRoutingXML(QFile &file);
+    void parseHline(QXmlStreamReader &xmlReader);
     void parseSubRoom(QXmlStreamReader &xmlReader);
     void parseWalls(QXmlStreamReader &xmlReader,jpsRoom* room);
     void parseWalls(QXmlStreamReader &xmlReader,jpsObstacle* room);
diff --git a/src/mainWindow.cpp b/src/mainWindow.cpp
index 7d9317f..bc0f325 100644
--- a/src/mainWindow.cpp
+++ b/src/mainWindow.cpp
@@ -275,12 +275,18 @@ void MWindow::openFileXML()
     QFile file(fileName);
     if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
     {
-
         return;
     }
 
+    //RoutingFile
+    QString fileNameRouting= fileName.split(".").first()+"_routing.xml";
+    QFile fileRouting(fileNameRouting);
+    if (!fileRouting.open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+        return;
+    }
 
-    if (!dmanager->readXML(file))
+    if (!dmanager->readXML(file) || !dmanager->readRoutingXML(fileRouting))
     {
         QMessageBox::critical(this,
                               "OpenFileXML",
@@ -291,7 +297,8 @@ void MWindow::openFileXML()
 
     else
     {
-
+        //AutoZoom to drawing
+        mview->AutoZoom();
         statusBar()->showMessage("XML-File successfully loaded!",10000);
     }
 

From f2ee2ee6e3e399982e61a3060b0996810acc9799 Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Mon, 1 Feb 2016 15:14:38 +0100
Subject: [PATCH 50/53] change info text

---
 src/mainWindow.cpp | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/mainWindow.cpp b/src/mainWindow.cpp
index bc0f325..6828809 100644
--- a/src/mainWindow.cpp
+++ b/src/mainWindow.cpp
@@ -384,8 +384,27 @@ void MWindow::saveAsDXF()
 
 void MWindow::info(){
 
-    QMessageBox::information(
-                0,tr("About..."),tr("JuPedSim; Interface for generating and editing geometry(XML)-files necessary for using JPScore; Manual and tutorial coming soon!"));
+
+
+    QString info = "JuPedSim v0.8 alpha\n\
+    JPSeditor v0.8 alpha\n\
+    ====================\n\
+    \n\
+    Erik Andresen drafted this on 27 Jun 2016\n\
+    \n\
+    We are proud to announce the first alpha release of our software JPSeditor (part of JuPedSim for simulating pedestrians evacuations). Please note that it is a pre release version for developers only. We are working hard towards the final release for this version.\n\
+    \n\
+    JPSeditor is a graphical user interface to create the geometry of a scenario simulated by JuPedSim. It comes with set of CAD- and further tools to simplify the creation of proper xml-files\n \
+    incorporating information about the scenario' geometry.\n\
+    \n\
+    Tutorial\n\
+    ========\n\
+    \n\
+    To highlight some features of JuPedSim we have uploaded some videos on our [YouTube channel](https://www.youtube.com/user/JuPedSim) including a tutorial showing how to use the editor.";
+
+    QMessageBox messageBox;
+    messageBox.information(0,tr("About..."),info);
+
 }
 
 void MWindow::anglesnap()

From db2d6f1b51f4377e0a4b567ea4d5b02b505fadb5 Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Mon, 1 Feb 2016 15:15:54 +0100
Subject: [PATCH 51/53] fix infotext

---
 src/mainWindow.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/mainWindow.cpp b/src/mainWindow.cpp
index 6828809..39293e9 100644
--- a/src/mainWindow.cpp
+++ b/src/mainWindow.cpp
@@ -394,8 +394,7 @@ void MWindow::info(){
     \n\
     We are proud to announce the first alpha release of our software JPSeditor (part of JuPedSim for simulating pedestrians evacuations). Please note that it is a pre release version for developers only. We are working hard towards the final release for this version.\n\
     \n\
-    JPSeditor is a graphical user interface to create the geometry of a scenario simulated by JuPedSim. It comes with set of CAD- and further tools to simplify the creation of proper xml-files\n \
-    incorporating information about the scenario' geometry.\n\
+    JPSeditor is a graphical user interface to create the geometry of a scenario simulated by JuPedSim. It comes with set of CAD- and further tools to simplify the creation of proper xml-files incorporating information about the scenario' geometry.\n\
     \n\
     Tutorial\n\
     ========\n\

From 6186654e8682077c640b3e6ad018bc320270c1a5 Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Mon, 1 Feb 2016 15:21:06 +0100
Subject: [PATCH 52/53] hide cognitive map buttons

---
 forms/mainwindow.ui | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/forms/mainwindow.ui b/forms/mainwindow.ui
index 803f47c..8e958db 100644
--- a/forms/mainwindow.ui
+++ b/forms/mainwindow.ui
@@ -75,21 +75,10 @@
     <addaction name="actionRotate_90_deg_clockwise"/>
     <addaction name="actionShow_Point_of_Origin"/>
    </widget>
-   <widget class="QMenu" name="menuCognitive_Map">
-    <property name="enabled">
-     <bool>true</bool>
-    </property>
-    <property name="title">
-     <string>Cognitive Map</string>
-    </property>
-    <addaction name="action_ffnen_CogMap"/>
-    <addaction name="actionRun_visualisation"/>
-   </widget>
    <addaction name="menuDatei"/>
    <addaction name="menuTools"/>
    <addaction name="menuView"/>
    <addaction name="menuHilfe"/>
-   <addaction name="menuCognitive_Map"/>
   </widget>
   <widget class="QStatusBar" name="statusbar"/>
   <widget class="QToolBar" name="toolBar">
@@ -417,7 +406,7 @@
     <bool>true</bool>
    </property>
    <property name="enabled">
-    <bool>true</bool>
+    <bool>false</bool>
    </property>
    <property name="icon">
     <iconset resource="Ressource.qrc">
@@ -430,7 +419,7 @@
     <string>Landmark</string>
    </property>
    <property name="visible">
-    <bool>true</bool>
+    <bool>false</bool>
    </property>
   </action>
   <action name="actionLandmarkWidget">
@@ -438,7 +427,7 @@
     <bool>true</bool>
    </property>
    <property name="enabled">
-    <bool>true</bool>
+    <bool>false</bool>
    </property>
    <property name="icon">
     <iconset resource="Ressource.qrc">
@@ -451,7 +440,7 @@
     <string>LandmarkSpecs</string>
    </property>
    <property name="visible">
-    <bool>true</bool>
+    <bool>false</bool>
    </property>
   </action>
   <action name="actionanglesnap">

From 9631cf8f31bb4b6d11d78c5666260f420f2ce0fb Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Mon, 1 Feb 2016 16:17:12 +0100
Subject: [PATCH 53/53] Update Changelog

---
 CHANGELOG.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1af4217..c624c95 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,9 @@ All notable changes to this project will be documented in this file.
 
 ### Added
 #### JPSEDITOR
+- 1.2.16 Undo/Redo when Line was edited
+- 1.2.16 Change Info Text
+- 1.2.16 Load HLines
 - 1.2.16 Create and save HLines
 - First approaches of an undo/redo framework
 	- Undo/Redo working when line added or deleted
@@ -20,5 +23,4 @@ All notable changes to this project will be documented in this file.
 	- Length of line is displayed
 	- Show origin
 	- ...
-- Room and door declarations
-	
+- Room and door declarations
\ No newline at end of file