diff --git a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc index 2f6dd9650..38a9462fd 100644 --- a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc +++ b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc @@ -94,7 +94,6 @@ icons/small/Constraint_PointOnStart_sm.xpm icons/small/Constraint_PointToObject_sm.xpm icons/small/Constraint_Radius_sm.xpm - icons/small/Constraint_Symmetric.svg.zip icons/small/Constraint_Symmetric_sm.xpm icons/small/Constraint_TangentToEnd_sm.xpm icons/small/Constraint_TangentToStart_sm.xpm diff --git a/src/Mod/Sketcher/Gui/SoDatumLabel.cpp b/src/Mod/Sketcher/Gui/SoDatumLabel.cpp index 442e674af..7c02776c7 100644 --- a/src/Mod/Sketcher/Gui/SoDatumLabel.cpp +++ b/src/Mod/Sketcher/Gui/SoDatumLabel.cpp @@ -56,6 +56,8 @@ #include "SoDatumLabel.h" #include +#define ZCONSTR 0.006f + using namespace SketcherGui; // ------------------------------------------------------ @@ -349,14 +351,14 @@ void SoDatumLabel::generatePrimitives(SoAction * action) // Calculate coordinates for the first arrow SbVec3f ar0, ar1, ar2; - ar0 = p1 + dir * 5 * margin; + ar0 = p1 + dir * 5 * margin ; ar1 = ar0 - dir * 0.866f * 2 * margin; // Base Point of Arrow ar2 = ar1 + norm * margin; // Triangular corners ar1 -= norm * margin; // Calculate coordinates for the second arrow SbVec3f ar3, ar4, ar5; - ar3 = p2 - dir * 5 * margin; + ar3 = p2 - dir * 5 * margin ; ar4 = ar3 + dir * 0.866f * 2 * margin; // Base Point of 2nd Arrow ar5 = ar4 + norm * margin; // Triangular corners @@ -831,14 +833,14 @@ void SoDatumLabel::GLRender(SoGLRenderAction * action) ar1 = ar0 - dir * 0.866f * 2 * margin; ar2 = ar1 + norm * margin; ar1 -= norm * margin; - + glBegin(GL_LINES); - glVertex2f(p1[0],p1[1]); - glVertex2f(ar0[0],ar0[1]); - glVertex2f(ar0[0],ar0[1]); - glVertex2f(ar1[0],ar1[1]); - glVertex2f(ar0[0],ar0[1]); - glVertex2f(ar2[0],ar2[1]); + glVertex3f(p1[0], p1[1], ZCONSTR); + glVertex3f(ar0[0], ar0[1], ZCONSTR); + glVertex3f(ar0[0], ar0[1], ZCONSTR); + glVertex3f(ar1[0], ar1[1], ZCONSTR); + glVertex3f(ar0[0], ar0[1], ZCONSTR); + glVertex3f(ar2[0], ar2[1], ZCONSTR); glEnd(); // Calculate coordinates for the second arrow @@ -849,12 +851,12 @@ void SoDatumLabel::GLRender(SoGLRenderAction * action) ar4 -= norm * margin; glBegin(GL_LINES); - glVertex2f(p2[0],p2[1]); - glVertex2f(ar3[0],ar3[1]); - glVertex2f(ar3[0], ar3[1]); - glVertex2f(ar4[0], ar4[1]); - glVertex2f(ar3[0], ar3[1]); - glVertex2f(ar5[0], ar5[1]); + glVertex3f(p2[0], p2[1], ZCONSTR); + glVertex3f(ar3[0], ar3[1], ZCONSTR); + glVertex3f(ar3[0], ar3[1], ZCONSTR); + glVertex3f(ar4[0], ar4[1], ZCONSTR); + glVertex3f(ar3[0], ar3[1], ZCONSTR); + glVertex3f(ar5[0], ar5[1], ZCONSTR); glEnd(); // BOUNDING BOX CALCULATION - IMPORTANT diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp index 3dd10d831..404c7730c 100644 --- a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp +++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp @@ -256,10 +256,10 @@ ViewProviderSketch::ViewProviderSketch() PointSize.setValue(4); zCross=0.001f; - zConstr=0.003f; // constraint not construction zLines=0.005f; - zHighLine=0.006f; - zPoints=0.007f; + zConstr=0.006f; // constraint not construction + zHighLine=0.007f; + zPoints=0.008f; zHighlight=0.009f; zText=0.011f; zEdit=0.001f;