fix screen based line types for imerial units

qcad · Oct 15, 2014 · 4beaf4c · 4beaf4c
1 parent ec5abc9
commit 4beaf4c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/core/RLinetypePattern.cpp b/src/core/RLinetypePattern.cpp
@@ -156,7 +156,11 @@ QVector<qreal> RLinetypePattern::getScreenBasedLinetype(bool metric) {
 
     if (pattern.length()>1) {
         for (int i = 0; i < pattern.length(); ++i) {
-            ret << ceil(fabs(pattern[i])) * (metric ? 1.0 : 25.4);
+            double dash = fabs(pattern[i]);
+            if (!metric) {
+                dash*=25.4;
+            }
+            ret << ceil(dash);
         }
     }
 

diff --git a/src/core/RMainWindow.cpp b/src/core/RMainWindow.cpp
@@ -356,7 +356,6 @@ void RMainWindow::removeNewDocumentListener(RNewDocumentListener* l) {
 void RMainWindow::notifyNewDocumentListeners(RDocument* document, RTransaction* transaction) {
     QList<RNewDocumentListener*>::iterator it;
     for (it = newDocumentListeners.begin(); it != newDocumentListeners.end(); ++it) {
-        qDebug() << "updateNewDocumentListener";
         (*it)->updateNewDocumentListener(document, transaction);
     }
 }

diff --git a/src/gui/RGraphicsSceneQt.cpp b/src/gui/RGraphicsSceneQt.cpp
@@ -106,7 +106,7 @@ bool RGraphicsSceneQt::beginPath() {
     currentPainterPath.setZLevel(0);
 
     if (screenBasedLinetypes && currentPen.style()==Qt::SolidLine) {
-        QVector<qreal> pat = currentLinetypePattern.getScreenBasedLinetype(RUnit::isMetric(document->getUnit()));
+        QVector<qreal> pat = currentLinetypePattern.getScreenBasedLinetype(document->isMetric());
         if (!pat.isEmpty()) {
             currentPen.setDashPattern(pat);
         }