suzanne.soy/solvespace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rephrase error messages that say "select a workplane".

Browse Source 
This is confusing, as merely selecting one (and not activating it)
is not enough to satisfy any of the conditions leading to these
errors.
This commit is contained in:
whitequark 2016-10-11 13:46:05 +00:00
parent 456c987218
commit b10e621fce
5 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/clipboard.cpp
View File

@ -242,7 +242,7 @@ void GraphicsWindow::PasteClipboard(Vector trans, double theta, double scale) {
void GraphicsWindow::MenuClipboard(Command id) { void GraphicsWindow::MenuClipboard(Command id) {
if(id != Command::DELETE && !SS.GW.LockedInWorkplane()) { if(id != Command::DELETE && !SS.GW.LockedInWorkplane()) {
Error("Cut, paste, and copy work only in a workplane.\n\n" Error("Cut, paste, and copy work only in a workplane.\n\n"
"Select one with Sketch -> In Workplane."); "Activate one with Sketch -> In Workplane.");
return; return;
} }

5
src/constraint.cpp
View File

@ -422,7 +422,7 @@ void Constraint::MenuConstrain(Command id) {
// Horizontal / vertical symmetry, implicit symmetry plane // Horizontal / vertical symmetry, implicit symmetry plane
// normal to the workplane // normal to the workplane
if(c.workplane.v == Entity::FREE_IN_3D.v) { if(c.workplane.v == Entity::FREE_IN_3D.v) {
Error("Must be locked in to workplane when constraining " Error("A workplane must be active when constraining "
"symmetric without an explicit symmetry plane."); "symmetric without an explicit symmetry plane.");
return; return;
} }
@ -452,7 +452,8 @@ void Constraint::MenuConstrain(Command id) {
case Command::HORIZONTAL: { case Command::HORIZONTAL: {
hEntity ha, hb; hEntity ha, hb;
if(c.workplane.v == Entity::FREE_IN_3D.v) { if(c.workplane.v == Entity::FREE_IN_3D.v) {
Error("Select workplane before constraining horiz/vert."); Error("Activate a workplane (with Sketch -> In Workplane) before "
"applying a horizontal or vertical constraint.");
return; return;
} }
if(gs.lineSegments == 1 && gs.n == 1) { if(gs.lineSegments == 1 && gs.n == 1) {

5
src/graphicswin.cpp
View File

@ -902,8 +902,9 @@ void GraphicsWindow::MenuEdit(Command id) {
case Command::SNAP_TO_GRID: { case Command::SNAP_TO_GRID: {
if(!SS.GW.LockedInWorkplane()) { if(!SS.GW.LockedInWorkplane()) {
Error("No workplane is active. Select a workplane to define " Error("No workplane is active. Activate a workplane "
"the plane for the snap grid."); "(with Sketch -> In Workplane) to define the plane "
"for the snap grid.");
break; break;
} }
SS.GW.GroupSelection(); SS.GW.GroupSelection();

2
src/group.cpp
View File

@ -133,7 +133,7 @@ void Group::MenuGroup(Command id) {
case Command::GROUP_EXTRUDE: case Command::GROUP_EXTRUDE:
if(!SS.GW.LockedInWorkplane()) { if(!SS.GW.LockedInWorkplane()) {
Error("Select a workplane (Sketch -> In Workplane) before " Error("Activate a workplane (Sketch -> In Workplane) before "
"extruding. The sketch will be extruded normal to the " "extruding. The sketch will be extruded normal to the "
"workplane."); "workplane.");
return; return;

9
src/mouse.cpp
View File

@ -954,7 +954,8 @@ void GraphicsWindow::MouseLeftDown(double mx, double my) {
case Command::RECTANGLE: { case Command::RECTANGLE: {
if(!SS.GW.LockedInWorkplane()) { if(!SS.GW.LockedInWorkplane()) {
Error("Can't draw rectangle in 3d; select a workplane first."); Error("Can't draw rectangle in 3d; first, activate a workplane "
"with Sketch -> In Workplane.");
ClearSuper(); ClearSuper();
break; break;
} }
@ -1005,7 +1006,8 @@ void GraphicsWindow::MouseLeftDown(double mx, double my) {
case Command::ARC: { case Command::ARC: {
if(!SS.GW.LockedInWorkplane()) { if(!SS.GW.LockedInWorkplane()) {
Error("Can't draw arc in 3d; select a workplane first."); Error("Can't draw arc in 3d; first, activate a workplane "
"with Sketch -> In Workplane.");
ClearPending(); ClearPending();
break; break;
} }
@ -1058,7 +1060,8 @@ void GraphicsWindow::MouseLeftDown(double mx, double my) {
case Command::TTF_TEXT: { case Command::TTF_TEXT: {
if(!SS.GW.LockedInWorkplane()) { if(!SS.GW.LockedInWorkplane()) {
Error("Can't draw text in 3d; select a workplane first."); Error("Can't draw text in 3d; first, activate a workplane "
"with Sketch -> In Workplane.");
ClearSuper(); ClearSuper();
break; break;
} }