diff --git a/icons/equal.png b/icons/equal.png new file mode 100644 index 0000000..f1ae3ff Binary files /dev/null and b/icons/equal.png differ diff --git a/icons/other-supp.png b/icons/other-supp.png new file mode 100644 index 0000000..2bb6368 Binary files /dev/null and b/icons/other-supp.png differ diff --git a/icons/same-orientation.png b/icons/same-orientation.png new file mode 100644 index 0000000..c612ee5 Binary files /dev/null and b/icons/same-orientation.png differ diff --git a/icons/step-rotate.png b/icons/step-rotate.png new file mode 100644 index 0000000..6c38a16 Binary files /dev/null and b/icons/step-rotate.png differ diff --git a/icons/step-translate.png b/icons/step-translate.png new file mode 100644 index 0000000..faaeff0 Binary files /dev/null and b/icons/step-translate.png differ diff --git a/toolbar.cpp b/toolbar.cpp index d97357f..de042e5 100644 --- a/toolbar.cpp +++ b/toolbar.cpp @@ -25,11 +25,16 @@ static const struct { { Icon_perpendicular, GraphicsWindow::MNU_PERPENDICULAR, "Constrain to be perpendicular" }, { Icon_pointonx, GraphicsWindow::MNU_ON_ENTITY, "Constrain point on line / curve / plane / point" }, { Icon_symmetric, GraphicsWindow::MNU_SYMMETRIC, "Constrain symmetric" }, + { Icon_equal, GraphicsWindow::MNU_EQUAL, "Constrain equal length / radius / angle" }, + { Icon_same_orientation,GraphicsWindow::MNU_ORIENTED_SAME, "Constrain normals in same orientation" }, + { Icon_other_supp, GraphicsWindow::MNU_OTHER_ANGLE, "Other supplementary angle" }, { Icon_ref, GraphicsWindow::MNU_REFERENCE, "Toggle reference dimension" }, { SPACER }, { Icon_extrude, GraphicsWindow::MNU_GROUP_EXTRUDE, "New group extruding active sketch" }, { Icon_sketch_in_plane, GraphicsWindow::MNU_GROUP_WRKPL, "New group in new workplane (thru given entities)" }, + { Icon_step_rotate, GraphicsWindow::MNU_GROUP_ROT, "New group step and repeat rotating" }, + { Icon_step_translate, GraphicsWindow::MNU_GROUP_TRANS, "New group step and repeat translating" }, { Icon_sketch_in_3d, GraphicsWindow::MNU_GROUP_3D, "New group in 3d" }, { Icon_assemble, GraphicsWindow::MNU_GROUP_IMPORT, "New group importing / assembling file" }, { SPACER }, @@ -94,7 +99,7 @@ bool GraphicsWindow::ToolbarDrawOrHitTest(int mx, int my, int x = 17, y = (int)(height - 52); int fudge = 8; - int h = 32*12 + 3*16 + fudge; + int h = 32*14 + 3*16 + fudge; int aleft = 0, aright = 66, atop = y+16+fudge/2, abot = y+16-h; bool withinToolbar =