From ce4712e7367a5b8025ea6f50e7c959b99da13a19 Mon Sep 17 00:00:00 2001
From: Dhruv Gramopadhye <dgramopadhye@gmail.com>
Date: Sat, 6 Apr 2024 13:24:59 -0700
Subject: [PATCH] relation in toolbar, menu, and keybind

---
 res/CMakeLists.txt                     |   1 +
 res/icons/graphics-window/relation.png | Bin 0 -> 151 bytes
 src/drawconstraint.cpp                 |   6 +++---
 src/graphicswin.cpp                    |   2 +-
 src/toolbar.cpp                        |   2 ++
 5 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 res/icons/graphics-window/relation.png

diff --git a/res/CMakeLists.txt b/res/CMakeLists.txt
index 2862b5f4..204a2981 100644
--- a/res/CMakeLists.txt
+++ b/res/CMakeLists.txt
@@ -255,6 +255,7 @@ add_resources(
     icons/graphics-window/pointonx.png
     icons/graphics-window/point.png
     icons/graphics-window/rectangle.png
+    icons/graphics-window/relation.png
     icons/graphics-window/ref.png
     icons/graphics-window/revolve.png
     icons/graphics-window/same-orientation.png
diff --git a/res/icons/graphics-window/relation.png b/res/icons/graphics-window/relation.png
new file mode 100644
index 0000000000000000000000000000000000000000..e60900c1ce1cd4aeebd2cb562e3f89a13e086073
GIT binary patch
literal 151
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-1!HlL
zyA#8@b22Z19F}xPUq=Rpjs4tz5?O(K9Zwg>kP61P7Z(aLC@>s8Fy(K#Uf<zHhUw*|
qri`BVQ{|UFZJhAc`a&bGO6-hiRW^2Yese{jJ_b)$KbLh*2~7a;R42^<

literal 0
HcmV?d00001

diff --git a/src/drawconstraint.cpp b/src/drawconstraint.cpp
index 3facb662..a62e6c01 100644
--- a/src/drawconstraint.cpp
+++ b/src/drawconstraint.cpp
@@ -28,9 +28,9 @@ std::string Constraint::Label() const {
     }
     if(expression != "") {
         result = expression ;
-			  if(SS.MmPerUnit() != expr_scaling_to_base) {
-					result += "*" + std::to_string(expr_scaling_to_base/SS.MmPerUnit());
-				}
+        if(SS.MmPerUnit() != expr_scaling_to_base && expr_scaling_to_base != 0) {
+            result += "*" + std::to_string(expr_scaling_to_base/SS.MmPerUnit());
+        }
     }
     if(reference) {
         result += " REF";
diff --git a/src/graphicswin.cpp b/src/graphicswin.cpp
index e2a252db..7f793d16 100644
--- a/src/graphicswin.cpp
+++ b/src/graphicswin.cpp
@@ -165,7 +165,7 @@ const MenuEntry Menu[] = {
 { 1, N_("Lock Point Where &Dragged"),   Command::WHERE_DRAGGED,    ']',     KN, mCon   },
 { 1, NULL,                              Command::NONE,             0,       KN, NULL   },
 { 1, N_("Comment"),                     Command::COMMENT,          ';',     KN, mCon   },
-{ 1, N_("Relation"),                    Command::RELATION,         ':',     KN, mCon   },
+{ 1, N_("Relation"),                    Command::RELATION,         '/',     KN, mCon   },
 
 { 0, N_("&Analyze"),                    Command::NONE,             0,       KN, mAna   },
 { 1, N_("Measure &Volume"),             Command::VOLUME,           C|S|'v', KN, mAna   },
diff --git a/src/toolbar.cpp b/src/toolbar.cpp
index 74764883..6152a541 100644
--- a/src/toolbar.cpp
+++ b/src/toolbar.cpp
@@ -62,6 +62,8 @@ static ToolIcon Toolbar[] = {
       N_("Other supplementary angle"),                        {} },
     { "ref",             Command::REFERENCE,
       N_("Toggle reference dimension"),                       {} },
+    { "relation",        Command::RELATION,
+      N_("Constrain variables with equation"),                {} },
     { "",                Command::NONE, "",                   {} },
 
     { "extrude",         Command::GROUP_EXTRUDE,