From 3137a81604ae1cdbdc80b2ba25c349a3ed00da0b Mon Sep 17 00:00:00 2001
From: Wanderer Fan <wandererfan@gmail.com>
Date: Fri, 15 Jul 2022 21:21:46 -0400
Subject: [PATCH] [TD]check for spline on linear Dims

---
 src/Mod/TechDraw/Gui/CommandCreateDims.cpp | 28 +++++++++++++---------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp
index e77e636e97..cb48e4e29f 100644
--- a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp
+++ b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp
@@ -516,10 +516,12 @@ void CmdTechDrawLengthDimension::activated(int iMsg)
     std::vector<App::DocumentObject *> objs;
     std::vector<std::string> subs;
 
-    if (_isValidSingleEdge(this) ) {
+    if ( (_isValidSingleEdge(this) == isVertical) ||
+         (_isValidSingleEdge(this) == isHorizontal) ||
+         (_isValidSingleEdge(this) == isDiagonal) ) {
         objs.push_back(objFeat);
         subs.push_back(SubNames[0]);
-    } else if (  _isValidVertexes(this) || 
+    } else if (  _isValidVertexes(this) ||
                 (_isValidEdgeToEdge(this) == isVertical)   ||
                 (_isValidEdgeToEdge(this) == isHorizontal) ||
                 (_isValidEdgeToEdge(this) == isDiagonal) ||
@@ -531,8 +533,8 @@ void CmdTechDrawLengthDimension::activated(int iMsg)
     } else {
       QMessageBox::warning(Gui::getMainWindow(),
                            QObject::tr("Incorrect Selection"),
-                           QObject::tr("Need 2 Vertexes, 2 Edges or 1 Vertex "
-                                       "and 1 Edge for Distance Dimension"));
+                           QObject::tr("Need 1 straight Edge, 2 Vertexes, 2 Edges or "
+                                       "1 Vertex and 1 Edge for Distance Dimension"));
       return;
     }
 
@@ -619,10 +621,12 @@ void CmdTechDrawHorizontalDimension::activated(int iMsg)
     std::vector<App::DocumentObject *> objs;
     std::vector<std::string> subs;
 
-    if (_isValidSingleEdge(this) ) {
+    if ( (_isValidSingleEdge(this) == isVertical) ||
+         (_isValidSingleEdge(this) == isHorizontal) ||
+         (_isValidSingleEdge(this) == isDiagonal) ) {
         objs.push_back(objFeat);
         subs.push_back(SubNames[0]);
-    } else if (  _isValidVertexes(this) || 
+    } else if (  _isValidVertexes(this) ||
                 (_isValidEdgeToEdge(this) == isVertical)   ||
                 (_isValidEdgeToEdge(this) == isHorizontal) ||
                 (_isValidEdgeToEdge(this) == isDiagonal) ||
@@ -634,8 +638,8 @@ void CmdTechDrawHorizontalDimension::activated(int iMsg)
     } else {
       QMessageBox::warning(Gui::getMainWindow(),
                            QObject::tr("Incorrect Selection"),
-                           QObject::tr("Need 2 Vertexes, 2 Edges or 1 Vertex "
-                                       "and 1 Edge for Horizontal Dimension"));
+                           QObject::tr("Need 1 straight Edge, 2 Vertexes, 2 Edges or "
+                                       "1 Vertex and 1 Edge for Horizontal Dimension"));
       return;
     }
 
@@ -722,7 +726,9 @@ void CmdTechDrawVerticalDimension::activated(int iMsg)
     std::vector<App::DocumentObject *> objs;
     std::vector<std::string> subs;
 
-    if (_isValidSingleEdge(this) ) {
+    if ( (_isValidSingleEdge(this) == isVertical) ||
+         (_isValidSingleEdge(this) == isHorizontal) ||
+         (_isValidSingleEdge(this) == isDiagonal) ) {
         objs.push_back(objFeat);
         subs.push_back(SubNames[0]);
     } else if (  _isValidVertexes(this) || 
@@ -737,8 +743,8 @@ void CmdTechDrawVerticalDimension::activated(int iMsg)
     } else {
       QMessageBox::warning(Gui::getMainWindow(),
                            QObject::tr("Incorrect Selection"),
-                           QObject::tr("Need 2 Vertexes, 2 Edges or 1 Vertex "
-                                       "and 1 Edge for Vertical Dimension"));
+                           QObject::tr("Need 1 straight Edge, 2 Vertexes, 2 Edges or "
+                                       "1 Vertex and 1 Edge for Vertical Dimension"));
       return;
     }