From 1cffddc672b9634b5c3805e2efd9c7068f789b71 Mon Sep 17 00:00:00 2001
From: dismine <dismine@gmail.com>
Date: Mon, 13 Jan 2014 00:34:36 +0200
Subject: [PATCH] Fixed method CheckLoops.

--HG--
branch : feature
---
 src/container/vcontainer.cpp | 33 ++++++++++++++++-----------------
 src/tools/vabstracttool.h    |  2 +-
 src/tools/vtooldetail.cpp    | 23 ++++++++++-------------
 3 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/src/container/vcontainer.cpp b/src/container/vcontainer.cpp
index 5328f1a58..ab3b8e490 100644
--- a/src/container/vcontainer.cpp
+++ b/src/container/vcontainer.cpp
@@ -241,22 +241,22 @@ QVector<QPointF> VContainer::CorrectEquidistantPoints(const QVector<QPointF> &po
             correctPoints.append(points.at(i));
         }
     }
-//    if(correctPoints.size()<3)
-//    {
-//        return correctPoints;
-//    }
-//    //Remove point on line
-//    QPointF point;
-//    for(qint32 i = 1; i <correctPoints.size()-1; ++i)
-//    {
-//        QLineF l1(correctPoints[i-1], correctPoints[i]);
-//        QLineF l2(correctPoints[i], correctPoints[i+1]);
-//        QLineF::IntersectType intersect = l1.intersect(l2, &point);
-//        if (intersect == QLineF::NoIntersection)
-//        {
-//            correctPoints.remove(i);
-//        }
-//    }
+    if(correctPoints.size()<3)
+    {
+        return correctPoints;
+    }
+    //Remove point on line
+    QPointF point;
+    for(qint32 i = 1; i <correctPoints.size()-1; ++i)
+    {
+        QLineF l1(correctPoints[i-1], correctPoints[i]);
+        QLineF l2(correctPoints[i], correctPoints[i+1]);
+        QLineF::IntersectType intersect = l1.intersect(l2, &point);
+        if (intersect == QLineF::NoIntersection)
+        {
+            correctPoints.remove(i);
+        }
+    }
     return correctPoints;
 }
 
@@ -579,7 +579,6 @@ QVector<QPointF> VContainer::CheckLoops(const QVector<QPointF> &points) const
                 /*We found loop.*/
                 ekvPoints.append(points.at(i));
                 ekvPoints.append(crosPoint);
-                ekvPoints.append(points.at(j+1));
                 i = j + 2;
             }
         }
diff --git a/src/tools/vabstracttool.h b/src/tools/vabstracttool.h
index f3c036024..638c092ee 100644
--- a/src/tools/vabstracttool.h
+++ b/src/tools/vabstracttool.h
@@ -304,7 +304,7 @@ protected:
      * @brief RemoveAllChild
      * @param domElement
      */
-    void                    RemoveAllChild(QDomElement &domElement);
+    void                    RemoveAllChild(QDomElement &domElement);                   
     virtual void            DeleteTool(QGraphicsItem *tool);
     template <typename T>
     /**
diff --git a/src/tools/vtooldetail.cpp b/src/tools/vtooldetail.cpp
index 740512790..0999c4c59 100644
--- a/src/tools/vtooldetail.cpp
+++ b/src/tools/vtooldetail.cpp
@@ -251,24 +251,21 @@ QVariant VToolDetail::itemChange(QGraphicsItem::GraphicsItemChange change, const
             QGraphicsScene *sc = this->scene();
             QRectF rect = sc->itemsBoundingRect();
             //Correct BoundingRect
-            rect = QRectF(0, 0, rect.width() + rect.x(), rect.height() + rect.y());
+            //rect = QRectF(0, 0, rect.width() + rect.x(), rect.height() + rect.y());
             qDebug()<<"rect"<<rect;
 
             QList<QGraphicsView*> list = sc->views();
             QRect  rec = list[0]->contentsRect();
-            qDebug()<<"rec"<<rec;
+            QTransform t = list[0]->transform();
+            qDebug()<<"m11="<<t.m11();
+            qDebug()<<"m22="<<t.m22();
             //Correct contentsRect
-            rec = QRect(0, 0, rec.width() - rec.x(), rec.height() - rec.y());
-
-            if(rec.contains(rect.toRect()))
-            {
-                sc->setSceneRect(rec);
-            }
-            else
-            {
-                rect = rect.united(rec);
-                sc->setSceneRect(rect);
-            }
+            rec = QRect(0, 0, rec.width()/t.m11() - rec.x(), rec.height()/t.m22() - rec.y());
+//            rec = QRectF(rec.x()/t.m11(), rec.y()/t.m22(), rec.width()/t.m11(), rec.height()/t.m22());
+            qDebug()<<"rec"<<rec;
+            rec = rec.united(rect.toRect());
+            qDebug()<<"rec1"<<rec;
+            sc->setSceneRect(rec);
 
             doc->haveLiteChange();
         }