Cascade spacing added

2021-12-14 17:57:59 +01:00
parent f2d89f471e
commit 74c3f2b0cf
4 changed files with 101 additions and 84 deletions
--- a/src/Mod/TechDraw/Gui/CommandExtensionDims.cpp
+++ b/src/Mod/TechDraw/Gui/CommandExtensionDims.cpp
@@ -798,7 +798,7 @@ void execCascadeHorizDimension(Gui::Command* cmd){
            return;
        }
        float yMaster = validDimension[0]->Y.getValue();
-        float dimDistance = 7;
+        float dimDistance = activeDimAttributes.getCascadeSpacing();
        if (signbit(yMaster))
            dimDistance = -dimDistance;
        for (auto dim : validDimension){
@@ -860,7 +860,7 @@ void execCascadeVertDimension(Gui::Command* cmd){
            return;
        }
        float xMaster = validDimension[0]->X.getValue();
-        float dimDistance = 7;
+        float dimDistance = activeDimAttributes.getCascadeSpacing();
        if (signbit(xMaster))
            dimDistance = -dimDistance;
        for (auto dim : validDimension){
@@ -929,7 +929,8 @@ void execCascadeObliqueDimension(Gui::Command* cmd){
        dirMaster.y = -dirMaster.y;
        Base::Vector3d origin(0.0,0.0,0.0);
        Base::Vector3d ipDelta = _getTrianglePoint(pMaster,dirMaster,origin);
-        Base::Vector3d delta = ipDelta.Normalize()*7.0;
+        float dimDistance = activeDimAttributes.getCascadeSpacing();
+        Base::Vector3d delta = ipDelta.Normalize()*dimDistance;
        int i = 0;
        for (auto dim : validDimension){
            float xDim = dim->X.getValue();
@@ -1444,8 +1445,8 @@ void execCreateHorizCoordDimension(Gui::Command* cmd){
    if (!allVertexes.empty()){
        if (allVertexes.size() > 1){
            std::sort(allVertexes.begin(),allVertexes.end(),sortX);
-            float yMaster = allVertexes[0].point.y-7.0;
-            float dimDistance = 7.0;
+            float dimDistance = activeDimAttributes.getCascadeSpacing();
+            float yMaster = allVertexes[0].point.y-dimDistance;
            if (signbit(yMaster))
                dimDistance = -dimDistance;
            for(long unsigned int n=0;n<allVertexes.size()-1;n++){
@@ -1511,8 +1512,8 @@ void execCreateVertCoordDimension(Gui::Command* cmd){
        if (allVertexes.size() > 1){
            std::sort(allVertexes.begin(),allVertexes.end(),sortY);
            std::reverse(allVertexes.begin(),allVertexes.end());
-            float xMaster = allVertexes[0].point.x+7.0;
-            float dimDistance = 7.0;
+            float dimDistance = activeDimAttributes.getCascadeSpacing();
+            float xMaster = allVertexes[0].point.x+dimDistance;
            if (signbit(xMaster))
                dimDistance = -dimDistance;
            for(long unsigned int n=0;n<allVertexes.size()-1;n++){
@@ -1580,7 +1581,8 @@ void execCreateObliqueCoordDimension(Gui::Command* cmd){
            Base::Vector3d dirMaster = pMaster-allVertexes[1].point;
            Base::Vector3d origin(0.0,0.0,0.0);
            Base::Vector3d delta = _getTrianglePoint(pMaster,dirMaster,origin);
-            delta = delta.Normalize()*7.0;
+            float dimDistance = activeDimAttributes.getCascadeSpacing();
+            delta = delta.Normalize()*dimDistance;
            double scale = objFeat->getScale();
            for (dimVertex oldVertex : allVertexes){
                Base::Vector3d nextPoint = _getTrianglePoint(pMaster,dirMaster,oldVertex.point);
--- a/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.cpp
+++ b/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.cpp
@@ -111,21 +111,11 @@ void lineAttributes::setStyle(int newStyle)
    style = newStyle;
 }

-int lineAttributes::getStyle(void)
-{
-    return style;
-}
-
 void lineAttributes::setWidth(float newWidth)
 {
    width = newWidth;
 }

-int lineAttributes::getWidth(void)
-{
-    return width;
-}
-
 float lineAttributes::getWidthValue(void)
 {
    switch(width){
@@ -148,11 +138,6 @@ void lineAttributes::setColor(int newColor)
    color = newColor;
 }

-int lineAttributes::getColor(void)
-{
-    return color;
-}
-
 App::Color lineAttributes::getColorValue(void)
 {
    switch(color){
@@ -185,6 +170,22 @@ App::Color lineAttributes::getColorValue(void)
    }
 }

+//===========================================================================
+// managing global dimension attributes
+//===========================================================================
+
+dimAttributes::dimAttributes(void)
+{
+    cascadeSpacing = 7.0;
+}
+
+void dimAttributes::setCascadeSpacing(double spacing)
+{
+    cascadeSpacing = spacing;
+}
+
+dimAttributes activeDimAttributes; // container holding dimension attributes
+
 //===========================================================================
 // TaskSelectLineAttributes
 //===========================================================================
@@ -285,6 +286,10 @@ void TaskSelectLineAttributes::setUiEdit()
        default:
            ui->rbBlack->setChecked(true);
    }
+
+    double cascadeSpacing = activeDimAttributes.getCascadeSpacing();
+    ui->sbSpacing->setValue(cascadeSpacing);
+
 }

 bool TaskSelectLineAttributes::accept()
@@ -346,6 +351,9 @@ bool TaskSelectLineAttributes::accept()
        activeAttributes->setColor(black);
    }

+    double cascadeSpacing = ui->sbSpacing->value();
+    activeDimAttributes.setCascadeSpacing(cascadeSpacing);
+
    return true;
 }

--- a/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.h
+++ b/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.h
@@ -34,6 +34,19 @@

 class Ui_TaskSelectLineAttributes;

+class dimAttributes {
+    double cascadeSpacing;
+
+    public:
+
+    dimAttributes(void);
+    void setCascadeSpacing(double);
+    double getCascadeSpacing(void) {return cascadeSpacing;}
+
+}; // class dimAttributes
+
+extern dimAttributes activeDimAttributes; // container holding dimension attributes
+
 namespace App {
 class DocumentObject;
 }
@@ -69,12 +82,12 @@ class lineAttributes {

    lineAttributes(void);
    void setStyle(int);
-    int getStyle(void);
+    int getStyle(void) {return style;}
    void setWidth(float);
-    int getWidth(void);
+    int getWidth(void) {return width;}
    float getWidthValue(void);
    void setColor(int);
-    int getColor(void);
+    int getColor(void) {return color;}
    App::Color getColorValue(void);

 }; // class lineAttributes
--- a/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.ui
+++ b/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.ui
@@ -7,7 +7,7 @@
    <x>0</x>
    <y>0</y>
    <width>350</width>
-    <height>331</height>
+    <height>406</height>
   </rect>
  </property>
  <property name="sizePolicy">
@@ -27,36 +27,33 @@
  </property>
  <layout class="QVBoxLayout" name="verticalLayout">
   <item>
-   #+++++++++++++++++++++++++++++++++++++++++++++
    <layout class="QGridLayout" name="lineStyles">
-    <item row="0" column="0">
+     <item row="0" column="0">
      <widget class="QLabel" name="label_styles">
       <property name="text">
        <string>Linestyles:</string>
       </property>
      </widget>
     </item>
-    #-------------------------
     <item row="1" column="0">
      <widget class="QRadioButton" name="rbSolid">
+       <property name="toolTip">
+        <string>Set Line style to solid</string>
+       </property>
       <property name="text">
        <string>solid</string>
       </property>
       <property name="autoExclusive">
        <bool>true</bool>
       </property>
-       <property name="toolTip">
-        <string>Set Line style to solid</string>
-       </property>
       <attribute name="buttonGroup">
        <string notr="true">bgLineStyles</string>
       </attribute>
      </widget>
     </item>
-     #------------------------------------
     <item row="2" column="0">
-      <widget class="QRadioButton" name="rbDashed"> 
-      <property name="text">
+      <widget class="QRadioButton" name="rbDashed">
+       <property name="text">
        <string>dashed</string>
       </property>
       <property name="autoExclusive">
@@ -67,7 +64,6 @@
       </attribute>
      </widget>
     </item>
-     #------------------------------------
     <item row="3" column="0">
      <widget class="QRadioButton" name="rbDotted">
       <property name="text">
@@ -81,11 +77,10 @@
       </attribute>
      </widget>
     </item>
-     #-------------------------------------
     <item row="4" column="0">
      <widget class="QRadioButton" name="rbDashDotted">
       <property name="text">
-        <string>dash dotted</string>
+        <string>dashdot</string>
       </property>
       <property name="checked">
        <bool>true</bool>
@@ -98,25 +93,21 @@
       </attribute>
      </widget>
     </item>
-     #--------------------------------------
-    </layout> # lineStyles
+    </layout>
   </item>
-   ############################################
   <item>
-   #----------------------------------------------
    <layout class="QGridLayout" name="lineWidth">
-    <item row="0" column="0">
+     <item row="0" column="0">
      <widget class="QLabel" name="label_width">
       <property name="text">
        <string>Lineswidth:</string>
       </property>
      </widget>
     </item>
-    #-------------------------
     <item row="1" column="0">
      <widget class="QRadioButton" name="rbThin">
       <property name="text">
-        <string>small</string>
+        <string>thin 0,18</string>
       </property>
       <property name="autoExclusive">
        <bool>true</bool>
@@ -126,11 +117,10 @@
       </attribute>
      </widget>
     </item>
-     #------------------------------------
     <item row="2" column="0">
-      <widget class="QRadioButton" name="rbMiddle"> 
-      <property name="text">
-        <string>middle</string>
+      <widget class="QRadioButton" name="rbMiddle">
+       <property name="text">
+        <string>middle 0,35</string>
       </property>
       <property name="checked">
        <bool>true</bool>
@@ -143,11 +133,10 @@
       </attribute>
      </widget>
     </item>
-     #------------------------------------
     <item row="3" column="0">
      <widget class="QRadioButton" name="rbThick">
       <property name="text">
-        <string>thick</string>
+        <string>thick 0,70</string>
       </property>
       <property name="autoExclusive">
        <bool>true</bool>
@@ -157,20 +146,17 @@
       </attribute>
      </widget>
     </item>
-    </layout> # lineWidth
+    </layout>
   </item>
-   ############################################
   <item>
-   #----------------------------------------------
    <layout class="QGridLayout" name="lineColors">
-    <item row="0" column="0">
+     <item row="0" column="0">
      <widget class="QLabel" name="label_colors">
       <property name="text">
        <string>Linecolors:</string>
       </property>
      </widget>
     </item>
-    #-------------------------
     <item row="1" column="0">
      <widget class="QRadioButton" name="rbBlack">
       <property name="text">
@@ -187,7 +173,6 @@
       </attribute>
      </widget>
     </item>
-     #-------------------------
     <item row="1" column="1">
      <widget class="QRadioButton" name="rbBlue">
       <property name="text">
@@ -201,10 +186,9 @@
       </attribute>
      </widget>
     </item>
-     #------------------------------------
     <item row="2" column="0">
-      <widget class="QRadioButton" name="rbGrey"> 
-      <property name="text">
+      <widget class="QRadioButton" name="rbGrey">
+       <property name="text">
        <string>grey</string>
       </property>
       <property name="autoExclusive">
@@ -215,10 +199,9 @@
       </attribute>
      </widget>
     </item>
-     #------------------------------------
     <item row="2" column="1">
-      <widget class="QRadioButton" name="rbMagenta"> 
-      <property name="text">
+      <widget class="QRadioButton" name="rbMagenta">
+       <property name="text">
        <string>magenta</string>
       </property>
       <property name="autoExclusive">
@@ -229,7 +212,6 @@
       </attribute>
      </widget>
     </item>
-     #------------------------------------
     <item row="3" column="0">
      <widget class="QRadioButton" name="rbRed">
       <property name="text">
@@ -243,7 +225,6 @@
       </attribute>
      </widget>
     </item>
-     #------------------------------------
     <item row="3" column="1">
      <widget class="QRadioButton" name="rbCyan">
       <property name="text">
@@ -257,7 +238,6 @@
       </attribute>
      </widget>
     </item>
-     #------------------------------------
     <item row="4" column="0">
      <widget class="QRadioButton" name="rbGreen">
       <property name="text">
@@ -271,7 +251,6 @@
       </attribute>
      </widget>
     </item>
-     #------------------------------------
     <item row="4" column="1">
      <widget class="QRadioButton" name="rbYellow">
       <property name="text">
@@ -285,18 +264,44 @@
       </attribute>
      </widget>
     </item>
-    </layout> # lineWidth
+    </layout>
   </item>
-   ############################################
-  </layout> # QVBoxLayout
+   <item>
+    <widget class="QGroupBox" name="horizontalGroupBox">
+     <layout class="QHBoxLayout" name="Spin001">
+      <item>
+       <widget class="QLabel" name="label_spacing">
+        <property name="text">
+         <string>Cascade spacing</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QDoubleSpinBox" name="sbSpacing">
+        <property name="singleStep">
+         <double>0.500000000000000</double>
+        </property>
+        <property name="value">
+         <double>7.000000000000000</double>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
 </widget>
+ <resources>
+  <include location="Resources/TechDraw.qrc"/>
+ </resources>
+ <connections/>
 <buttongroups>
-  <buttongroup name="bgLineStyles">
+  <buttongroup name="bgLineWidth">
   <property name="exclusive">
    <bool>true</bool>
   </property>
  </buttongroup>
-  <buttongroup name="bgLineWidth">
+  <buttongroup name="bgLineStyles">
   <property name="exclusive">
    <bool>true</bool>
   </property>
@@ -307,15 +312,4 @@
   </property>
  </buttongroup>
 </buttongroups>
- <customwidgets>
-  <customwidget>
-   <class>Gui::QuantitySpinBox</class>
-   <extends>QWidget</extends>
-   <header>Gui/QuantitySpinBox.h</header>
-  </customwidget>
- </customwidgets>
- <resources>
-  <include location="Resources/TechDraw.qrc"/>
- </resources>
- <connections/>
 </ui>