From a0219b222878b68174bac800a6a664774cdfc906 Mon Sep 17 00:00:00 2001
From: 77maxikov <77maxikov@mail.ru>
Date: Wed, 29 Apr 2020 13:17:14 +0300
Subject: [PATCH] dimonly fix

---
 res/CMakeLists.txt                        |   2 +
 res/icons/text-window/constraint-dimo.png | Bin 0 -> 480 bytes
 res/icons/text-window/constraint-wo.png   | Bin 0 -> 328 bytes
 src/drawconstraint.cpp                    |  46 ++++++++++-----
 src/export.cpp                            |   2 +-
 src/graphicswin.cpp                       |   2 +-
 src/solvespace.cpp                        |   2 +-
 src/textscreens.cpp                       |   3 +-
 src/textwin.cpp                           |  67 +++++++++++++++++++++-
 src/ui.h                                  |   4 +-
 10 files changed, 106 insertions(+), 22 deletions(-)
 create mode 100644 res/icons/text-window/constraint-dimo.png
 create mode 100644 res/icons/text-window/constraint-wo.png

diff --git a/res/CMakeLists.txt b/res/CMakeLists.txt
index da12ec12..2862b5f4 100644
--- a/res/CMakeLists.txt
+++ b/res/CMakeLists.txt
@@ -268,6 +268,8 @@ add_resources(
     icons/graphics-window/trim.png
     icons/graphics-window/vert.png
     icons/text-window/constraint.png
+    icons/text-window/constraint-dimo.png
+    icons/text-window/constraint-wo.png
     icons/text-window/construction.png
     icons/text-window/edges.png
     icons/text-window/faces.png
diff --git a/res/icons/text-window/constraint-dimo.png b/res/icons/text-window/constraint-dimo.png
new file mode 100644
index 0000000000000000000000000000000000000000..b48715e094ccd65dd166f3fa9a61237624c5f752
GIT binary patch
literal 480
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G|oWRD<U
z28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5ln@H=332@o1PuQ_FnkbT
z5MVgN0OWmJYUKlzWh@Eu3ubV5b|VeMN%D4gVd!9$^#F1>3p^r=85p>QK$!8;-MT+O
zLG}_)Usv`AEMh#;9ABm`%>@cYdAc};NL-$KY9nuh0gubYdLiaJ8yS5LaA<B~`n}$1
zVgrMw$evT*%zHE!u<%GIJFp$lIL0Q>&=SqCWC<(x*5oAN@BIr`zuJ2ydwWiNetEF%
z@~9cF?p^()V=r_497oo422B~DEn+3E5hcz=sfi_-`FRQ<nYpP9h6ehECi(^zdFw7}
z168PkRHP)9q*^6|l%+Bl85o-B8kp!B8HE@cSs55v8Cz-_7+4t?1e~q5MA49&pOTqY
z3DsbzYiJQ-U}|M#Ze?fy(O|f}ViHh;BFKi|{Irtt#G+IN-^Api{M^)(%tQsZ%%art
b{G#k)1rt4kS8D2|K*bE6u6{1-oD!M<ADfWA

literal 0
HcmV?d00001

diff --git a/res/icons/text-window/constraint-wo.png b/res/icons/text-window/constraint-wo.png
new file mode 100644
index 0000000000000000000000000000000000000000..1fbb7dd796ccd1aa42e22e7214ce51f3258ecbe2
GIT binary patch
literal 328
zcmV-O0k{5%P)<h;3K|Lk000e1NJLTq000;O000;W0{{R3*Qw3Q0001EP)t-sGc+(_
zW@9m9W&i*G{{a765?h`io{1ZYZ5C}w4@npW7!?E+It)5h5mj^-betcYry-|u7jhH?
z6eI^EksXn-Be50)7H1V_$0*0HBd#zCFsUM`l^&H|6J9|LL8Bp~h8u>LHR_xI0004W
zQchC<K<3zH0001!Nkl<ZD9?S8*%pE@3`FxVDsH19sJQ?CS4tW{N>lQb%<V~=OobFD
zT9qCNqC+|<A%ma^G_-)wlF<>Z0fG{fpi2wn53HN@(YDcr)(DY0emat&5T+Hl<HiFm
zmaAgDalm%B=izuNNpElGs=j3QcD?2H))XlT<^54kNmo2y6BqjQ{YmYx_|6-cx7@_s
a_xS<tFbN}UHixAE0000<MNUMnLSTZ&zkg%^

literal 0
HcmV?d00001

diff --git a/src/drawconstraint.cpp b/src/drawconstraint.cpp
index 02aababb..2a2acd60 100644
--- a/src/drawconstraint.cpp
+++ b/src/drawconstraint.cpp
@@ -449,21 +449,39 @@ void Constraint::DoArcForAngle(Canvas *canvas, Canvas::hStroke hcs,
 }
 
 bool Constraint::IsVisible() const {
-    if(!SS.GW.showConstraints) return false;
-    Group *g = SK.GetGroup(group);
-    // If the group is hidden, then the constraints are hidden and not
-    // able to be selected.
-    if(!(g->visible)) return false;
-    // And likewise if the group is not the active group; except for comments
-    // with an assigned style.
-    if(g->h != SS.GW.activeGroup && !(type == Type::COMMENT && disp.style.v)) {
-        return false;
+ if(SS.GW.showConstraints == GraphicsWindow::ShowConstraintMode::SCM_NOSHOW ) return false;    
+    bool isDim = false;
+
+    if(SS.GW.showConstraints == GraphicsWindow::ShowConstraintMode::SCM_SHOW_DIM )
+        switch (type){
+        case ConstraintBase::Type::ANGLE:
+        case ConstraintBase::Type::DIAMETER:
+        case ConstraintBase::Type::PT_PT_DISTANCE:
+        case ConstraintBase::Type::PT_FACE_DISTANCE:
+        case ConstraintBase::Type::PT_LINE_DISTANCE:
+        case ConstraintBase::Type::PT_PLANE_DISTANCE:
+            isDim = true;
+            break;
+        default:;
+        }
+
+    if(SS.GW.showConstraints == GraphicsWindow::ShowConstraintMode::SCM_SHOW_ALL || isDim ) {
+        Group *g = SK.GetGroup(group);
+        // If the group is hidden, then the constraints are hidden and not
+        // able to be selected.
+        if(!(g->visible)) return false;
+        // And likewise if the group is not the active group; except for comments
+        // with an assigned style.
+        if(g->h != SS.GW.activeGroup && !(type == Type::COMMENT && disp.style.v)) {
+            return false;
+        }
+        if(disp.style.v) {
+            Style *s = Style::Get(disp.style);
+            if(!s->visible) return false;
+        }
+        return true;
     }
-    if(disp.style.v) {
-        Style *s = Style::Get(disp.style);
-        if(!s->visible) return false;
-    }
-    return true;
+    return false;
 }
 
 bool Constraint::DoLineExtend(Canvas *canvas, Canvas::hStroke hcs,
diff --git a/src/export.cpp b/src/export.cpp
index f1c331fd..7a54581e 100644
--- a/src/export.cpp
+++ b/src/export.cpp
@@ -227,7 +227,7 @@ void SolveSpaceUI::ExportViewOrWireframeTo(const Platform::Path &filename, bool
         }
     }
 
-    if(SS.GW.showConstraints) {
+    if(SS.GW.showConstraints != GraphicsWindow::ShowConstraintMode::SCM_NOSHOW ) {
         if(!out->OutputConstraints(&SK.constraint)) {
             GetEdgesCanvas canvas = {};
             canvas.camera = SS.GW.GetCamera();
diff --git a/src/graphicswin.cpp b/src/graphicswin.cpp
index 3d7a69b7..b397c0be 100644
--- a/src/graphicswin.cpp
+++ b/src/graphicswin.cpp
@@ -409,7 +409,7 @@ void GraphicsWindow::Init() {
     showNormals = true;
     showPoints = true;
     showConstruction = true;
-    showConstraints = true;
+    showConstraints = GraphicsWindow::ShowConstraintMode::SCM_SHOW_ALL;
     showShaded = true;
     showEdges = true;
     showMesh = false;
diff --git a/src/solvespace.cpp b/src/solvespace.cpp
index b0e48016..a7c44360 100644
--- a/src/solvespace.cpp
+++ b/src/solvespace.cpp
@@ -719,7 +719,7 @@ void SolveSpaceUI::MenuFile(Command id) {
 
             // If the user is exporting something where it would be
             // inappropriate to include the constraints, then warn.
-            if(SS.GW.showConstraints &&
+            if(SS.GW.showConstraints != GraphicsWindow::ShowConstraintMode::SCM_NOSHOW &&
                 (dialog->GetFilename().HasExtension("txt") ||
                  fabs(SS.exportOffset) > LENGTH_EPS))
             {
diff --git a/src/textscreens.cpp b/src/textscreens.cpp
index ba5d977c..c73361f9 100644
--- a/src/textscreens.cpp
+++ b/src/textscreens.cpp
@@ -194,8 +194,7 @@ void TextWindow::ScreenHoverRequest(int link, uint32_t v) {
     SS.GW.hover.emphasized = true;
 }
 void TextWindow::ScreenHoverConstraint(int link, uint32_t v) {
-    if(!SS.GW.showConstraints) return;
-
+    if( SS.GW.showConstraints == GraphicsWindow::ShowConstraintMode::SCM_NOSHOW ) return;
     hConstraint hc = { v };
     SS.GW.hover.Clear();
     SS.GW.hover.constraint = hc;
diff --git a/src/textwin.cpp b/src/textwin.cpp
index b68c0680..0b58523a 100644
--- a/src/textwin.cpp
+++ b/src/textwin.cpp
@@ -82,6 +82,62 @@ public:
         }
     }
 };
+#include <array>
+class TriStateButton : public Button {
+public:
+    TriStateButton(GraphicsWindow::ShowConstraintMode*variable,
+                   const std::array<GraphicsWindow::ShowConstraintMode,3> &states,
+                   const std::array<std::string,3> &tooltips,
+                   const std::array<std::string,3> &iconNames  ):variable(variable),states(states),tooltips(tooltips),iconNames(iconNames){}
+
+    GraphicsWindow::ShowConstraintMode* variable;
+    std::array<GraphicsWindow::ShowConstraintMode,3> states;
+    std::array<std::string,3> tooltips;
+    std::array<std::string,3> iconNames;
+    std::shared_ptr<Pixmap> icons[3];
+
+    std::string Tooltip() override {
+        for (size_t k = 0; k < 3; ++k )
+            if ( *variable == states[k] ) return tooltips[k];
+        ssassert(false, "Unexpected mode");
+    }
+
+    void Draw(UiCanvas *uiCanvas, int x, int y, bool asHovered) override {
+        for (size_t k = 0; k < 3;++k)
+            if(icons[k] == nullptr)
+                icons[k] = LoadPng("icons/text-window/" + iconNames[k] + ".png");
+
+        std::shared_ptr<Pixmap> icon;
+        for (size_t k = 0; k < 3; ++k )
+            if ( *variable == states[k] ){
+                icon = icons[k];
+                break;
+            }
+
+        uiCanvas->DrawPixmap(icon, x, y - 24);
+        if(asHovered) {
+            uiCanvas->DrawRect(x - 2, x + 26, y + 2, y - 26,
+                               /*fillColor=*/{ 255, 255, 0, 75 },
+                               /*outlineColor=*/{});
+        }
+    }
+
+
+    int AdvanceWidth() override { return 32; }
+
+    void Click() override {
+        for (size_t k = 0;k < 3;++k)
+            if ( *variable == states[k] ){
+                *variable = states[(k+1)%3];
+                break;
+            }
+
+        SS.GenerateAll();
+        SS.GW.Invalidate();
+        SS.ScheduleShowTW();
+    }
+};
+
 
 class OccludedLinesButton : public Button {
 public:
@@ -163,8 +219,15 @@ static ShowHideButton pointsButton =
     { &(SS.GW.showPoints),       "point",         "points"                          };
 static ShowHideButton constructionButton =
     { &(SS.GW.showConstruction), "construction",  "construction entities"           };
-static ShowHideButton constraintsButton =
-    { &(SS.GW.showConstraints),  "constraint",    "constraints and dimensions"      };
+static TriStateButton constraintsButton =
+    { &(SS.GW.showConstraints),
+      {GraphicsWindow::ShowConstraintMode::SCM_SHOW_ALL,
+       GraphicsWindow::ShowConstraintMode::SCM_SHOW_DIM,
+       GraphicsWindow::ShowConstraintMode::SCM_NOSHOW},
+      {"constraints and dimensions","dimensions","none"},
+      {"constraint","constraint-dimo","constraint-wo"}
+    };
+
 static FacesButton facesButton;
 static ShowHideButton shadedButton =
     { &(SS.GW.showShaded),       "shaded",        "shaded view of solid model"      };
diff --git a/src/ui.h b/src/ui.h
index fb777a87..67eb248f 100644
--- a/src/ui.h
+++ b/src/ui.h
@@ -801,12 +801,14 @@ public:
     bool ToolbarMouseDown(int x, int y);
     Command toolbarHovered;
 
+    enum    class ShowConstraintMode{SCM_NOSHOW,SCM_SHOW_ALL,SCM_SHOW_DIM};
+
     // This sets what gets displayed.
     bool    showWorkplanes;
     bool    showNormals;
     bool    showPoints;
     bool    showConstruction;
-    bool    showConstraints;
+    ShowConstraintMode    showConstraints;
     bool    showTextWindow;
     bool    showShaded;
     bool    showEdges;