From 696aaa413b793a1b021bfd4dc5e3a08edfea6af1 Mon Sep 17 00:00:00 2001
From: dismine <dismine@gmail.com>
Date: Sat, 17 Jan 2015 19:23:54 +0200
Subject: [PATCH] Fixes for method Mirror and debug system.

--HG--
branch : feature
---
 src/libs/vlayout/vlayoutdetail.cpp | 14 ++++++++++++--
 src/libs/vlayout/vlayoutpaper.cpp  | 22 ++++++++--------------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/libs/vlayout/vlayoutdetail.cpp b/src/libs/vlayout/vlayoutdetail.cpp
index 7255da1e2..cc71a6ed2 100644
--- a/src/libs/vlayout/vlayoutdetail.cpp
+++ b/src/libs/vlayout/vlayoutdetail.cpp
@@ -153,14 +153,24 @@ void VLayoutDetail::Mirror(const QLineF &edge)
         return;
     }
 
-    const QLineF axis = QLineF(edge.x1(), edge.y1(), 100, edge.y2()); // Ox axis
+    const QLineF axis = QLineF(edge.x2(), edge.y2(), edge.x2() + 100, edge.y2()); // Ox axis
 
     const qreal angle = edge.angleTo(axis);
     QMatrix m;
     m.translate(edge.p2().x(), edge.p2().y());
     m.rotate(-angle);
+    m.translate(-edge.p2().x(), -edge.p2().y());
+    d->matrix *= m;
+
+    m.reset();
+    m.translate(edge.p2().x(), edge.p2().y());
     m.scale(m.m11(), m.m22()*-1);
-    m.rotate(360 - (-angle));
+    m.translate(-edge.p2().x(), -edge.p2().y());
+    d->matrix *= m;
+
+    m.reset();
+    m.translate(edge.p2().x(), edge.p2().y());
+    m.rotate(-(360-angle));
     m.translate(-edge.p2().x(), -edge.p2().y());
     d->matrix *= m;
 }
diff --git a/src/libs/vlayout/vlayoutpaper.cpp b/src/libs/vlayout/vlayoutpaper.cpp
index 8d3f56ef3..a40b35df7 100644
--- a/src/libs/vlayout/vlayoutpaper.cpp
+++ b/src/libs/vlayout/vlayoutpaper.cpp
@@ -260,7 +260,7 @@ bool VLayoutPaper::AddToBlankSheet(const VLayoutDetail &detail, bool &stop)
             }
             d->frame = d->frame + 2;
 
-            for (int angle = 0; angle <= 360; ++angle)
+            for (int angle = 0; angle <= 360; angle = angle+5)
             {
                 QCoreApplication::processEvents();
 
@@ -319,12 +319,8 @@ bool VLayoutPaper::AddToSheet(const VLayoutDetail &detail, bool &stop)
                     bestResult.NewResult(static_cast<qint64>(rec.width()*rec.height()), j, dEdge,
                                          workDetail.GetMatrix());
                 }
-                else
-                {
-                    continue; // Outside of sheet.
-                }
             }
-            ++d->frame;
+            d->frame = d->frame + 2;
         }
     }
 
@@ -582,8 +578,6 @@ void VLayoutPaper::CombineEdges(VLayoutDetail &detail, const QLineF &globalEdge,
     const qreal dx = globalEdge.x2() - detailEdge.x2();
     const qreal dy = globalEdge.y2() - detailEdge.y2();
 
-//    detailEdge = QLineF(detailEdge.x1()+dx, detailEdge.y1()+dy, detailEdge.x2()+dx, detailEdge.y2()+dy);
-//    angle = detailEdge.angle();
     detailEdge.translate(dx, dy); // Use values for translate detail edge.
 
     const qreal angle_between = globalEdge.angleTo(detailEdge); // Seek angle between two edges.
@@ -810,38 +804,38 @@ bool VLayoutPaper::SaveResult(const BestResult &bestResult, const VLayoutDetail
 //---------------------------------------------------------------------------------------------------------------------
 void VLayoutPaper::DrawDebug(const VLayoutDetail &detail, int frame) const
 {
-    QImage frameImage(d->paperWidth*3, d->paperHeight*3, QImage::Format_RGB32);
+    QImage frameImage(d->paperWidth*2, d->paperHeight*2, QImage::Format_RGB32);
     frameImage.fill(Qt::white);
     QPainter paint;
     paint.begin(&frameImage);
 
     paint.setPen(QPen(Qt::darkRed, 3, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin));
-    paint.drawRect(QRectF(d->paperWidth, d->paperHeight, d->paperWidth, d->paperHeight));
+    paint.drawRect(QRectF(d->paperWidth/2, d->paperHeight/2, d->paperWidth, d->paperHeight));
 
     paint.setPen(QPen(Qt::black, 3, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin));
     QPainterPath p;
     if (d->globalContour.isEmpty())
     {
         p = DrawContour(CutEdge(QLineF(0, 0, d->paperWidth, 0)));
-        p.translate(d->paperWidth, d->paperHeight);
+        p.translate(d->paperWidth/2, d->paperHeight/2);
         paint.drawPath(p);
     }
     else
     {
         p = DrawContour(d->globalContour);
-        p.translate(d->paperWidth, d->paperHeight);
+        p.translate(d->paperWidth/2, d->paperHeight/2);
         paint.drawPath(p);
     }
 
     paint.setPen(QPen(Qt::darkGreen, 3, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin));
     p = DrawContour(detail.GetLayoutAllowencePoints());
-    p.translate(d->paperWidth, d->paperHeight);
+    p.translate(d->paperWidth/2, d->paperHeight/2);
     paint.drawPath(p);
 
 #ifdef ARRANGED_DETAILS
     paint.setPen(QPen(Qt::blue, 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin));
     p = DrawDetails();
-    p.translate(d->paperWidth, d->paperHeight);
+    p.translate(d->paperWidth/2, d->paperHeight/2);
     paint.drawPath(p);
 #endif