fix FS#1729 - Wrong sizes for dimensions in blocks viewed through

viewport
qcad · Mar 26, 2018 · 54b7331 · 54b7331
1 parent 7b8232f
commit 54b7331
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/core/RBlockReferenceData.cpp b/src/core/RBlockReferenceData.cpp
@@ -28,7 +28,8 @@ RBlockReferenceData::RBlockReferenceData() :
     columnCount(1),
     rowCount(1),
     columnSpacing(0),
-    rowSpacing(0) {
+    rowSpacing(0),
+    visualPropertiesScale(1.0) {
 }
 
 RBlockReferenceData::RBlockReferenceData(RDocument* document,
@@ -356,6 +357,9 @@ bool RBlockReferenceData::applyTransformationTo(REntity& entity) const {
         blockReference->rotate(-2*blockReference->getRotation(), blockReference->getPosition());
         blockReference->rotate(rotation);
         blockReference->move(position);
+        if (!RMath::fuzzyCompare(visualPropertiesScale, 1.0)) {
+            blockReference->scaleVisualProperties(visualPropertiesScale);
+        }
         return true;
     }
 
@@ -364,6 +368,10 @@ bool RBlockReferenceData::applyTransformationTo(REntity& entity) const {
     entity.rotate(rotation);
     entity.move(position);
 
+    if (!RMath::fuzzyCompare(visualPropertiesScale, 1.0)) {
+        entity.scaleVisualProperties(visualPropertiesScale);
+    }
+
     return true;
 }
 
@@ -580,6 +588,10 @@ bool RBlockReferenceData::scale(const RVector& scaleFactors, const RVector& cent
     return true;
 }
 
+void RBlockReferenceData::scaleVisualProperties(double scaleFactor) {
+    visualPropertiesScale = scaleFactor;
+}
+
 void RBlockReferenceData::setReferencedBlockId(RBlock::Id blockId) {
     referencedBlockId = blockId;
     update();

diff --git a/src/core/RBlockReferenceData.h b/src/core/RBlockReferenceData.h
@@ -79,6 +79,8 @@ friend class RViewportEntity;
     virtual bool scale(const RVector& scaleFactors,
                        const RVector& center = RDEFAULT_RVECTOR);
 
+    virtual void scaleVisualProperties(double scaleFactor);
+
     void setReferencedBlockId(RBlock::Id blockId);
 
     void groundReferencedBlockId() const;
@@ -152,6 +154,9 @@ friend class RViewportEntity;
     int rowCount;
     double columnSpacing;
     double rowSpacing;
+
+    double visualPropertiesScale;
+
     mutable QList<RBox> boundingBoxes;
     mutable QList<RBox> boundingBoxesIgnoreEmpty;
     mutable QMap<REntity::Id, QSharedPointer<REntity> > cache;