Merge pull request #5 from schmidtw/master

Add the ability to support per-dimension scaling.
qcad · Dec 18, 2014 · ee7dad3 · ee7dad3
2 parents ff410cb + 0cd5209
commit ee7dad3
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 3 deletions.
diff --git a/scripts/Draw/Dimension/DimAligned/DimAligned.js b/scripts/Draw/Dimension/DimAligned/DimAligned.js
@@ -159,7 +159,12 @@ DimAligned.prototype.getOperation = function(preview) {
     }
 
     var doc = this.getDocument();
-    var entity = new RDimAlignedEntity(doc, this.data);
+    var scale = this.parseScale(this.getScaleString());
+    var scaled_data = this.data;
+
+    scaled_data.setLinearFactor(1/scale);
+
+    var entity = new RDimAlignedEntity(doc, scaled_data);
     if (!isEntity(entity)) {
         return undefined;
     }

diff --git a/scripts/Draw/Dimension/DimRotated/DimRotated.js b/scripts/Draw/Dimension/DimRotated/DimRotated.js
@@ -159,7 +159,12 @@ DimRotated.prototype.getOperation = function(preview) {
     }
 
     var doc = this.getDocument();
-    var entity = new RDimRotatedEntity(doc, this.data);
+    var scale = this.parseScale(this.getScaleString());
+    var scaled_data = this.data;
+
+    scaled_data.setLinearFactor(1/scale);
+
+    var entity = new RDimRotatedEntity(doc, scaled_data);
     if (!isEntity(entity)) {
         return undefined;
     }

diff --git a/scripts/Draw/Dimension/Dimension.js b/scripts/Draw/Dimension/Dimension.js
@@ -85,6 +85,8 @@ Dimension.prototype.initUiOptions = function(resume, optionsToolBar) {
     lowerToleranceLineEdit.text = "";
     WidgetFactory.initLineEdit(lowerToleranceLineEdit, true);
 
+    this.initScaleCombo();
+
     // if we are resuming, restore previous values (automatic)
     // it not, keep them empty.
     if (!resume) {
@@ -95,6 +97,21 @@ Dimension.prototype.initUiOptions = function(resume, optionsToolBar) {
     }
 };
 
+Dimension.prototype.initScaleCombo = function() {
+    var optionsToolBar = EAction.getOptionsToolBar();
+    var scaleCombo = optionsToolBar.findChild("Scale");
+    scaleCombo.blockSignals(true);
+    var prev = scaleCombo.currentText;
+    scaleCombo.clear();
+    var scales = this.getScales();
+    for (var i=0; i<scales.length; ++i) {
+        scaleCombo.addItem(scales[i]);
+    }
+    scaleCombo.currentText = prev;
+    scaleCombo.blockSignals(false);
+};
+
+
 Dimension.getMenu = function() {
     var menu = EAction.getMenu(Dimension.getTitle(), "DimensionMenu");
     menu.setProperty("scriptFile", Dimension.includeBasePath + "/Dimension.js");
@@ -203,3 +220,16 @@ Dimension.prototype.slotLowerToleranceChanged = function(text) {
         this.data.setLowerTolerance(text);
     }
 };
+
+Dimension.prototype.getScaleString = function() {
+    var optionsToolBar = EAction.getOptionsToolBar();
+    var scaleCombo = optionsToolBar.findChild("Scale");
+    return scaleCombo.currentText;
+};
+
+/**
+ * Parses the given scale string (e.g. "1:2") and returns the scale as number (e.g. 0.5).
+ */
+Dimension.prototype.parseScale = function(scaleString) {
+    return RMath.parseScale(scaleString);
+};
diff --git a/scripts/Draw/Dimension/Dimension.ui b/scripts/Draw/Dimension/Dimension.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>470</width>
+    <width>719</width>
     <height>56</height>
    </rect>
   </property>
@@ -157,6 +157,50 @@
      </property>
     </widget>
    </item>
+   <item>
+    <widget class="Line" name="line_2">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="label_4">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>Scale</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QComboBox" name="Scale">
+     <property name="minimumSize">
+      <size>
+       <width>90</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="toolTip">
+      <string>Drawing Scale</string>
+     </property>
+     <property name="editable">
+      <bool>true</bool>
+     </property>
+     <property name="insertPolicy">
+      <enum>QComboBox::NoInsert</enum>
+     </property>
+     <item>
+      <property name="text">
+       <string notr="true">1:1</string>
+      </property>
+     </item>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>