From 2c1e83ac9c9482c43ebb3e23bf031fc54bd39cbd Mon Sep 17 00:00:00 2001 From: donovaly Date: Tue, 16 Jul 2019 02:43:12 +0200 Subject: [PATCH] uniforms option names and add tooltips for sketcher --- src/Mod/Sketcher/Gui/SketcherSettings.ui | 53 ++++++++++++---- .../Sketcher/Gui/SketcherSettingsColors.ui | 38 +++++++----- .../Sketcher/Gui/TaskSketcherConstrains.ui | 38 +++++++----- src/Mod/Sketcher/Gui/TaskSketcherElements.ui | 8 ++- src/Mod/Sketcher/Gui/TaskSketcherGeneral.ui | 19 ++++++ src/Mod/Sketcher/Gui/TaskSketcherMessages.ui | 16 ++--- .../Gui/TaskSketcherSolverAdvanced.ui | 62 +++++++++++++++---- 7 files changed, 170 insertions(+), 64 deletions(-) diff --git a/src/Mod/Sketcher/Gui/SketcherSettings.ui b/src/Mod/Sketcher/Gui/SketcherSettings.ui index 4c47ff42df..fd0e88326e 100644 --- a/src/Mod/Sketcher/Gui/SketcherSettings.ui +++ b/src/Mod/Sketcher/Gui/SketcherSettings.ui @@ -56,7 +56,7 @@ - Notify automatic constraint substitutions + Notifies about automatic constraint substitutions Notify automatic constraint substitutions @@ -90,6 +90,9 @@ + + Font size used for labels and constraints + px @@ -112,6 +115,9 @@ + + Line pattern used for grid lines + -1 @@ -119,6 +125,9 @@ + + A dialog will pop up to input a value for new dimensional constraints + Ask for value after creating a dimensional constraint @@ -142,8 +151,11 @@ + + Current sketcher creation tool will remain active after creation + - Geometry Creation "Continue Mode" + Geometry creation "Continue Mode" true @@ -158,8 +170,11 @@ + + Current constraint creation tool will remain active after creation + - Constraint Creation "Continue Mode" + Constraint creation "Continue Mode" true @@ -208,7 +223,7 @@ - When opening sketch, hide all features that depend on it. + When opening sketch, hide all features that depend on it Hide all objects that depend on the sketch @@ -227,7 +242,7 @@ - When opening sketch, show sources for external geometry links. + When opening sketch, show sources for external geometry links Show objects used for external geometry @@ -246,7 +261,7 @@ - When opening sketch, show objects the sketch is attached to. + When opening sketch, show objects the sketch is attached to Show object(s) sketch is attached to @@ -265,7 +280,7 @@ - When closing sketch, move camera back to where it was before sketch was opened. + When closing sketch, move camera back to where it was before sketch was opened Restore camera position after editing @@ -309,7 +324,7 @@ - Apply current smart visibility to all sketches in open documents (update properties to match). + Applies current visibility automation settings to all sketches in open documents Apply to existing sketches @@ -328,6 +343,9 @@ + + Number of polygons for geometry approximation + 50 @@ -345,7 +363,8 @@ - Do not show base length units in sketches. Supports all unit systems except US Customary and Building US/Euro. + Base length units will not be displayed in constraints. +Supports all unit systems except 'US customary' and 'Building US/Euro'. Hide base length units for supported unit systems @@ -364,13 +383,17 @@ - Sketcher Solver + Sketcher solver + + Sketcher dialog will have additional section +'Advanced solver control' to adjust solver settings + - Show Advanced Solver Control in the Task bar + Show section 'Advanced solver control' in task dialog ShowSolverAdvancedWidget @@ -386,13 +409,17 @@ - Dragging Performance + Dragging performance + + Special solver algorithm will be used while dragging sketch elements. +Requires to re-enter edit mode to take effect. + - Improve solving while dragging (requires to re-enter edit mode to take effect) + Improve solving while dragging true diff --git a/src/Mod/Sketcher/Gui/SketcherSettingsColors.ui b/src/Mod/Sketcher/Gui/SketcherSettingsColors.ui index 1ba85872e2..9235a4d255 100644 --- a/src/Mod/Sketcher/Gui/SketcherSettingsColors.ui +++ b/src/Mod/Sketcher/Gui/SketcherSettingsColors.ui @@ -38,7 +38,7 @@ - The color of edges being edited + Color of edges @@ -71,7 +71,7 @@ - The color of vertices being edited + Color of vertices @@ -103,6 +103,9 @@ + + Color used while new sketch elements are created + 204 @@ -134,7 +137,7 @@ - The color of edges being edited + Color of edges being edited @@ -167,7 +170,7 @@ - The color of vertices being edited + Color of vertices being edited @@ -200,7 +203,7 @@ - The color of construction geometry in edit mode + Color of construction geometry in edit mode @@ -233,7 +236,7 @@ - The color of external geometry in edit mode + Color of external geometry in edit mode @@ -266,7 +269,7 @@ - The color of fully constrained geometry in edit mode + Color of fully constrained geometry in edit mode @@ -299,7 +302,7 @@ - The color of driving constraints in edit mode + Color of driving constraints in edit mode @@ -319,14 +322,14 @@ - Reference Constraint color + Reference constraint color - The color of reference constrains and datum in edit mode + Color of reference constraints in edit mode @@ -353,7 +356,7 @@ - The color of expression dependent datum constraints in edit mode + Color of expression dependent constraints in edit mode @@ -380,7 +383,7 @@ - The color of deactivated constraints in edit mode + Color of deactivated constraints in edit mode @@ -413,7 +416,7 @@ - The color of the datum portion of a driving constraint + Color of the datum portion of a driving constraint @@ -544,12 +547,15 @@ - Cursor text color + Coordinate text color + + Text color of the coordinates + 0 @@ -580,6 +586,10 @@ + + Color of crosshair cursor. +(The one you get when creating a new sketch element.) + 255 diff --git a/src/Mod/Sketcher/Gui/TaskSketcherConstrains.ui b/src/Mod/Sketcher/Gui/TaskSketcherConstrains.ui index 8c511e86a5..50e8ce5285 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherConstrains.ui +++ b/src/Mod/Sketcher/Gui/TaskSketcherConstrains.ui @@ -59,8 +59,11 @@ + + Internal alignments will be hidden + - Hide Internal Alignment + Hide internal alignment true @@ -74,21 +77,24 @@ - - - Extended Information - - - false - - - ExtendedConstraintInformation - - - Mod/Sketcher - - - + + + Extended information will be added to the list + + + Extended information + + + false + + + ExtendedConstraintInformation + + + Mod/Sketcher + + + diff --git a/src/Mod/Sketcher/Gui/TaskSketcherElements.ui b/src/Mod/Sketcher/Gui/TaskSketcherElements.ui index 8712457d99..8fd76d145f 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherElements.ui +++ b/src/Mod/Sketcher/Gui/TaskSketcherElements.ui @@ -117,8 +117,11 @@ + + Extended naming containing info about element mode + - Extended Naming + Extended naming false @@ -127,6 +130,9 @@ + + Only the type 'Edge' will be available for the list + Auto-switch to Edge diff --git a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.ui b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.ui index 9a755a3b5f..607bd8b16b 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.ui +++ b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.ui @@ -16,6 +16,9 @@ + + A grid will be shown + Show grid @@ -35,6 +38,9 @@ + + Distance between two subsequent grid lines + mm @@ -62,6 +68,10 @@ true + + New points will snap to the nearest grid line. +Points must be set closer than a fifth of the grid size to a grid line to snap. + Grid snap @@ -72,6 +82,9 @@ true + + Sketcher proposes automatically sensible constraints. + Auto constraints @@ -82,6 +95,9 @@ + + Sketcher tries not to propose redundant auto constraints + Avoid redundant auto constraints @@ -105,6 +121,9 @@ + + To change, drag and drop a geometry type to top or bottom + true diff --git a/src/Mod/Sketcher/Gui/TaskSketcherMessages.ui b/src/Mod/Sketcher/Gui/TaskSketcherMessages.ui index cb48402286..3dcd2a6a30 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherMessages.ui +++ b/src/Mod/Sketcher/Gui/TaskSketcherMessages.ui @@ -7,7 +7,7 @@ 0 0 253 - 115 + 132 @@ -49,10 +49,10 @@ - Automatically removes redundant constraints. + New constraints that would be redundant will automatically be removed - Auto Remove Redundants + Auto remove redundants false @@ -64,7 +64,7 @@ Mod/Sketcher - + @@ -83,10 +83,10 @@ - Executes a recompute of the active document after every command + Executes a recomputation of active document after every sketch action - Auto Update + Auto update false @@ -98,11 +98,11 @@ Mod/Sketcher - + - Forces a recompute of the active document + Forces recomputation of active document Update diff --git a/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.ui b/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.ui index 45a0fb7e74..98ee453429 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.ui +++ b/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.ui @@ -22,12 +22,17 @@ Default algorithm used for Sketch solving - Default Solver: + Default solver: + + Solver is used for solving the geometry. +LevenbergMarquardt and DogLeg are trust region optimization algorithms. +BFGS solver uses the Broyden–Fletcher–Goldfarb–Shanno algorithm. + 2 @@ -70,6 +75,9 @@ + + Step type used in the DogLeg algorithm + 0 @@ -106,12 +114,15 @@ Maximum number of iterations of the default algorithm - Maximum Iterations: + Maximum iterations: + + Maximum iterations to find convergence before solver is stopped + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -151,6 +162,9 @@ 0 + + Maximum iterations will be multiplied by number of parameters + Qt::RightToLeft @@ -181,6 +195,10 @@ + + Threshold for squared error that is used +to determine whether a solution converges or not + Qt::LeftToRight @@ -280,12 +298,17 @@ Algorithm used for the rank revealing QR decomposition - QR Algorithm: + QR algorithm: + + During diagnosing the QR rank of matrix is calculated. +Eigen Dense QR is a dense matrix QR with full pivoting; usually slower +Eigen Sparse QR algorithm is optimized for sparse matrices; usually faster + 1 @@ -320,6 +343,9 @@ + + During a QR, values under the pivot threshold are treated as zero + 1E-13 @@ -344,12 +370,15 @@ Solving algorithm used for determination of Redundant constraints - Redundant Solver: + Redundant solver: + + Solver used to determine whether a group is redundant or conflicting + 2 @@ -386,14 +415,14 @@ Maximum number of iterations of the solver used for determination of Redundant constraints - Red. Max Iterations: + Redundant max. iterations: - + Same as 'Maximum iterations', but for redundant solving Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -422,12 +451,15 @@ If selected, the Maximum iterations value for the redundant algorithm is multiplied by the sketch size - Red. Sketch size multiplier: + Redundant sketch size multiplier: + + Same as 'Sketch size multiplier', but for redundant solving + Qt::RightToLeft @@ -452,12 +484,15 @@ Error threshold under which convergence is reached for the solving of redundant constraints - Red. Convergence + Redundant convergence + + Same as 'Convergence', but for redundant solving + 1E-10 @@ -479,7 +514,7 @@ - Red. Param1 + Redundant param1 @@ -503,7 +538,7 @@ - Red. Param2 + Redundant param2 @@ -527,7 +562,7 @@ - Red. Param3 + Redundant param3 @@ -554,12 +589,15 @@ Degree of verbosity of the debug output to the console - Console Debug mode: + Console debug mode: + + Verbosity of console output + 1