zcy
/
solvespace
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
solvespace/src/mouse.cpp

1579 lines
59 KiB
C++
Raw Normal View History

Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
//-----------------------------------------------------------------------------
// Anything relating to mouse, keyboard, or 6-DOF mouse input.
Changes in preparation for the release of SolveSpace under the GPL, to add that license, and change all copyright notices to me, not Useful Subset, LLC. [git-p4: depot-paths = "//depot/solvespace/": change = 2211]
2013-07-28 22:08:34 +00:00
//
// Copyright 2008-2013 Jonathan Westhues.
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
//-----------------------------------------------------------------------------
#include "solvespace.h"
void GraphicsWindow::UpdateDraggedPoint(hEntity hp, double mx, double my) {
Entity *p = SK.GetEntity(hp);
Vector pos = p->PointGetNum();
UpdateDraggedNum(&pos, mx, my);
p->PointForceTo(pos);
}
void GraphicsWindow::UpdateDraggedNum(Vector *pos, double mx, double my) {
*pos = pos->Plus(projRight.ScaledBy((mx - orig.mouse.x)/scale));
*pos = pos->Plus(projUp.ScaledBy((my - orig.mouse.y)/scale));
Remove arbitrary limits on the selection size, and permit more than one point to be dragged simultaneously. So now a dragged point drags all the selected points and entities, and a dragged entity drags its points (except for circles, which drag the radius). This means that the number of forced points for the solver must now be unlimited, and it is. Also add commands to invert the selection within the active group, and to select an edge chain starting from the current selection. And redo the context menus a bit; still not great, but less cluttered and more systematic. [git-p4: depot-paths = "//depot/solvespace/": change = 2064]
2009-11-03 18:54:49 +00:00
}
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
Remove arbitrary limits on the selection size, and permit more than one point to be dragged simultaneously. So now a dragged point drags all the selected points and entities, and a dragged entity drags its points (except for circles, which drag the radius). This means that the number of forced points for the solver must now be unlimited, and it is. Also add commands to invert the selection within the active group, and to select an edge chain starting from the current selection. And redo the context menus a bit; still not great, but less cluttered and more systematic. [git-p4: depot-paths = "//depot/solvespace/": change = 2064]
2009-11-03 18:54:49 +00:00
void GraphicsWindow::AddPointToDraggedList(hEntity hp) {
Entity *p = SK.GetEntity(hp);
// If an entity and its points are both selected, then its points could
// end up in the list twice. This would be bad, because it would move
// twice as far as the mouse pointer...
List<hEntity> *lhe = &(pending.points);
for(hEntity *hee = lhe->First(); hee; hee = lhe->NextAfter(hee)) {
Use the new equality/inequality operators of handles to reduce references to .v. NFC.
2019-07-09 14:44:57 +00:00
if(*hee == hp) {
Remove arbitrary limits on the selection size, and permit more than one point to be dragged simultaneously. So now a dragged point drags all the selected points and entities, and a dragged entity drags its points (except for circles, which drag the radius). This means that the number of forced points for the solver must now be unlimited, and it is. Also add commands to invert the selection within the active group, and to select an edge chain starting from the current selection. And redo the context menus a bit; still not great, but less cluttered and more systematic. [git-p4: depot-paths = "//depot/solvespace/": change = 2064]
2009-11-03 18:54:49 +00:00
// Exact same point.
return;
}
Entity *pe = SK.GetEntity(*hee);
if(pe->type == p->type &&
Convert all enumerations to use `enum class`. Specifically, take the old code that looks like this: class Foo { enum { X = 1, Y = 2 }; int kind; } ... foo.kind = Foo::X; ... and convert it to this: class Foo { enum class Kind : uint32_t { X = 1, Y = 2 }; Kind kind; } ... foo.kind = Foo::Kind::X; (In some cases the enumeration would not be in the class namespace, such as when it is generally useful.) The benefits are as follows: * The type of the field gives a clear indication of intent, both to humans and tools (such as binding generators). * The compiler is able to automatically warn when a switch is not exhaustive; but this is currently suppressed by the default: ssassert(false, ...) idiom. * Integers and plain enums are weakly type checked: they implicitly convert into each other. This can hide bugs where type conversion is performed but not intended. Enum classes are strongly type checked. * Plain enums pollute parent namespaces; enum classes do not. Almost every defined enum we have already has a kind of ad-hoc namespacing via `NAMESPACE_`, which is now explicit. * Plain enums do not have a well-defined ABI size, which is important for bindings. Enum classes can have it, if specified. We specify the base type for all enums as uint32_t, which is a safe choice and allows us to not change the numeric values of any variants. This commit introduces absolutely no functional change to the code, just renaming and change of types. It handles almost all cases, except GraphicsWindow::pending.operation, which needs minor functional change.
2016-05-20 08:31:20 +00:00
pe->type != Entity::Type::POINT_IN_2D &&
pe->type != Entity::Type::POINT_IN_3D &&
Use the new equality/inequality operators of handles to reduce references to .v. NFC.
2019-07-09 14:44:57 +00:00
pe->group == p->group)
Remove arbitrary limits on the selection size, and permit more than one point to be dragged simultaneously. So now a dragged point drags all the selected points and entities, and a dragged entity drags its points (except for circles, which drag the radius). This means that the number of forced points for the solver must now be unlimited, and it is. Also add commands to invert the selection within the active group, and to select an edge chain starting from the current selection. And redo the context menus a bit; still not great, but less cluttered and more systematic. [git-p4: depot-paths = "//depot/solvespace/": change = 2064]
2009-11-03 18:54:49 +00:00
{
// Transform-type point, from the same group. So it handles the
// same unknowns.
return;
}
}
pending.points.Add(&hp);
}
void GraphicsWindow::StartDraggingByEntity(hEntity he) {
Entity *e = SK.GetEntity(he);
if(e->IsPoint()) {
AddPointToDraggedList(e->h);
Convert all enumerations to use `enum class`. Specifically, take the old code that looks like this: class Foo { enum { X = 1, Y = 2 }; int kind; } ... foo.kind = Foo::X; ... and convert it to this: class Foo { enum class Kind : uint32_t { X = 1, Y = 2 }; Kind kind; } ... foo.kind = Foo::Kind::X; (In some cases the enumeration would not be in the class namespace, such as when it is generally useful.) The benefits are as follows: * The type of the field gives a clear indication of intent, both to humans and tools (such as binding generators). * The compiler is able to automatically warn when a switch is not exhaustive; but this is currently suppressed by the default: ssassert(false, ...) idiom. * Integers and plain enums are weakly type checked: they implicitly convert into each other. This can hide bugs where type conversion is performed but not intended. Enum classes are strongly type checked. * Plain enums pollute parent namespaces; enum classes do not. Almost every defined enum we have already has a kind of ad-hoc namespacing via `NAMESPACE_`, which is now explicit. * Plain enums do not have a well-defined ABI size, which is important for bindings. Enum classes can have it, if specified. We specify the base type for all enums as uint32_t, which is a safe choice and allows us to not change the numeric values of any variants. This commit introduces absolutely no functional change to the code, just renaming and change of types. It handles almost all cases, except GraphicsWindow::pending.operation, which needs minor functional change.
2016-05-20 08:31:20 +00:00
} else if(e->type == Entity::Type::LINE_SEGMENT ||
e->type == Entity::Type::ARC_OF_CIRCLE ||
e->type == Entity::Type::CUBIC ||
e->type == Entity::Type::CUBIC_PERIODIC ||
e->type == Entity::Type::CIRCLE ||
Implement an image request.
2016-11-29 16:49:20 +00:00
e->type == Entity::Type::TTF_TEXT ||
e->type == Entity::Type::IMAGE)
Remove arbitrary limits on the selection size, and permit more than one point to be dragged simultaneously. So now a dragged point drags all the selected points and entities, and a dragged entity drags its points (except for circles, which drag the radius). This means that the number of forced points for the solver must now be unlimited, and it is. Also add commands to invert the selection within the active group, and to select an edge chain starting from the current selection. And redo the context menus a bit; still not great, but less cluttered and more systematic. [git-p4: depot-paths = "//depot/solvespace/": change = 2064]
2009-11-03 18:54:49 +00:00
{
int pts;
Trim trailing whitespace.
2015-03-29 00:30:52 +00:00
EntReqTable::GetEntityInfo(e->type, e->extraPoints,
Remove arbitrary limits on the selection size, and permit more than one point to be dragged simultaneously. So now a dragged point drags all the selected points and entities, and a dragged entity drags its points (except for circles, which drag the radius). This means that the number of forced points for the solver must now be unlimited, and it is. Also add commands to invert the selection within the active group, and to select an edge chain starting from the current selection. And redo the context menus a bit; still not great, but less cluttered and more systematic. [git-p4: depot-paths = "//depot/solvespace/": change = 2064]
2009-11-03 18:54:49 +00:00
NULL, &pts, NULL, NULL);
for(int i = 0; i < pts; i++) {
AddPointToDraggedList(e->point[i]);
}
}
}
Rewrite declarations of form f(void) as f(). In C++ there is no difference and newly added functions are all declared as f(), so this brings back consistency.
2016-05-05 05:54:05 +00:00
void GraphicsWindow::StartDraggingBySelection() {
Remove arbitrary limits on the selection size, and permit more than one point to be dragged simultaneously. So now a dragged point drags all the selected points and entities, and a dragged entity drags its points (except for circles, which drag the radius). This means that the number of forced points for the solver must now be unlimited, and it is. Also add commands to invert the selection within the active group, and to select an edge chain starting from the current selection. And redo the context menus a bit; still not great, but less cluttered and more systematic. [git-p4: depot-paths = "//depot/solvespace/": change = 2064]
2009-11-03 18:54:49 +00:00
List<Selection> *ls = &(selection);
for(Selection *s = ls->First(); s; s = ls->NextAfter(s)) {
if(!s->entity.v) continue;
StartDraggingByEntity(s->entity);
}
// The user might select a point, and then click it again to start
// dragging; but the point just got unselected by that click. So drag
// the hovered item too, and they'll always have it.
Fix an occasional crash when starting to drag an entity.
2017-01-20 03:12:45 +00:00
if(hover.entity.v) {
hEntity dragEntity = ChooseFromHoverToDrag().entity;
Use the new equality/inequality operators of handles to reduce references to .v. NFC.
2019-07-09 14:44:57 +00:00
if(dragEntity != Entity::NO_ENTITY) {
Fix an occasional crash when starting to drag an entity.
2017-01-20 03:12:45 +00:00
StartDraggingByEntity(dragEntity);
}
}
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
}
void GraphicsWindow::MouseMoved(double x, double y, bool leftDown,
bool middleDown, bool rightDown, bool shiftDown, bool ctrlDown)
{
Implement a platform abstraction for windows. This commit removes a large amount of code partially duplicated between the text and the graphics windows, and opens the path to having more than one model window on screen at any given time, as well as simplifies platform work. This commit also adds complete support for High-DPI device pixel ratio. It adds support for font scale factor (a fractional factor on top of integral device pixel ratio) on the platform side, but not on the application side. This commit also adds error checking to all Windows API calls (within the abstracted code) and fixes a significant number of misuses and non-future-proof uses of Windows API. This commit also makes uses of Windows API idiomatic, e.g. using the built-in vertical scroll bar, native tooltips, control subclassing instead of hooks in the global dispatch loop, and so on. It reinstates tooltip support and removes menu-related hacks.
2018-07-12 19:29:44 +00:00
if(window->IsEditorVisible()) return;
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
if(context.active) return;
Add a screen to edit the view parameters; scale, translation, rotation. Also clean up the handling of units, by putting the conversion factors in only one place, and clean up the expression-parsing but removing all the copies of the same error message. [git-p4: depot-paths = "//depot/solvespace/": change = 2093]
2010-01-04 00:35:28 +00:00
SS.extraLine.draw = false;
Split cubic splines and periodic splines too; which is a pain, because it can't be C2 continuous after splitting (since I'm doing uniform splines only, and the parametrization changes). So just knock everything down to cubic Beziers. Also draw lines to indicate angle and origin when Ctrl+dragging to rotate in plane of screen. [git-p4: depot-paths = "//depot/solvespace/": change = 2075]
2009-11-10 03:57:24 +00:00
Add ability to set a background image. I import a png with libpng, load it as a texture, and show it instead of a flat-color background. Includes user interface to specify scale and translation of image, but the rotation is always aligned to the view. [git-p4: depot-paths = "//depot/solvespace/": change = 2071]
2009-11-08 01:11:38 +00:00
if(!orig.mouseDown) {
// If someone drags the mouse into our window with the left button
// already depressed, then we don't have our starting point; so
// don't try.
leftDown = false;
}
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
if(rightDown) {
middleDown = true;
shiftDown = !shiftDown;
}
if(SS.showToolbar) {
if(ToolbarMouseMoved((int)x, (int)y)) {
hover.Clear();
return;
}
}
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
if(!leftDown && (pending.operation == Pending::DRAGGING_POINTS ||
pending.operation == Pending::DRAGGING_MARQUEE))
Add marquee selection, a view-aligned rectangle such that everything even partially within that rectangle gets selected when I release. Also make deselecting a point deselect all coincident points too; otherwise there now exist ways to select both coincident points, which meant that it was impossible to deselect the lower one. And fix text window to show selection info even if just constraints are selected, seems more consistent. [git-p4: depot-paths = "//depot/solvespace/": change = 2066]
2009-11-04 07:52:58 +00:00
{
A monster change to add support for filled paths. This requires us to assemble Beziers into outer and inner loops, and find those loops made up of entities with filled styles. The open paths are maintained in a separate list, and we assemble as many closed paths as possible even when open paths exist. This changes many things. The coplanar check is now performed on the Beziers, not the resulting polygon. The way that the polygon is used to determine loop directions is also modified. Also fix the mouse behavior when dragging a point: drop it when the mouse is released, even if it is released outside the window, but don't drop it if the pointer is dragged out of and then back into our window. Also special-case SSurface::ClosestPointTo() for planes, for speed. [git-p4: depot-paths = "//depot/solvespace/": change = 2058]
2009-10-29 07:16:28 +00:00
ClearPending();
Implement a platform abstraction for windows. This commit removes a large amount of code partially duplicated between the text and the graphics windows, and opens the path to having more than one model window on screen at any given time, as well as simplifies platform work. This commit also adds complete support for High-DPI device pixel ratio. It adds support for font scale factor (a fractional factor on top of integral device pixel ratio) on the platform side, but not on the application side. This commit also adds error checking to all Windows API calls (within the abstracted code) and fixes a significant number of misuses and non-future-proof uses of Windows API. This commit also makes uses of Windows API idiomatic, e.g. using the built-in vertical scroll bar, native tooltips, control subclassing instead of hooks in the global dispatch loop, and so on. It reinstates tooltip support and removes menu-related hacks.
2018-07-12 19:29:44 +00:00
Invalidate();
A monster change to add support for filled paths. This requires us to assemble Beziers into outer and inner loops, and find those loops made up of entities with filled styles. The open paths are maintained in a separate list, and we assemble as many closed paths as possible even when open paths exist. This changes many things. The coplanar check is now performed on the Beziers, not the resulting polygon. The way that the polygon is used to determine loop directions is also modified. Also fix the mouse behavior when dragging a point: drop it when the mouse is released, even if it is released outside the window, but don't drop it if the pointer is dragged out of and then back into our window. Also special-case SSurface::ClosestPointTo() for planes, for speed. [git-p4: depot-paths = "//depot/solvespace/": change = 2058]
2009-10-29 07:16:28 +00:00
}
Add marquee selection, a view-aligned rectangle such that everything even partially within that rectangle gets selected when I release. Also make deselecting a point deselect all coincident points too; otherwise there now exist ways to select both coincident points, which meant that it was impossible to deselect the lower one. And fix text window to show selection info even if just constraints are selected, seems more consistent. [git-p4: depot-paths = "//depot/solvespace/": change = 2066]
2009-11-04 07:52:58 +00:00
Point2d mp = Point2d::From(x, y);
When curves to be split intersect at multiple points, don't just choose arbitrarily. Instead, split at the point closest to the mouse pointer. [git-p4: depot-paths = "//depot/solvespace/": change = 2170]
2010-07-12 06:47:14 +00:00
currentMousePosition = mp;
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
if(rightDown && orig.mouse.DistanceTo(mp) < 5 && !orig.startedMoving) {
// Avoid accidentally panning (or rotating if shift is down) if the
// user wants a context menu.
return;
}
orig.startedMoving = true;
// If the middle button is down, then mouse movement is used to pan and
// rotate our view. This wins over everything else.
if(middleDown) {
hover.Clear();
double dx = (x - orig.mouse.x) / scale;
double dy = (y - orig.mouse.y) / scale;
if(!(shiftDown || ctrlDown)) {
double s = 0.3*(PI/180)*scale; // degrees per pixel
Implement turntable (SketchUp-like) mouse navigation.
2016-12-29 14:34:30 +00:00
if(SS.turntableNav) { // lock the Z to vertical
projRight = orig.projRight.RotatedAbout(Vector::From(0, 0, 1), -s * dx);
projUp = orig.projUp.RotatedAbout(
Vector::From(orig.projRight.x, orig.projRight.y, orig.projRight.y), s * dy);
} else {
projRight = orig.projRight.RotatedAbout(orig.projUp, -s * dx);
projUp = orig.projUp.RotatedAbout(orig.projRight, s * dy);
}
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
NormalizeProjectionVectors();
} else if(ctrlDown) {
double theta = atan2(orig.mouse.y, orig.mouse.x);
theta -= atan2(y, x);
Add a screen to edit the view parameters; scale, translation, rotation. Also clean up the handling of units, by putting the conversion factors in only one place, and clean up the expression-parsing but removing all the copies of the same error message. [git-p4: depot-paths = "//depot/solvespace/": change = 2093]
2010-01-04 00:35:28 +00:00
SS.extraLine.draw = true;
SS.extraLine.ptA = UnProjectPoint(Point2d::From(0, 0));
SS.extraLine.ptB = UnProjectPoint(mp);
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
Vector normal = orig.projRight.Cross(orig.projUp);
projRight = orig.projRight.RotatedAbout(normal, theta);
projUp = orig.projUp.RotatedAbout(normal, theta);
NormalizeProjectionVectors();
} else {
offset.x = orig.offset.x + dx*projRight.x + dy*projUp.x;
offset.y = orig.offset.y + dx*projRight.y + dy*projUp.y;
offset.z = orig.offset.z + dx*projRight.z + dy*projUp.z;
}
orig.projRight = projRight;
orig.projUp = projUp;
orig.offset = offset;
orig.mouse.x = x;
orig.mouse.y = y;
Convert all enumerations to use `enum class`. Specifically, take the old code that looks like this: class Foo { enum { X = 1, Y = 2 }; int kind; } ... foo.kind = Foo::X; ... and convert it to this: class Foo { enum class Kind : uint32_t { X = 1, Y = 2 }; Kind kind; } ... foo.kind = Foo::Kind::X; (In some cases the enumeration would not be in the class namespace, such as when it is generally useful.) The benefits are as follows: * The type of the field gives a clear indication of intent, both to humans and tools (such as binding generators). * The compiler is able to automatically warn when a switch is not exhaustive; but this is currently suppressed by the default: ssassert(false, ...) idiom. * Integers and plain enums are weakly type checked: they implicitly convert into each other. This can hide bugs where type conversion is performed but not intended. Enum classes are strongly type checked. * Plain enums pollute parent namespaces; enum classes do not. Almost every defined enum we have already has a kind of ad-hoc namespacing via `NAMESPACE_`, which is now explicit. * Plain enums do not have a well-defined ABI size, which is important for bindings. Enum classes can have it, if specified. We specify the base type for all enums as uint32_t, which is a safe choice and allows us to not change the numeric values of any variants. This commit introduces absolutely no functional change to the code, just renaming and change of types. It handles almost all cases, except GraphicsWindow::pending.operation, which needs minor functional change.
2016-05-20 08:31:20 +00:00
if(SS.TW.shown.screen == TextWindow::Screen::EDIT_VIEW) {
Add a screen to edit the view parameters; scale, translation, rotation. Also clean up the handling of units, by putting the conversion factors in only one place, and clean up the expression-parsing but removing all the copies of the same error message. [git-p4: depot-paths = "//depot/solvespace/": change = 2093]
2010-01-04 00:35:28 +00:00
if(havePainted) {
Add a GTK2/3 port. In principle, GTK3 is the way forward, and GTK2 is officially deprecated, though still maintained. In practice however, GTK3 is often unbearably buggy; e.g. on my system, combo boxes don't ever roll up in GTK3 windows. So I have added support for both. This required a few minor changes to the core, namely: * GTK wants to know beforehand whether a menu item is a check menu item or a regular one. * GTK doesn't give us an easy way to execute something after any event is processed, so an explicit idle timer is added. This is a no-op on Win32. * A few function signatures were const'ed, since GTK expects immutable strings when converting to Glib::ustring.
2015-03-18 17:02:11 +00:00
SS.ScheduleShowTW();
Add a screen to edit the view parameters; scale, translation, rotation. Also clean up the handling of units, by putting the conversion factors in only one place, and clean up the expression-parsing but removing all the copies of the same error message. [git-p4: depot-paths = "//depot/solvespace/": change = 2093]
2010-01-04 00:35:28 +00:00
}
}
Implement a platform abstraction for windows. This commit removes a large amount of code partially duplicated between the text and the graphics windows, and opens the path to having more than one model window on screen at any given time, as well as simplifies platform work. This commit also adds complete support for High-DPI device pixel ratio. It adds support for font scale factor (a fractional factor on top of integral device pixel ratio) on the platform side, but not on the application side. This commit also adds error checking to all Windows API calls (within the abstracted code) and fixes a significant number of misuses and non-future-proof uses of Windows API. This commit also makes uses of Windows API idiomatic, e.g. using the built-in vertical scroll bar, native tooltips, control subclassing instead of hooks in the global dispatch loop, and so on. It reinstates tooltip support and removes menu-related hacks.
2018-07-12 19:29:44 +00:00
Invalidate();
Add a screen to edit the view parameters; scale, translation, rotation. Also clean up the handling of units, by putting the conversion factors in only one place, and clean up the expression-parsing but removing all the copies of the same error message. [git-p4: depot-paths = "//depot/solvespace/": change = 2093]
2010-01-04 00:35:28 +00:00
havePainted = false;
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
return;
}
Trim trailing whitespace.
2015-03-29 00:30:52 +00:00
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
if(pending.operation == Pending::NONE) {
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
double dm = orig.mouse.DistanceTo(mp);
// If we're currently not doing anything, then see if we should
// start dragging something.
if(leftDown && dm > 3) {
Add marquee selection, a view-aligned rectangle such that everything even partially within that rectangle gets selected when I release. Also make deselecting a point deselect all coincident points too; otherwise there now exist ways to select both coincident points, which meant that it was impossible to deselect the lower one. And fix text window to show selection info even if just constraints are selected, seems more consistent. [git-p4: depot-paths = "//depot/solvespace/": change = 2066]
2009-11-04 07:52:58 +00:00
Entity *e = NULL;
Select the appropriate entity when dragging a circle or a normal. This commit adds logic that was missed in 25631d4.
2017-01-20 02:56:35 +00:00
hEntity dragEntity = ChooseFromHoverToDrag().entity;
if(dragEntity.v) e = SK.GetEntity(dragEntity);
Convert all enumerations to use `enum class`. Specifically, take the old code that looks like this: class Foo { enum { X = 1, Y = 2 }; int kind; } ... foo.kind = Foo::X; ... and convert it to this: class Foo { enum class Kind : uint32_t { X = 1, Y = 2 }; Kind kind; } ... foo.kind = Foo::Kind::X; (In some cases the enumeration would not be in the class namespace, such as when it is generally useful.) The benefits are as follows: * The type of the field gives a clear indication of intent, both to humans and tools (such as binding generators). * The compiler is able to automatically warn when a switch is not exhaustive; but this is currently suppressed by the default: ssassert(false, ...) idiom. * Integers and plain enums are weakly type checked: they implicitly convert into each other. This can hide bugs where type conversion is performed but not intended. Enum classes are strongly type checked. * Plain enums pollute parent namespaces; enum classes do not. Almost every defined enum we have already has a kind of ad-hoc namespacing via `NAMESPACE_`, which is now explicit. * Plain enums do not have a well-defined ABI size, which is important for bindings. Enum classes can have it, if specified. We specify the base type for all enums as uint32_t, which is a safe choice and allows us to not change the numeric values of any variants. This commit introduces absolutely no functional change to the code, just renaming and change of types. It handles almost all cases, except GraphicsWindow::pending.operation, which needs minor functional change.
2016-05-20 08:31:20 +00:00
if(e && e->type != Entity::Type::WORKPLANE) {
Select the appropriate entity when dragging a circle or a normal. This commit adds logic that was missed in 25631d4.
2017-01-20 02:56:35 +00:00
Entity *e = SK.GetEntity(dragEntity);
Convert all enumerations to use `enum class`. Specifically, take the old code that looks like this: class Foo { enum { X = 1, Y = 2 }; int kind; } ... foo.kind = Foo::X; ... and convert it to this: class Foo { enum class Kind : uint32_t { X = 1, Y = 2 }; Kind kind; } ... foo.kind = Foo::Kind::X; (In some cases the enumeration would not be in the class namespace, such as when it is generally useful.) The benefits are as follows: * The type of the field gives a clear indication of intent, both to humans and tools (such as binding generators). * The compiler is able to automatically warn when a switch is not exhaustive; but this is currently suppressed by the default: ssassert(false, ...) idiom. * Integers and plain enums are weakly type checked: they implicitly convert into each other. This can hide bugs where type conversion is performed but not intended. Enum classes are strongly type checked. * Plain enums pollute parent namespaces; enum classes do not. Almost every defined enum we have already has a kind of ad-hoc namespacing via `NAMESPACE_`, which is now explicit. * Plain enums do not have a well-defined ABI size, which is important for bindings. Enum classes can have it, if specified. We specify the base type for all enums as uint32_t, which is a safe choice and allows us to not change the numeric values of any variants. This commit introduces absolutely no functional change to the code, just renaming and change of types. It handles almost all cases, except GraphicsWindow::pending.operation, which needs minor functional change.
2016-05-20 08:31:20 +00:00
if(e->type == Entity::Type::CIRCLE && selection.n <= 1) {
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
// Drag the radius.
ClearSelection();
Select the appropriate entity when dragging a circle or a normal. This commit adds logic that was missed in 25631d4.
2017-01-20 02:56:35 +00:00
pending.circle = dragEntity;
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
pending.operation = Pending::DRAGGING_RADIUS;
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
} else if(e->IsNormal()) {
ClearSelection();
Select the appropriate entity when dragging a circle or a normal. This commit adds logic that was missed in 25631d4.
2017-01-20 02:56:35 +00:00
pending.normal = dragEntity;
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
pending.operation = Pending::DRAGGING_NORMAL;
Remove arbitrary limits on the selection size, and permit more than one point to be dragged simultaneously. So now a dragged point drags all the selected points and entities, and a dragged entity drags its points (except for circles, which drag the radius). This means that the number of forced points for the solver must now be unlimited, and it is. Also add commands to invert the selection within the active group, and to select an edge chain starting from the current selection. And redo the context menus a bit; still not great, but less cluttered and more systematic. [git-p4: depot-paths = "//depot/solvespace/": change = 2064]
2009-11-03 18:54:49 +00:00
} else {
Remove the toggle semantics from all the selection stuff. Now left-clicking always selects, and there's a special context menu item to deselect. Also streamline the right-click behavior by making that select the hovered item, and making all the context menu items work on the selection. [git-p4: depot-paths = "//depot/solvespace/": change = 2091]
2010-01-03 10:26:15 +00:00
if(!hoverWasSelectedOnMousedown) {
// The user clicked an unselected entity, which
Tweak drag and selection behavior: selection is kept after dragging selected entities, but cleared after dragging an unselected entity. Marquee selection is select-only (not toggle), and "Select All" replaces "Invert Selection". Left-click on nothing will clear the selection. Also add context menu entries for cut, copy, and paste. [git-p4: depot-paths = "//depot/solvespace/": change = 2089]
2009-12-21 16:44:00 +00:00
// means they're dragging just the hovered thing,
// not the full selection. So clear all the selection
// except that entity.
ClearSelection();
Remove the toggle semantics from all the selection stuff. Now left-clicking always selects, and there's a special context menu item to deselect. Also streamline the right-click behavior by making that select the hovered item, and making all the context menu items work on the selection. [git-p4: depot-paths = "//depot/solvespace/": change = 2091]
2010-01-03 10:26:15 +00:00
MakeSelected(e->h);
Tweak drag and selection behavior: selection is kept after dragging selected entities, but cleared after dragging an unselected entity. Marquee selection is select-only (not toggle), and "Select All" replaces "Invert Selection". Left-click on nothing will clear the selection. Also add context menu entries for cut, copy, and paste. [git-p4: depot-paths = "//depot/solvespace/": change = 2089]
2009-12-21 16:44:00 +00:00
}
Remove arbitrary limits on the selection size, and permit more than one point to be dragged simultaneously. So now a dragged point drags all the selected points and entities, and a dragged entity drags its points (except for circles, which drag the radius). This means that the number of forced points for the solver must now be unlimited, and it is. Also add commands to invert the selection within the active group, and to select an edge chain starting from the current selection. And redo the context menus a bit; still not great, but less cluttered and more systematic. [git-p4: depot-paths = "//depot/solvespace/": change = 2064]
2009-11-03 18:54:49 +00:00
StartDraggingBySelection();
Remove the toggle semantics from all the selection stuff. Now left-clicking always selects, and there's a special context menu item to deselect. Also streamline the right-click behavior by making that select the hovered item, and making all the context menu items work on the selection. [git-p4: depot-paths = "//depot/solvespace/": change = 2091]
2010-01-03 10:26:15 +00:00
if(!hoverWasSelectedOnMousedown) {
// And then clear the selection again, since they
// probably didn't want that selected if they just
// were dragging it.
ClearSelection();
}
Remove arbitrary limits on the selection size, and permit more than one point to be dragged simultaneously. So now a dragged point drags all the selected points and entities, and a dragged entity drags its points (except for circles, which drag the radius). This means that the number of forced points for the solver must now be unlimited, and it is. Also add commands to invert the selection within the active group, and to select an edge chain starting from the current selection. And redo the context menus a bit; still not great, but less cluttered and more systematic. [git-p4: depot-paths = "//depot/solvespace/": change = 2064]
2009-11-03 18:54:49 +00:00
hover.Clear();
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
pending.operation = Pending::DRAGGING_POINTS;
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
}
Trim trailing whitespace.
2015-03-29 00:30:52 +00:00
} else if(hover.constraint.v &&
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
SK.GetConstraint(hover.constraint)->HasLabel())
{
ClearSelection();
pending.constraint = hover.constraint;
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
pending.operation = Pending::DRAGGING_CONSTRAINT;
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
}
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
if(pending.operation != Pending::NONE) {
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
// We just started a drag, so remember for the undo before
// the drag changes anything.
SS.UndoRemember();
Add marquee selection, a view-aligned rectangle such that everything even partially within that rectangle gets selected when I release. Also make deselecting a point deselect all coincident points too; otherwise there now exist ways to select both coincident points, which meant that it was impossible to deselect the lower one. And fix text window to show selection info even if just constraints are selected, seems more consistent. [git-p4: depot-paths = "//depot/solvespace/": change = 2066]
2009-11-04 07:52:58 +00:00
} else {
if(!hover.constraint.v) {
// That's just marquee selection, which should not cause
// an undo remember.
if(dm > 10) {
if(hover.entity.v) {
// Avoid accidentally selecting workplanes when
// starting drags.
Annotate constants passed as boolean function arguments. This is to ensure that: * it is clear, when looking at the point of usage, what is the purpose of "true" or "false"; * when refactoring, a simple search will bring up any places that need to be changed. Also, argument names were synchronized between declaration and implementation. As an exception, these are not annotated: * Printf(/*halfLine=*/), to avoid pointless churn.
2016-05-25 12:08:19 +00:00
MakeUnselected(hover.entity, /*coincidentPointTrick=*/false);
Add marquee selection, a view-aligned rectangle such that everything even partially within that rectangle gets selected when I release. Also make deselecting a point deselect all coincident points too; otherwise there now exist ways to select both coincident points, which meant that it was impossible to deselect the lower one. And fix text window to show selection info even if just constraints are selected, seems more consistent. [git-p4: depot-paths = "//depot/solvespace/": change = 2066]
2009-11-04 07:52:58 +00:00
hover.Clear();
}
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
pending.operation = Pending::DRAGGING_MARQUEE;
Add marquee selection, a view-aligned rectangle such that everything even partially within that rectangle gets selected when I release. Also make deselecting a point deselect all coincident points too; otherwise there now exist ways to select both coincident points, which meant that it was impossible to deselect the lower one. And fix text window to show selection info even if just constraints are selected, seems more consistent. [git-p4: depot-paths = "//depot/solvespace/": change = 2066]
2009-11-04 07:52:58 +00:00
orig.marqueePoint =
UnProjectPoint(orig.mouseOnButtonDown);
}
}
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
}
} else {
// Otherwise, just hit test and give up; but don't hit test
// if the mouse is down, because then the user could hover
// a point, mouse down (thus selecting it), and drag, in an
// effort to drag the point, but instead hover a different
// entity before we move far enough to start the drag.
Don't perform hit testing if we haven't painted the graphics window. This change is quite subtle. The goal is to improve responsiveness of highlighting even further. To understand this change you need to keep in mind that Windows and Gtk have dramatically different behavior for paint (WM_PAINT in Windows, expose in Gtk) and mouse move events. In Windows, WM_PAINT and WM_MOUSEMOVE, unless sent explicitly, are synthesized: WM_MOUSEMOVE is delivered when there are no other messages and the current cursor position doesn't match the remembered one, and WM_PAINT is delivered when there are no other messages, even WM_MOUSEMOVE. This is pretty clever because it doesn't swamp programs that are slow to process either of those events with even more of them, ensuring they remain responsive. In Gtk, expose events are delivered at the end of the frame whenever there is an invalid view, and every single mouse move that happened will result in a separate event. If mouse move events are handled quickly, then the behavior is identical in either case: * process mouse move event * perform hit testing * invalidate view * no more events to process! * there are invalid views * repaint If, however, mouse move events are handled slower, then the behavior diverges. With Gtk: * process mouse move event * perform hit testing (slow) * while this happens, ten more mouse move events are added * invalidate view * end of frame! * there are invalid views * repaint * process mouse move event... As a result, the Gtk-hosted UI hopelessly lags behind user input. This is very irritating. With Windows: * process mouse move event * perform hit testing (slow) * while this happens, mouse was moved * invalidate view * process mouse move event... As a result, the Windows-hosted UI never repaints while the mouse is moved. This is also very irritating. Commit HEAD^ has fixed the problems with Gtk-based UI by making hit testing so fast that mouse move events never quite overflow the queue. There's still a barely noticeable lag but it's better. However, the problems with Windows remained because while the queue doesn't *overflow* with the faster hit testing code, it doesn't go *empty* either! Thus we still don't repaint. This commit builds on top of HEAD^ and makes it so that we don't actually hit test anything if we haven't painted the result of the previous hit test already. This fixes the problem on Windows but also helps Gtk a little bit. Curiously, the Cocoa-based UI never suffered from any of these problems. To my understanding (it's somewhat underdocumented), it processes mouse moves like Windows, but paints like Gtk.
2016-03-06 10:55:02 +00:00
if(!leftDown) {
// Hit testing can potentially take a lot of time.
// If we haven't painted since last time we highlighted
// something, don't hit test again, since this just causes
// a lag.
if(!havePainted) return;
HitTestMakeSelection(mp);
}
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
}
return;
}
// If the user has started an operation from the menu, but not
// completed it, then just do the selection.
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
if(pending.operation == Pending::COMMAND) {
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
HitTestMakeSelection(mp);
return;
}
// We're currently dragging something; so do that. But if we haven't
// painted since the last time we solved, do nothing, because there's
// no sense solving a frame and not displaying it.
Split cubic splines and periodic splines too; which is a pain, because it can't be C2 continuous after splitting (since I'm doing uniform splines only, and the parametrization changes). So just knock everything down to cubic Beziers. Also draw lines to indicate angle and origin when Ctrl+dragging to rotate in plane of screen. [git-p4: depot-paths = "//depot/solvespace/": change = 2075]
2009-11-10 03:57:24 +00:00
if(!havePainted) {
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
if(pending.operation == Pending::DRAGGING_POINTS && ctrlDown) {
Add a screen to edit the view parameters; scale, translation, rotation. Also clean up the handling of units, by putting the conversion factors in only one place, and clean up the expression-parsing but removing all the copies of the same error message. [git-p4: depot-paths = "//depot/solvespace/": change = 2093]
2010-01-04 00:35:28 +00:00
SS.extraLine.ptA = UnProjectPoint(orig.mouseOnButtonDown);
SS.extraLine.ptB = UnProjectPoint(mp);
SS.extraLine.draw = true;
Split cubic splines and periodic splines too; which is a pain, because it can't be C2 continuous after splitting (since I'm doing uniform splines only, and the parametrization changes). So just knock everything down to cubic Beziers. Also draw lines to indicate angle and origin when Ctrl+dragging to rotate in plane of screen. [git-p4: depot-paths = "//depot/solvespace/": change = 2075]
2009-11-10 03:57:24 +00:00
}
return;
}
Don't perform hit testing if we haven't painted the graphics window. This change is quite subtle. The goal is to improve responsiveness of highlighting even further. To understand this change you need to keep in mind that Windows and Gtk have dramatically different behavior for paint (WM_PAINT in Windows, expose in Gtk) and mouse move events. In Windows, WM_PAINT and WM_MOUSEMOVE, unless sent explicitly, are synthesized: WM_MOUSEMOVE is delivered when there are no other messages and the current cursor position doesn't match the remembered one, and WM_PAINT is delivered when there are no other messages, even WM_MOUSEMOVE. This is pretty clever because it doesn't swamp programs that are slow to process either of those events with even more of them, ensuring they remain responsive. In Gtk, expose events are delivered at the end of the frame whenever there is an invalid view, and every single mouse move that happened will result in a separate event. If mouse move events are handled quickly, then the behavior is identical in either case: * process mouse move event * perform hit testing * invalidate view * no more events to process! * there are invalid views * repaint If, however, mouse move events are handled slower, then the behavior diverges. With Gtk: * process mouse move event * perform hit testing (slow) * while this happens, ten more mouse move events are added * invalidate view * end of frame! * there are invalid views * repaint * process mouse move event... As a result, the Gtk-hosted UI hopelessly lags behind user input. This is very irritating. With Windows: * process mouse move event * perform hit testing (slow) * while this happens, mouse was moved * invalidate view * process mouse move event... As a result, the Windows-hosted UI never repaints while the mouse is moved. This is also very irritating. Commit HEAD^ has fixed the problems with Gtk-based UI by making hit testing so fast that mouse move events never quite overflow the queue. There's still a barely noticeable lag but it's better. However, the problems with Windows remained because while the queue doesn't *overflow* with the faster hit testing code, it doesn't go *empty* either! Thus we still don't repaint. This commit builds on top of HEAD^ and makes it so that we don't actually hit test anything if we haven't painted the result of the previous hit test already. This fixes the problem on Windows but also helps Gtk a little bit. Curiously, the Cocoa-based UI never suffered from any of these problems. To my understanding (it's somewhat underdocumented), it processes mouse moves like Windows, but paints like Gtk.
2016-03-06 10:55:02 +00:00
havePainted = false;
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
switch(pending.operation) {
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
case Pending::DRAGGING_CONSTRAINT: {
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
Constraint *c = SK.constraint.FindById(pending.constraint);
UpdateDraggedNum(&(c->disp.offset), x, y);
Remove arbitrary limits on the selection size, and permit more than one point to be dragged simultaneously. So now a dragged point drags all the selected points and entities, and a dragged entity drags its points (except for circles, which drag the radius). This means that the number of forced points for the solver must now be unlimited, and it is. Also add commands to invert the selection within the active group, and to select an edge chain starting from the current selection. And redo the context menus a bit; still not great, but less cluttered and more systematic. [git-p4: depot-paths = "//depot/solvespace/": change = 2064]
2009-11-03 18:54:49 +00:00
orig.mouse = mp;
Implement a platform abstraction for windows. This commit removes a large amount of code partially duplicated between the text and the graphics windows, and opens the path to having more than one model window on screen at any given time, as well as simplifies platform work. This commit also adds complete support for High-DPI device pixel ratio. It adds support for font scale factor (a fractional factor on top of integral device pixel ratio) on the platform side, but not on the application side. This commit also adds error checking to all Windows API calls (within the abstracted code) and fixes a significant number of misuses and non-future-proof uses of Windows API. This commit also makes uses of Windows API idiomatic, e.g. using the built-in vertical scroll bar, native tooltips, control subclassing instead of hooks in the global dispatch loop, and so on. It reinstates tooltip support and removes menu-related hacks.
2018-07-12 19:29:44 +00:00
Invalidate();
Enable exhaustive switch coverage warnings as an error, and use them. Specifically, this enables -Wswitch=error on GCC/Clang and its MSVC equivalent; the exact way it is handled varies slightly, but what they all have in common is that in a switch statement over an enumeration, any enumerand that is not explicitly (via case:) or implicitly (via default:) handled in the switch triggers an error. Moreover, we also change the switch statements in three ways: * Switch statements that ought to be extended every time a new enumerand is added (e.g. Entity::DrawOrGetDistance(), are changed to explicitly list every single enumerand, and not have a default: branch. Note that the assertions are kept because it is legal for a enumeration to have a value unlike any of its defined enumerands, and we can e.g. read garbage from a file, or an uninitialized variable. This requires some rearranging if a default: branch is undesired. * Switch statements that ought to only ever see a few select enumerands, are changed to always assert in the default: branch. * Switch statements that do something meaningful for a few enumerands, and ignore everything else, are changed to do nothing in a default: branch, under the assumption that changing them every time an enumerand is added or removed would just result in noise and catch no bugs. This commit also removes the {Request,Entity,Constraint}::UNKNOWN and Entity::DATUM_POINT enumerands, as those were just fancy names for zeroes. They mess up switch exhaustiveness checks and most of the time were not the best way to implement what they did anyway.
2016-05-25 06:55:50 +00:00
return;
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
}
Remove arbitrary limits on the selection size, and permit more than one point to be dragged simultaneously. So now a dragged point drags all the selected points and entities, and a dragged entity drags its points (except for circles, which drag the radius). This means that the number of forced points for the solver must now be unlimited, and it is. Also add commands to invert the selection within the active group, and to select an edge chain starting from the current selection. And redo the context menus a bit; still not great, but less cluttered and more systematic. [git-p4: depot-paths = "//depot/solvespace/": change = 2064]
2009-11-03 18:54:49 +00:00
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
case Pending::DRAGGING_NEW_LINE_POINT:
Disable autoconstrainer while Ctrl is held.
2016-04-02 08:29:32 +00:00
if(!ctrlDown) {
Enable exhaustive switch coverage warnings as an error, and use them. Specifically, this enables -Wswitch=error on GCC/Clang and its MSVC equivalent; the exact way it is handled varies slightly, but what they all have in common is that in a switch statement over an enumeration, any enumerand that is not explicitly (via case:) or implicitly (via default:) handled in the switch triggers an error. Moreover, we also change the switch statements in three ways: * Switch statements that ought to be extended every time a new enumerand is added (e.g. Entity::DrawOrGetDistance(), are changed to explicitly list every single enumerand, and not have a default: branch. Note that the assertions are kept because it is legal for a enumeration to have a value unlike any of its defined enumerands, and we can e.g. read garbage from a file, or an uninitialized variable. This requires some rearranging if a default: branch is undesired. * Switch statements that ought to only ever see a few select enumerands, are changed to always assert in the default: branch. * Switch statements that do something meaningful for a few enumerands, and ignore everything else, are changed to do nothing in a default: branch, under the assumption that changing them every time an enumerand is added or removed would just result in noise and catch no bugs. This commit also removes the {Request,Entity,Constraint}::UNKNOWN and Entity::DATUM_POINT enumerands, as those were just fancy names for zeroes. They mess up switch exhaustiveness checks and most of the time were not the best way to implement what they did anyway.
2016-05-25 06:55:50 +00:00
SS.GW.pending.hasSuggestion =
SS.GW.SuggestLineConstraint(SS.GW.pending.request, &SS.GW.pending.suggestion);
Disable autoconstrainer while Ctrl is held.
2016-04-02 08:29:32 +00:00
} else {
Enable exhaustive switch coverage warnings as an error, and use them. Specifically, this enables -Wswitch=error on GCC/Clang and its MSVC equivalent; the exact way it is handled varies slightly, but what they all have in common is that in a switch statement over an enumeration, any enumerand that is not explicitly (via case:) or implicitly (via default:) handled in the switch triggers an error. Moreover, we also change the switch statements in three ways: * Switch statements that ought to be extended every time a new enumerand is added (e.g. Entity::DrawOrGetDistance(), are changed to explicitly list every single enumerand, and not have a default: branch. Note that the assertions are kept because it is legal for a enumeration to have a value unlike any of its defined enumerands, and we can e.g. read garbage from a file, or an uninitialized variable. This requires some rearranging if a default: branch is undesired. * Switch statements that ought to only ever see a few select enumerands, are changed to always assert in the default: branch. * Switch statements that do something meaningful for a few enumerands, and ignore everything else, are changed to do nothing in a default: branch, under the assumption that changing them every time an enumerand is added or removed would just result in noise and catch no bugs. This commit also removes the {Request,Entity,Constraint}::UNKNOWN and Entity::DATUM_POINT enumerands, as those were just fancy names for zeroes. They mess up switch exhaustiveness checks and most of the time were not the best way to implement what they did anyway.
2016-05-25 06:55:50 +00:00
SS.GW.pending.hasSuggestion = false;
Disable autoconstrainer while Ctrl is held.
2016-04-02 08:29:32 +00:00
}
Silence some gcc 7 warnings. * Mark switch fallthrough (-Wfallthrough); * Initialize variables to avoid false positives (-Wmaybe-uninitialized); * Fudge indentation to avoid false positives (-Wmisleading-indentation).
2019-03-28 09:39:03 +00:00
// fallthrough
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
case Pending::DRAGGING_NEW_POINT:
Remove arbitrary limits on the selection size, and permit more than one point to be dragged simultaneously. So now a dragged point drags all the selected points and entities, and a dragged entity drags its points (except for circles, which drag the radius). This means that the number of forced points for the solver must now be unlimited, and it is. Also add commands to invert the selection within the active group, and to select an edge chain starting from the current selection. And redo the context menus a bit; still not great, but less cluttered and more systematic. [git-p4: depot-paths = "//depot/solvespace/": change = 2064]
2009-11-03 18:54:49 +00:00
UpdateDraggedPoint(pending.point, x, y);
HitTestMakeSelection(mp);
SS.MarkGroupDirtyByEntity(pending.point);
orig.mouse = mp;
Implement a platform abstraction for windows. This commit removes a large amount of code partially duplicated between the text and the graphics windows, and opens the path to having more than one model window on screen at any given time, as well as simplifies platform work. This commit also adds complete support for High-DPI device pixel ratio. It adds support for font scale factor (a fractional factor on top of integral device pixel ratio) on the platform side, but not on the application side. This commit also adds error checking to all Windows API calls (within the abstracted code) and fixes a significant number of misuses and non-future-proof uses of Windows API. This commit also makes uses of Windows API idiomatic, e.g. using the built-in vertical scroll bar, native tooltips, control subclassing instead of hooks in the global dispatch loop, and so on. It reinstates tooltip support and removes menu-related hacks.
2018-07-12 19:29:44 +00:00
Invalidate();
Remove arbitrary limits on the selection size, and permit more than one point to be dragged simultaneously. So now a dragged point drags all the selected points and entities, and a dragged entity drags its points (except for circles, which drag the radius). This means that the number of forced points for the solver must now be unlimited, and it is. Also add commands to invert the selection within the active group, and to select an edge chain starting from the current selection. And redo the context menus a bit; still not great, but less cluttered and more systematic. [git-p4: depot-paths = "//depot/solvespace/": change = 2064]
2009-11-03 18:54:49 +00:00
break;
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
case Pending::DRAGGING_POINTS:
Remove arbitrary limits on the selection size, and permit more than one point to be dragged simultaneously. So now a dragged point drags all the selected points and entities, and a dragged entity drags its points (except for circles, which drag the radius). This means that the number of forced points for the solver must now be unlimited, and it is. Also add commands to invert the selection within the active group, and to select an edge chain starting from the current selection. And redo the context menus a bit; still not great, but less cluttered and more systematic. [git-p4: depot-paths = "//depot/solvespace/": change = 2064]
2009-11-03 18:54:49 +00:00
if(shiftDown || ctrlDown) {
// Edit the rotation associated with a POINT_N_ROT_TRANS,
// either within (ctrlDown) or out of (shiftDown) the plane
// of the screen. So first get the rotation to apply, in qt.
Quaternion qt;
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
if(ctrlDown) {
Remove arbitrary limits on the selection size, and permit more than one point to be dragged simultaneously. So now a dragged point drags all the selected points and entities, and a dragged entity drags its points (except for circles, which drag the radius). This means that the number of forced points for the solver must now be unlimited, and it is. Also add commands to invert the selection within the active group, and to select an edge chain starting from the current selection. And redo the context menus a bit; still not great, but less cluttered and more systematic. [git-p4: depot-paths = "//depot/solvespace/": change = 2064]
2009-11-03 18:54:49 +00:00
double d = mp.DistanceTo(orig.mouseOnButtonDown);
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
if(d < 25) {
// Don't start dragging the position about the normal
// until we're a little ways out, to get a reasonable
// reference pos
orig.mouse = mp;
break;
}
Remove arbitrary limits on the selection size, and permit more than one point to be dragged simultaneously. So now a dragged point drags all the selected points and entities, and a dragged entity drags its points (except for circles, which drag the radius). This means that the number of forced points for the solver must now be unlimited, and it is. Also add commands to invert the selection within the active group, and to select an edge chain starting from the current selection. And redo the context menus a bit; still not great, but less cluttered and more systematic. [git-p4: depot-paths = "//depot/solvespace/": change = 2064]
2009-11-03 18:54:49 +00:00
double theta = atan2(orig.mouse.y-orig.mouseOnButtonDown.y,
orig.mouse.x-orig.mouseOnButtonDown.x);
theta -= atan2(y-orig.mouseOnButtonDown.y,
x-orig.mouseOnButtonDown.x);
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
Vector gn = projRight.Cross(projUp);
Remove arbitrary limits on the selection size, and permit more than one point to be dragged simultaneously. So now a dragged point drags all the selected points and entities, and a dragged entity drags its points (except for circles, which drag the radius). This means that the number of forced points for the solver must now be unlimited, and it is. Also add commands to invert the selection within the active group, and to select an edge chain starting from the current selection. And redo the context menus a bit; still not great, but less cluttered and more systematic. [git-p4: depot-paths = "//depot/solvespace/": change = 2064]
2009-11-03 18:54:49 +00:00
qt = Quaternion::From(gn, -theta);
Split cubic splines and periodic splines too; which is a pain, because it can't be C2 continuous after splitting (since I'm doing uniform splines only, and the parametrization changes). So just knock everything down to cubic Beziers. Also draw lines to indicate angle and origin when Ctrl+dragging to rotate in plane of screen. [git-p4: depot-paths = "//depot/solvespace/": change = 2075]
2009-11-10 03:57:24 +00:00
Add a screen to edit the view parameters; scale, translation, rotation. Also clean up the handling of units, by putting the conversion factors in only one place, and clean up the expression-parsing but removing all the copies of the same error message. [git-p4: depot-paths = "//depot/solvespace/": change = 2093]
2010-01-04 00:35:28 +00:00
SS.extraLine.draw = true;
SS.extraLine.ptA = UnProjectPoint(orig.mouseOnButtonDown);
SS.extraLine.ptB = UnProjectPoint(mp);
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
} else {
double dx = -(x - orig.mouse.x);
double dy = -(y - orig.mouse.y);
double s = 0.3*(PI/180); // degrees per pixel
Remove arbitrary limits on the selection size, and permit more than one point to be dragged simultaneously. So now a dragged point drags all the selected points and entities, and a dragged entity drags its points (except for circles, which drag the radius). This means that the number of forced points for the solver must now be unlimited, and it is. Also add commands to invert the selection within the active group, and to select an edge chain starting from the current selection. And redo the context menus a bit; still not great, but less cluttered and more systematic. [git-p4: depot-paths = "//depot/solvespace/": change = 2064]
2009-11-03 18:54:49 +00:00
qt = Quaternion::From(projUp, -s*dx).Times(
Quaternion::From(projRight, s*dy));
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
}
orig.mouse = mp;
Remove arbitrary limits on the selection size, and permit more than one point to be dragged simultaneously. So now a dragged point drags all the selected points and entities, and a dragged entity drags its points (except for circles, which drag the radius). This means that the number of forced points for the solver must now be unlimited, and it is. Also add commands to invert the selection within the active group, and to select an edge chain starting from the current selection. And redo the context menus a bit; still not great, but less cluttered and more systematic. [git-p4: depot-paths = "//depot/solvespace/": change = 2064]
2009-11-03 18:54:49 +00:00
// Now apply this rotation to the points being dragged.
List<hEntity> *lhe = &(pending.points);
for(hEntity *he = lhe->First(); he; he = lhe->NextAfter(he)) {
Entity *e = SK.GetEntity(*he);
Convert all enumerations to use `enum class`. Specifically, take the old code that looks like this: class Foo { enum { X = 1, Y = 2 }; int kind; } ... foo.kind = Foo::X; ... and convert it to this: class Foo { enum class Kind : uint32_t { X = 1, Y = 2 }; Kind kind; } ... foo.kind = Foo::Kind::X; (In some cases the enumeration would not be in the class namespace, such as when it is generally useful.) The benefits are as follows: * The type of the field gives a clear indication of intent, both to humans and tools (such as binding generators). * The compiler is able to automatically warn when a switch is not exhaustive; but this is currently suppressed by the default: ssassert(false, ...) idiom. * Integers and plain enums are weakly type checked: they implicitly convert into each other. This can hide bugs where type conversion is performed but not intended. Enum classes are strongly type checked. * Plain enums pollute parent namespaces; enum classes do not. Almost every defined enum we have already has a kind of ad-hoc namespacing via `NAMESPACE_`, which is now explicit. * Plain enums do not have a well-defined ABI size, which is important for bindings. Enum classes can have it, if specified. We specify the base type for all enums as uint32_t, which is a safe choice and allows us to not change the numeric values of any variants. This commit introduces absolutely no functional change to the code, just renaming and change of types. It handles almost all cases, except GraphicsWindow::pending.operation, which needs minor functional change.
2016-05-20 08:31:20 +00:00
if(e->type != Entity::Type::POINT_N_ROT_TRANS) {
Split cubic splines and periodic splines too; which is a pain, because it can't be C2 continuous after splitting (since I'm doing uniform splines only, and the parametrization changes). So just knock everything down to cubic Beziers. Also draw lines to indicate angle and origin when Ctrl+dragging to rotate in plane of screen. [git-p4: depot-paths = "//depot/solvespace/": change = 2075]
2009-11-10 03:57:24 +00:00
if(ctrlDown) {
Vector p = e->PointGetNum();
Add a screen to edit the view parameters; scale, translation, rotation. Also clean up the handling of units, by putting the conversion factors in only one place, and clean up the expression-parsing but removing all the copies of the same error message. [git-p4: depot-paths = "//depot/solvespace/": change = 2093]
2010-01-04 00:35:28 +00:00
p = p.Minus(SS.extraLine.ptA);
Split cubic splines and periodic splines too; which is a pain, because it can't be C2 continuous after splitting (since I'm doing uniform splines only, and the parametrization changes). So just knock everything down to cubic Beziers. Also draw lines to indicate angle and origin when Ctrl+dragging to rotate in plane of screen. [git-p4: depot-paths = "//depot/solvespace/": change = 2075]
2009-11-10 03:57:24 +00:00
p = qt.Rotate(p);
Add a screen to edit the view parameters; scale, translation, rotation. Also clean up the handling of units, by putting the conversion factors in only one place, and clean up the expression-parsing but removing all the copies of the same error message. [git-p4: depot-paths = "//depot/solvespace/": change = 2093]
2010-01-04 00:35:28 +00:00
p = p.Plus(SS.extraLine.ptA);
Split cubic splines and periodic splines too; which is a pain, because it can't be C2 continuous after splitting (since I'm doing uniform splines only, and the parametrization changes). So just knock everything down to cubic Beziers. Also draw lines to indicate angle and origin when Ctrl+dragging to rotate in plane of screen. [git-p4: depot-paths = "//depot/solvespace/": change = 2075]
2009-11-10 03:57:24 +00:00
e->PointForceTo(p);
SS.MarkGroupDirtyByEntity(e->h);
}
continue;
}
Remove arbitrary limits on the selection size, and permit more than one point to be dragged simultaneously. So now a dragged point drags all the selected points and entities, and a dragged entity drags its points (except for circles, which drag the radius). This means that the number of forced points for the solver must now be unlimited, and it is. Also add commands to invert the selection within the active group, and to select an edge chain starting from the current selection. And redo the context menus a bit; still not great, but less cluttered and more systematic. [git-p4: depot-paths = "//depot/solvespace/": change = 2064]
2009-11-03 18:54:49 +00:00
Quaternion q = e->PointGetQuaternion();
Vector p = e->PointGetNum();
q = qt.Times(q);
e->PointForceQuaternionTo(q);
// Let's rotate about the selected point; so fix up the
// translation so that that point didn't move.
e->PointForceTo(p);
SS.MarkGroupDirtyByEntity(e->h);
}
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
} else {
Remove arbitrary limits on the selection size, and permit more than one point to be dragged simultaneously. So now a dragged point drags all the selected points and entities, and a dragged entity drags its points (except for circles, which drag the radius). This means that the number of forced points for the solver must now be unlimited, and it is. Also add commands to invert the selection within the active group, and to select an edge chain starting from the current selection. And redo the context menus a bit; still not great, but less cluttered and more systematic. [git-p4: depot-paths = "//depot/solvespace/": change = 2064]
2009-11-03 18:54:49 +00:00
List<hEntity> *lhe = &(pending.points);
for(hEntity *he = lhe->First(); he; he = lhe->NextAfter(he)) {
UpdateDraggedPoint(*he, x, y);
SS.MarkGroupDirtyByEntity(*he);
}
orig.mouse = mp;
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
}
break;
Remove arbitrary limits on the selection size, and permit more than one point to be dragged simultaneously. So now a dragged point drags all the selected points and entities, and a dragged entity drags its points (except for circles, which drag the radius). This means that the number of forced points for the solver must now be unlimited, and it is. Also add commands to invert the selection within the active group, and to select an edge chain starting from the current selection. And redo the context menus a bit; still not great, but less cluttered and more systematic. [git-p4: depot-paths = "//depot/solvespace/": change = 2064]
2009-11-03 18:54:49 +00:00
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
case Pending::DRAGGING_NEW_CUBIC_POINT: {
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
UpdateDraggedPoint(pending.point, x, y);
HitTestMakeSelection(mp);
hRequest hr = pending.point.request();
Use the new equality/inequality operators of handles to reduce references to .v. NFC.
2019-07-09 14:44:57 +00:00
if(pending.point == hr.entity(4)) {
Add interpolating splines: both periodic splines (that form a loop), and open-ended splines, with their tangents specified at their endpoints. Also change constraint solver matrix size to 1024, on the theory that a power of two will generate better array indexing, and replace fabs() with my own function that for some reason is faster. [git-p4: depot-paths = "//depot/solvespace/": change = 2055]
2009-10-21 04:46:01 +00:00
// The very first segment; dragging final point drags both
// tangent points.
Vector p0 = SK.GetEntity(hr.entity(1))->PointGetNum(),
p3 = SK.GetEntity(hr.entity(4))->PointGetNum(),
p1 = p0.ScaledBy(2.0/3).Plus(p3.ScaledBy(1.0/3)),
p2 = p0.ScaledBy(1.0/3).Plus(p3.ScaledBy(2.0/3));
SK.GetEntity(hr.entity(1+1))->PointForceTo(p1);
SK.GetEntity(hr.entity(1+2))->PointForceTo(p2);
} else {
// A subsequent segment; dragging point drags only final
// tangent point.
int i = SK.GetEntity(hr.entity(0))->extraPoints;
Vector pn = SK.GetEntity(hr.entity(4+i))->PointGetNum(),
pnm2 = SK.GetEntity(hr.entity(2+i))->PointGetNum(),
pnm1 = (pn.Plus(pnm2)).ScaledBy(0.5);
SK.GetEntity(hr.entity(3+i))->PointForceTo(pnm1);
}
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
Remove arbitrary limits on the selection size, and permit more than one point to be dragged simultaneously. So now a dragged point drags all the selected points and entities, and a dragged entity drags its points (except for circles, which drag the radius). This means that the number of forced points for the solver must now be unlimited, and it is. Also add commands to invert the selection within the active group, and to select an edge chain starting from the current selection. And redo the context menus a bit; still not great, but less cluttered and more systematic. [git-p4: depot-paths = "//depot/solvespace/": change = 2064]
2009-11-03 18:54:49 +00:00
orig.mouse = mp;
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
SS.MarkGroupDirtyByEntity(pending.point);
break;
}
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
case Pending::DRAGGING_NEW_ARC_POINT: {
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
UpdateDraggedPoint(pending.point, x, y);
HitTestMakeSelection(mp);
hRequest hr = pending.point.request();
Vector ona = SK.GetEntity(hr.entity(2))->PointGetNum();
Vector onb = SK.GetEntity(hr.entity(3))->PointGetNum();
Vector center = (ona.Plus(onb)).ScaledBy(0.5);
SK.GetEntity(hr.entity(1))->PointForceTo(center);
Remove arbitrary limits on the selection size, and permit more than one point to be dragged simultaneously. So now a dragged point drags all the selected points and entities, and a dragged entity drags its points (except for circles, which drag the radius). This means that the number of forced points for the solver must now be unlimited, and it is. Also add commands to invert the selection within the active group, and to select an edge chain starting from the current selection. And redo the context menus a bit; still not great, but less cluttered and more systematic. [git-p4: depot-paths = "//depot/solvespace/": change = 2064]
2009-11-03 18:54:49 +00:00
orig.mouse = mp;
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
SS.MarkGroupDirtyByEntity(pending.point);
break;
}
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
case Pending::DRAGGING_NEW_RADIUS:
case Pending::DRAGGING_RADIUS: {
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
Entity *circle = SK.GetEntity(pending.circle);
Vector center = SK.GetEntity(circle->point[0])->PointGetNum();
Point2d c2 = ProjectPoint(center);
double r = c2.DistanceTo(mp)/scale;
SK.GetEntity(circle->distance)->DistanceForceTo(r);
SS.MarkGroupDirtyByEntity(pending.circle);
break;
}
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
case Pending::DRAGGING_NORMAL: {
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
Entity *normal = SK.GetEntity(pending.normal);
Vector p = SK.GetEntity(normal->point[0])->PointGetNum();
Point2d p2 = ProjectPoint(p);
Quaternion q = normal->NormalGetNum();
Vector u = q.RotationU(), v = q.RotationV();
if(ctrlDown) {
double theta = atan2(orig.mouse.y-p2.y, orig.mouse.x-p2.x);
theta -= atan2(y-p2.y, x-p2.x);
Vector normal = projRight.Cross(projUp);
u = u.RotatedAbout(normal, -theta);
v = v.RotatedAbout(normal, -theta);
} else {
double dx = -(x - orig.mouse.x);
double dy = -(y - orig.mouse.y);
double s = 0.3*(PI/180); // degrees per pixel
u = u.RotatedAbout(projUp, -s*dx);
u = u.RotatedAbout(projRight, s*dy);
v = v.RotatedAbout(projUp, -s*dx);
v = v.RotatedAbout(projRight, s*dy);
}
orig.mouse = mp;
normal->NormalForceTo(Quaternion::From(u, v));
SS.MarkGroupDirtyByEntity(pending.normal);
break;
}
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
case Pending::DRAGGING_MARQUEE:
Add marquee selection, a view-aligned rectangle such that everything even partially within that rectangle gets selected when I release. Also make deselecting a point deselect all coincident points too; otherwise there now exist ways to select both coincident points, which meant that it was impossible to deselect the lower one. And fix text window to show selection info even if just constraints are selected, seems more consistent. [git-p4: depot-paths = "//depot/solvespace/": change = 2066]
2009-11-04 07:52:58 +00:00
orig.mouse = mp;
Implement a platform abstraction for windows. This commit removes a large amount of code partially duplicated between the text and the graphics windows, and opens the path to having more than one model window on screen at any given time, as well as simplifies platform work. This commit also adds complete support for High-DPI device pixel ratio. It adds support for font scale factor (a fractional factor on top of integral device pixel ratio) on the platform side, but not on the application side. This commit also adds error checking to all Windows API calls (within the abstracted code) and fixes a significant number of misuses and non-future-proof uses of Windows API. This commit also makes uses of Windows API idiomatic, e.g. using the built-in vertical scroll bar, native tooltips, control subclassing instead of hooks in the global dispatch loop, and so on. It reinstates tooltip support and removes menu-related hacks.
2018-07-12 19:29:44 +00:00
Invalidate();
Enable exhaustive switch coverage warnings as an error, and use them. Specifically, this enables -Wswitch=error on GCC/Clang and its MSVC equivalent; the exact way it is handled varies slightly, but what they all have in common is that in a switch statement over an enumeration, any enumerand that is not explicitly (via case:) or implicitly (via default:) handled in the switch triggers an error. Moreover, we also change the switch statements in three ways: * Switch statements that ought to be extended every time a new enumerand is added (e.g. Entity::DrawOrGetDistance(), are changed to explicitly list every single enumerand, and not have a default: branch. Note that the assertions are kept because it is legal for a enumeration to have a value unlike any of its defined enumerands, and we can e.g. read garbage from a file, or an uninitialized variable. This requires some rearranging if a default: branch is undesired. * Switch statements that ought to only ever see a few select enumerands, are changed to always assert in the default: branch. * Switch statements that do something meaningful for a few enumerands, and ignore everything else, are changed to do nothing in a default: branch, under the assumption that changing them every time an enumerand is added or removed would just result in noise and catch no bugs. This commit also removes the {Request,Entity,Constraint}::UNKNOWN and Entity::DATUM_POINT enumerands, as those were just fancy names for zeroes. They mess up switch exhaustiveness checks and most of the time were not the best way to implement what they did anyway.
2016-05-25 06:55:50 +00:00
return;
Add marquee selection, a view-aligned rectangle such that everything even partially within that rectangle gets selected when I release. Also make deselecting a point deselect all coincident points too; otherwise there now exist ways to select both coincident points, which meant that it was impossible to deselect the lower one. And fix text window to show selection info even if just constraints are selected, seems more consistent. [git-p4: depot-paths = "//depot/solvespace/": change = 2066]
2009-11-04 07:52:58 +00:00
Enable exhaustive switch coverage warnings as an error, and use them. Specifically, this enables -Wswitch=error on GCC/Clang and its MSVC equivalent; the exact way it is handled varies slightly, but what they all have in common is that in a switch statement over an enumeration, any enumerand that is not explicitly (via case:) or implicitly (via default:) handled in the switch triggers an error. Moreover, we also change the switch statements in three ways: * Switch statements that ought to be extended every time a new enumerand is added (e.g. Entity::DrawOrGetDistance(), are changed to explicitly list every single enumerand, and not have a default: branch. Note that the assertions are kept because it is legal for a enumeration to have a value unlike any of its defined enumerands, and we can e.g. read garbage from a file, or an uninitialized variable. This requires some rearranging if a default: branch is undesired. * Switch statements that ought to only ever see a few select enumerands, are changed to always assert in the default: branch. * Switch statements that do something meaningful for a few enumerands, and ignore everything else, are changed to do nothing in a default: branch, under the assumption that changing them every time an enumerand is added or removed would just result in noise and catch no bugs. This commit also removes the {Request,Entity,Constraint}::UNKNOWN and Entity::DATUM_POINT enumerands, as those were just fancy names for zeroes. They mess up switch exhaustiveness checks and most of the time were not the best way to implement what they did anyway.
2016-05-25 06:55:50 +00:00
case Pending::NONE:
case Pending::COMMAND:
ssassert(false, "Unexpected pending operation");
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
}
}
Implement a platform abstraction for timers. This commit temporarily disables tooltip functionality; it will be handled natively in a platform abstraction for windows using much simpler code.
2018-07-11 05:35:31 +00:00
void GraphicsWindow::ClearPending(bool scheduleShowTW) {
Remove arbitrary limits on the selection size, and permit more than one point to be dragged simultaneously. So now a dragged point drags all the selected points and entities, and a dragged entity drags its points (except for circles, which drag the radius). This means that the number of forced points for the solver must now be unlimited, and it is. Also add commands to invert the selection within the active group, and to select an edge chain starting from the current selection. And redo the context menus a bit; still not great, but less cluttered and more systematic. [git-p4: depot-paths = "//depot/solvespace/": change = 2064]
2009-11-03 18:54:49 +00:00
pending.points.Clear();
Do not hover or select entities from any pending request.
2017-01-09 16:54:24 +00:00
pending.requests.Clear();
Replace all ZERO and memset with C++11 brace-initialization. This will allow us to use non-POD classes inside these objects in future and is otherwise functionally equivalent, as well as more concise. Note that there are some subtleties with handling of brace-initialization. Specifically: On aggregates (e.g. simple C-style structures) using an empty brace-initializer zero-initializes the aggregate, i.e. it makes all members zero. On non-aggregates an empty brace-initializer calls the default constructor. And if the constructor doesn't explicitly initialize the members (which the auto-generated constructor doesn't) then the members will be constructed but otherwise uninitialized. So, what is an aggregate class? To quote the C++ standard (C++03 8.5.1 §1): An aggregate is an array or a class (clause 9) with no user-declared constructors (12.1), no private or protected non-static data members (clause 11), no base classes (clause 10), and no virtual functions (10.3). In SolveSpace, we only have to handle the case of base classes; Constraint and Entity have those. Thus, they had to gain a default constructor that does nothing but initializes the members to zero.
2015-03-27 15:31:23 +00:00
pending = {};
Implement a platform abstraction for timers. This commit temporarily disables tooltip functionality; it will be handled natively in a platform abstraction for windows using much simpler code.
2018-07-11 05:35:31 +00:00
if(scheduleShowTW) {
SS.ScheduleShowTW();
}
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
}
Do not hover or select entities from any pending request.
2017-01-09 16:54:24 +00:00
bool GraphicsWindow::IsFromPending(hRequest r) {
for(auto &req : pending.requests) {
Use the new equality/inequality operators of handles to reduce references to .v. NFC.
2019-07-09 14:44:57 +00:00
if(req == r) return true;
Do not hover or select entities from any pending request.
2017-01-09 16:54:24 +00:00
}
return false;
}
void GraphicsWindow::AddToPending(hRequest r) {
pending.requests.Add(&r);
}
Fix logic introduced in 55ae10b. Before this commit, the effect of the AddPending() call was immediately reversed by ClearSuper.
2017-01-24 16:54:10 +00:00
void GraphicsWindow::ReplacePending(hRequest before, hRequest after) {
for(auto &req : pending.requests) {
Use the new equality/inequality operators of handles to reduce references to .v. NFC.
2019-07-09 14:44:57 +00:00
if(req == before) {
req = after;
Fix logic introduced in 55ae10b. Before this commit, the effect of the AddPending() call was immediately reversed by ClearSuper.
2017-01-24 16:54:10 +00:00
}
}
}
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
void GraphicsWindow::MouseMiddleOrRightDown(double x, double y) {
Implement a platform abstraction for windows. This commit removes a large amount of code partially duplicated between the text and the graphics windows, and opens the path to having more than one model window on screen at any given time, as well as simplifies platform work. This commit also adds complete support for High-DPI device pixel ratio. It adds support for font scale factor (a fractional factor on top of integral device pixel ratio) on the platform side, but not on the application side. This commit also adds error checking to all Windows API calls (within the abstracted code) and fixes a significant number of misuses and non-future-proof uses of Windows API. This commit also makes uses of Windows API idiomatic, e.g. using the built-in vertical scroll bar, native tooltips, control subclassing instead of hooks in the global dispatch loop, and so on. It reinstates tooltip support and removes menu-related hacks.
2018-07-12 19:29:44 +00:00
if(window->IsEditorVisible()) return;
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
orig.offset = offset;
orig.projUp = projUp;
orig.projRight = projRight;
orig.mouse.x = x;
orig.mouse.y = y;
orig.startedMoving = false;
}
void GraphicsWindow::MouseRightUp(double x, double y) {
Add a screen to edit the view parameters; scale, translation, rotation. Also clean up the handling of units, by putting the conversion factors in only one place, and clean up the expression-parsing but removing all the copies of the same error message. [git-p4: depot-paths = "//depot/solvespace/": change = 2093]
2010-01-04 00:35:28 +00:00
SS.extraLine.draw = false;
Implement a platform abstraction for windows. This commit removes a large amount of code partially duplicated between the text and the graphics windows, and opens the path to having more than one model window on screen at any given time, as well as simplifies platform work. This commit also adds complete support for High-DPI device pixel ratio. It adds support for font scale factor (a fractional factor on top of integral device pixel ratio) on the platform side, but not on the application side. This commit also adds error checking to all Windows API calls (within the abstracted code) and fixes a significant number of misuses and non-future-proof uses of Windows API. This commit also makes uses of Windows API idiomatic, e.g. using the built-in vertical scroll bar, native tooltips, control subclassing instead of hooks in the global dispatch loop, and so on. It reinstates tooltip support and removes menu-related hacks.
2018-07-12 19:29:44 +00:00
Invalidate();
Split cubic splines and periodic splines too; which is a pain, because it can't be C2 continuous after splitting (since I'm doing uniform splines only, and the parametrization changes). So just knock everything down to cubic Beziers. Also draw lines to indicate angle and origin when Ctrl+dragging to rotate in plane of screen. [git-p4: depot-paths = "//depot/solvespace/": change = 2075]
2009-11-10 03:57:24 +00:00
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
// Don't show a context menu if the user is right-clicking the toolbar,
// or if they are finishing a pan.
if(ToolbarMouseMoved((int)x, (int)y)) return;
if(orig.startedMoving) return;
if(context.active) return;
Enable exhaustive switch coverage warnings as an error, and use them. Specifically, this enables -Wswitch=error on GCC/Clang and its MSVC equivalent; the exact way it is handled varies slightly, but what they all have in common is that in a switch statement over an enumeration, any enumerand that is not explicitly (via case:) or implicitly (via default:) handled in the switch triggers an error. Moreover, we also change the switch statements in three ways: * Switch statements that ought to be extended every time a new enumerand is added (e.g. Entity::DrawOrGetDistance(), are changed to explicitly list every single enumerand, and not have a default: branch. Note that the assertions are kept because it is legal for a enumeration to have a value unlike any of its defined enumerands, and we can e.g. read garbage from a file, or an uninitialized variable. This requires some rearranging if a default: branch is undesired. * Switch statements that ought to only ever see a few select enumerands, are changed to always assert in the default: branch. * Switch statements that do something meaningful for a few enumerands, and ignore everything else, are changed to do nothing in a default: branch, under the assumption that changing them every time an enumerand is added or removed would just result in noise and catch no bugs. This commit also removes the {Request,Entity,Constraint}::UNKNOWN and Entity::DATUM_POINT enumerands, as those were just fancy names for zeroes. They mess up switch exhaustiveness checks and most of the time were not the best way to implement what they did anyway.
2016-05-25 06:55:50 +00:00
if(pending.operation == Pending::DRAGGING_NEW_LINE_POINT && pending.hasSuggestion) {
Skip creating an automatic H/V constraint if it would be redundant. This means that automatically added H/V constraints now will never cause the sketch to become overconstrained, which currently makes that feature almost unusable.
2019-05-24 15:06:53 +00:00
Constraint::TryConstrain(SS.GW.pending.suggestion,
Enable exhaustive switch coverage warnings as an error, and use them. Specifically, this enables -Wswitch=error on GCC/Clang and its MSVC equivalent; the exact way it is handled varies slightly, but what they all have in common is that in a switch statement over an enumeration, any enumerand that is not explicitly (via case:) or implicitly (via default:) handled in the switch triggers an error. Moreover, we also change the switch statements in three ways: * Switch statements that ought to be extended every time a new enumerand is added (e.g. Entity::DrawOrGetDistance(), are changed to explicitly list every single enumerand, and not have a default: branch. Note that the assertions are kept because it is legal for a enumeration to have a value unlike any of its defined enumerands, and we can e.g. read garbage from a file, or an uninitialized variable. This requires some rearranging if a default: branch is undesired. * Switch statements that ought to only ever see a few select enumerands, are changed to always assert in the default: branch. * Switch statements that do something meaningful for a few enumerands, and ignore everything else, are changed to do nothing in a default: branch, under the assumption that changing them every time an enumerand is added or removed would just result in noise and catch no bugs. This commit also removes the {Request,Entity,Constraint}::UNKNOWN and Entity::DATUM_POINT enumerands, as those were just fancy names for zeroes. They mess up switch exhaustiveness checks and most of the time were not the best way to implement what they did anyway.
2016-05-25 06:55:50 +00:00
Entity::NO_ENTITY, Entity::NO_ENTITY, pending.request.entity(0));
Automatically add horz/vert constraints to lines if close enough.
2015-03-29 22:26:07 +00:00
}
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
if(pending.operation == Pending::DRAGGING_NEW_LINE_POINT ||
pending.operation == Pending::DRAGGING_NEW_CUBIC_POINT)
Add interpolating splines: both periodic splines (that form a loop), and open-ended splines, with their tangents specified at their endpoints. Also change constraint solver matrix size to 1024, on the theory that a power of two will generate better array indexing, and replace fabs() with my own function that for some reason is faster. [git-p4: depot-paths = "//depot/solvespace/": change = 2055]
2009-10-21 04:46:01 +00:00
{
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
// Special case; use a right click to stop drawing lines, since
// a left click would draw another one. This is quicker and more
Add interpolating splines: both periodic splines (that form a loop), and open-ended splines, with their tangents specified at their endpoints. Also change constraint solver matrix size to 1024, on the theory that a power of two will generate better array indexing, and replace fabs() with my own function that for some reason is faster. [git-p4: depot-paths = "//depot/solvespace/": change = 2055]
2009-10-21 04:46:01 +00:00
// intuitive than hitting escape. Likewise for new cubic segments.
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
ClearPending();
Add interpolating splines: both periodic splines (that form a loop), and open-ended splines, with their tangents specified at their endpoints. Also change constraint solver matrix size to 1024, on the theory that a power of two will generate better array indexing, and replace fabs() with my own function that for some reason is faster. [git-p4: depot-paths = "//depot/solvespace/": change = 2055]
2009-10-21 04:46:01 +00:00
return;
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
}
Allow adding spline points.
2016-04-08 08:20:42 +00:00
// The current mouse location
Vector v = offset.ScaledBy(-1);
v = v.Plus(projRight.ScaledBy(x/scale));
v = v.Plus(projUp.ScaledBy(y/scale));
Implement a platform abstraction for menus. This commit removes a large amount of redundant code that needed to be kept in sync between platforms and also makes it much easier to add new menu-related functionality since little to no platform code needs to be altered anymore. This commit also greatly improves code locality in context menu handling by allowing context menu click handlers to be closures. This commit temporarily introduces a SetMainMenu API, which is rather hacky but only necessary until an abstraction for windows is added.
2018-07-11 10:48:38 +00:00
Platform::MenuRef menu = Platform::CreateMenu();
Add interpolating splines: both periodic splines (that form a loop), and open-ended splines, with their tangents specified at their endpoints. Also change constraint solver matrix size to 1024, on the theory that a power of two will generate better array indexing, and replace fabs() with my own function that for some reason is faster. [git-p4: depot-paths = "//depot/solvespace/": change = 2055]
2009-10-21 04:46:01 +00:00
context.active = true;
Remove the toggle semantics from all the selection stuff. Now left-clicking always selects, and there's a special context menu item to deselect. Also streamline the right-click behavior by making that select the hovered item, and making all the context menu items work on the selection. [git-p4: depot-paths = "//depot/solvespace/": change = 2091]
2010-01-03 10:26:15 +00:00
if(!hover.IsEmpty()) {
MakeSelected(&hover);
Add a GTK2/3 port. In principle, GTK3 is the way forward, and GTK2 is officially deprecated, though still maintained. In practice however, GTK3 is often unbearably buggy; e.g. on my system, combo boxes don't ever roll up in GTK3 windows. So I have added support for both. This required a few minor changes to the core, namely: * GTK wants to know beforehand whether a menu item is a check menu item or a regular one. * GTK doesn't give us an easy way to execute something after any event is processed, so an explicit idle timer is added. This is a no-op on Win32. * A few function signatures were const'ed, since GTK expects immutable strings when converting to Glib::ustring.
2015-03-18 17:02:11 +00:00
SS.ScheduleShowTW();
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
}
Remove the toggle semantics from all the selection stuff. Now left-clicking always selects, and there's a special context menu item to deselect. Also streamline the right-click behavior by making that select the hovered item, and making all the context menu items work on the selection. [git-p4: depot-paths = "//depot/solvespace/": change = 2091]
2010-01-03 10:26:15 +00:00
GroupSelection();
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
Remove the toggle semantics from all the selection stuff. Now left-clicking always selects, and there's a special context menu item to deselect. Also streamline the right-click behavior by making that select the hovered item, and making all the context menu items work on the selection. [git-p4: depot-paths = "//depot/solvespace/": change = 2091]
2010-01-03 10:26:15 +00:00
bool itemsSelected = (gs.n > 0 || gs.constraints > 0);
if(itemsSelected) {
if(gs.stylables > 0) {
Implement a platform abstraction for menus. This commit removes a large amount of redundant code that needed to be kept in sync between platforms and also makes it much easier to add new menu-related functionality since little to no platform code needs to be altered anymore. This commit also greatly improves code locality in context menu handling by allowing context menu click handlers to be closures. This commit temporarily introduces a SetMainMenu API, which is rather hacky but only necessary until an abstraction for windows is added.
2018-07-11 10:48:38 +00:00
Platform::MenuRef styleMenu = menu->AddSubMenu(_("Assign to Style"));
bool empty = true;
for(const Style &s : SK.style) {
if(s.h.v < Style::FIRST_CUSTOM) continue;
styleMenu->AddItem(s.DescriptionString(), [&]() {
Style::AssignSelectionToStyle(s.h.v);
});
empty = false;
}
if(!empty) styleMenu->AddSeparator();
styleMenu->AddItem(_("No Style"), [&]() {
Style::AssignSelectionToStyle(0);
});
styleMenu->AddItem(_("Newly Created Custom Style..."), [&]() {
uint32_t vs = Style::CreateCustomStyle();
Style::AssignSelectionToStyle(vs);
ForceTextWindowShown();
});
Remove arbitrary limits on the selection size, and permit more than one point to be dragged simultaneously. So now a dragged point drags all the selected points and entities, and a dragged entity drags its points (except for circles, which drag the radius). This means that the number of forced points for the solver must now be unlimited, and it is. Also add commands to invert the selection within the active group, and to select an edge chain starting from the current selection. And redo the context menus a bit; still not great, but less cluttered and more systematic. [git-p4: depot-paths = "//depot/solvespace/": change = 2064]
2009-11-03 18:54:49 +00:00
}
Remove the toggle semantics from all the selection stuff. Now left-clicking always selects, and there's a special context menu item to deselect. Also streamline the right-click behavior by making that select the hovered item, and making all the context menu items work on the selection. [git-p4: depot-paths = "//depot/solvespace/": change = 2091]
2010-01-03 10:26:15 +00:00
if(gs.n + gs.constraints == 1) {
Implement a platform abstraction for menus. This commit removes a large amount of redundant code that needed to be kept in sync between platforms and also makes it much easier to add new menu-related functionality since little to no platform code needs to be altered anymore. This commit also greatly improves code locality in context menu handling by allowing context menu click handlers to be closures. This commit temporarily introduces a SetMainMenu API, which is rather hacky but only necessary until an abstraction for windows is added.
2018-07-11 10:48:38 +00:00
menu->AddItem(_("Group Info"), [&]() {
hGroup hg;
if(gs.entities == 1) {
hg = SK.GetEntity(gs.entity[0])->group;
} else if(gs.points == 1) {
hg = SK.GetEntity(gs.point[0])->group;
} else if(gs.constraints == 1) {
hg = SK.GetConstraint(gs.constraint[0])->group;
} else {
return;
}
ClearSelection();
SS.TW.GoToScreen(TextWindow::Screen::GROUP_INFO);
SS.TW.shown.group = hg;
SS.ScheduleShowTW();
ForceTextWindowShown();
});
Remove arbitrary limits on the selection size, and permit more than one point to be dragged simultaneously. So now a dragged point drags all the selected points and entities, and a dragged entity drags its points (except for circles, which drag the radius). This means that the number of forced points for the solver must now be unlimited, and it is. Also add commands to invert the selection within the active group, and to select an edge chain starting from the current selection. And redo the context menus a bit; still not great, but less cluttered and more systematic. [git-p4: depot-paths = "//depot/solvespace/": change = 2064]
2009-11-03 18:54:49 +00:00
}
Remove the toggle semantics from all the selection stuff. Now left-clicking always selects, and there's a special context menu item to deselect. Also streamline the right-click behavior by making that select the hovered item, and making all the context menu items work on the selection. [git-p4: depot-paths = "//depot/solvespace/": change = 2091]
2010-01-03 10:26:15 +00:00
if(gs.n + gs.constraints == 1 && gs.stylables == 1) {
Implement a platform abstraction for menus. This commit removes a large amount of redundant code that needed to be kept in sync between platforms and also makes it much easier to add new menu-related functionality since little to no platform code needs to be altered anymore. This commit also greatly improves code locality in context menu handling by allowing context menu click handlers to be closures. This commit temporarily introduces a SetMainMenu API, which is rather hacky but only necessary until an abstraction for windows is added.
2018-07-11 10:48:38 +00:00
menu->AddItem(_("Style Info"), [&]() {
hStyle hs;
if(gs.entities == 1) {
hs = Style::ForEntity(gs.entity[0]);
} else if(gs.points == 1) {
hs = Style::ForEntity(gs.point[0]);
} else if(gs.constraints == 1) {
hs = SK.GetConstraint(gs.constraint[0])->GetStyle();
} else {
return;
}
ClearSelection();
SS.TW.GoToScreen(TextWindow::Screen::STYLE_INFO);
SS.TW.shown.style = hs;
SS.ScheduleShowTW();
ForceTextWindowShown();
});
Remove the toggle semantics from all the selection stuff. Now left-clicking always selects, and there's a special context menu item to deselect. Also streamline the right-click behavior by making that select the hovered item, and making all the context menu items work on the selection. [git-p4: depot-paths = "//depot/solvespace/": change = 2091]
2010-01-03 10:26:15 +00:00
}
if(gs.withEndpoints > 0) {
Implement a platform abstraction for menus. This commit removes a large amount of redundant code that needed to be kept in sync between platforms and also makes it much easier to add new menu-related functionality since little to no platform code needs to be altered anymore. This commit also greatly improves code locality in context menu handling by allowing context menu click handlers to be closures. This commit temporarily introduces a SetMainMenu API, which is rather hacky but only necessary until an abstraction for windows is added.
2018-07-11 10:48:38 +00:00
menu->AddItem(_("Select Edge Chain"),
[&]() { MenuEdit(Command::SELECT_CHAIN); });
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
}
Remove the toggle semantics from all the selection stuff. Now left-clicking always selects, and there's a special context menu item to deselect. Also streamline the right-click behavior by making that select the hovered item, and making all the context menu items work on the selection. [git-p4: depot-paths = "//depot/solvespace/": change = 2091]
2010-01-03 10:26:15 +00:00
if(gs.constraints == 1 && gs.n == 0) {
Constraint *c = SK.GetConstraint(gs.constraint[0]);
Convert all enumerations to use `enum class`. Specifically, take the old code that looks like this: class Foo { enum { X = 1, Y = 2 }; int kind; } ... foo.kind = Foo::X; ... and convert it to this: class Foo { enum class Kind : uint32_t { X = 1, Y = 2 }; Kind kind; } ... foo.kind = Foo::Kind::X; (In some cases the enumeration would not be in the class namespace, such as when it is generally useful.) The benefits are as follows: * The type of the field gives a clear indication of intent, both to humans and tools (such as binding generators). * The compiler is able to automatically warn when a switch is not exhaustive; but this is currently suppressed by the default: ssassert(false, ...) idiom. * Integers and plain enums are weakly type checked: they implicitly convert into each other. This can hide bugs where type conversion is performed but not intended. Enum classes are strongly type checked. * Plain enums pollute parent namespaces; enum classes do not. Almost every defined enum we have already has a kind of ad-hoc namespacing via `NAMESPACE_`, which is now explicit. * Plain enums do not have a well-defined ABI size, which is important for bindings. Enum classes can have it, if specified. We specify the base type for all enums as uint32_t, which is a safe choice and allows us to not change the numeric values of any variants. This commit introduces absolutely no functional change to the code, just renaming and change of types. It handles almost all cases, except GraphicsWindow::pending.operation, which needs minor functional change.
2016-05-20 08:31:20 +00:00
if(c->HasLabel() && c->type != Constraint::Type::COMMENT) {
Implement a platform abstraction for menus. This commit removes a large amount of redundant code that needed to be kept in sync between platforms and also makes it much easier to add new menu-related functionality since little to no platform code needs to be altered anymore. This commit also greatly improves code locality in context menu handling by allowing context menu click handlers to be closures. This commit temporarily introduces a SetMainMenu API, which is rather hacky but only necessary until an abstraction for windows is added.
2018-07-11 10:48:38 +00:00
menu->AddItem(_("Toggle Reference Dimension"),
[&]() { Constraint::MenuConstrain(Command::REFERENCE); });
Remove arbitrary limits on the selection size, and permit more than one point to be dragged simultaneously. So now a dragged point drags all the selected points and entities, and a dragged entity drags its points (except for circles, which drag the radius). This means that the number of forced points for the solver must now be unlimited, and it is. Also add commands to invert the selection within the active group, and to select an edge chain starting from the current selection. And redo the context menus a bit; still not great, but less cluttered and more systematic. [git-p4: depot-paths = "//depot/solvespace/": change = 2064]
2009-11-03 18:54:49 +00:00
}
Convert all enumerations to use `enum class`. Specifically, take the old code that looks like this: class Foo { enum { X = 1, Y = 2 }; int kind; } ... foo.kind = Foo::X; ... and convert it to this: class Foo { enum class Kind : uint32_t { X = 1, Y = 2 }; Kind kind; } ... foo.kind = Foo::Kind::X; (In some cases the enumeration would not be in the class namespace, such as when it is generally useful.) The benefits are as follows: * The type of the field gives a clear indication of intent, both to humans and tools (such as binding generators). * The compiler is able to automatically warn when a switch is not exhaustive; but this is currently suppressed by the default: ssassert(false, ...) idiom. * Integers and plain enums are weakly type checked: they implicitly convert into each other. This can hide bugs where type conversion is performed but not intended. Enum classes are strongly type checked. * Plain enums pollute parent namespaces; enum classes do not. Almost every defined enum we have already has a kind of ad-hoc namespacing via `NAMESPACE_`, which is now explicit. * Plain enums do not have a well-defined ABI size, which is important for bindings. Enum classes can have it, if specified. We specify the base type for all enums as uint32_t, which is a safe choice and allows us to not change the numeric values of any variants. This commit introduces absolutely no functional change to the code, just renaming and change of types. It handles almost all cases, except GraphicsWindow::pending.operation, which needs minor functional change.
2016-05-20 08:31:20 +00:00
if(c->type == Constraint::Type::ANGLE ||
c->type == Constraint::Type::EQUAL_ANGLE)
Remove arbitrary limits on the selection size, and permit more than one point to be dragged simultaneously. So now a dragged point drags all the selected points and entities, and a dragged entity drags its points (except for circles, which drag the radius). This means that the number of forced points for the solver must now be unlimited, and it is. Also add commands to invert the selection within the active group, and to select an edge chain starting from the current selection. And redo the context menus a bit; still not great, but less cluttered and more systematic. [git-p4: depot-paths = "//depot/solvespace/": change = 2064]
2009-11-03 18:54:49 +00:00
{
Implement a platform abstraction for menus. This commit removes a large amount of redundant code that needed to be kept in sync between platforms and also makes it much easier to add new menu-related functionality since little to no platform code needs to be altered anymore. This commit also greatly improves code locality in context menu handling by allowing context menu click handlers to be closures. This commit temporarily introduces a SetMainMenu API, which is rather hacky but only necessary until an abstraction for windows is added.
2018-07-11 10:48:38 +00:00
menu->AddItem(_("Other Supplementary Angle"),
[&]() { Constraint::MenuConstrain(Command::OTHER_ANGLE); });
Remove arbitrary limits on the selection size, and permit more than one point to be dragged simultaneously. So now a dragged point drags all the selected points and entities, and a dragged entity drags its points (except for circles, which drag the radius). This means that the number of forced points for the solver must now be unlimited, and it is. Also add commands to invert the selection within the active group, and to select an edge chain starting from the current selection. And redo the context menus a bit; still not great, but less cluttered and more systematic. [git-p4: depot-paths = "//depot/solvespace/": change = 2064]
2009-11-03 18:54:49 +00:00
}
}
Allow snapping constraint labels to grid. This is pretty much the only way to get a sketch with tidily placed dimensions.
2016-04-18 06:40:42 +00:00
if(gs.constraintLabels > 0 || gs.points > 0) {
Implement a platform abstraction for menus. This commit removes a large amount of redundant code that needed to be kept in sync between platforms and also makes it much easier to add new menu-related functionality since little to no platform code needs to be altered anymore. This commit also greatly improves code locality in context menu handling by allowing context menu click handlers to be closures. This commit temporarily introduces a SetMainMenu API, which is rather hacky but only necessary until an abstraction for windows is added.
2018-07-11 10:48:38 +00:00
menu->AddItem(_("Snap to Grid"),
[&]() { MenuEdit(Command::SNAP_TO_GRID); });
Don't crash after right-clicking on derived entities.
2016-04-17 01:16:47 +00:00
}
Allow removing spline points.
2016-04-07 14:44:56 +00:00
Don't crash after right-clicking on derived entities.
2016-04-17 01:16:47 +00:00
if(gs.points == 1 && gs.point[0].isFromRequest()) {
Request *r = SK.GetRequest(gs.point[0].request());
int index = r->IndexOfPoint(gs.point[0]);
Convert all enumerations to use `enum class`. Specifically, take the old code that looks like this: class Foo { enum { X = 1, Y = 2 }; int kind; } ... foo.kind = Foo::X; ... and convert it to this: class Foo { enum class Kind : uint32_t { X = 1, Y = 2 }; Kind kind; } ... foo.kind = Foo::Kind::X; (In some cases the enumeration would not be in the class namespace, such as when it is generally useful.) The benefits are as follows: * The type of the field gives a clear indication of intent, both to humans and tools (such as binding generators). * The compiler is able to automatically warn when a switch is not exhaustive; but this is currently suppressed by the default: ssassert(false, ...) idiom. * Integers and plain enums are weakly type checked: they implicitly convert into each other. This can hide bugs where type conversion is performed but not intended. Enum classes are strongly type checked. * Plain enums pollute parent namespaces; enum classes do not. Almost every defined enum we have already has a kind of ad-hoc namespacing via `NAMESPACE_`, which is now explicit. * Plain enums do not have a well-defined ABI size, which is important for bindings. Enum classes can have it, if specified. We specify the base type for all enums as uint32_t, which is a safe choice and allows us to not change the numeric values of any variants. This commit introduces absolutely no functional change to the code, just renaming and change of types. It handles almost all cases, except GraphicsWindow::pending.operation, which needs minor functional change.
2016-05-20 08:31:20 +00:00
if((r->type == Request::Type::CUBIC && (index > 1 && index < r->extraPoints + 2)) ||
r->type == Request::Type::CUBIC_PERIODIC) {
Fix segfault in Remove Spline Point context menu This was incorrectly capturing `r` by reference and using it after it left its scope. Changed to capture by value, and also explicitly capture `this` in case we were accidentally capturing any other scope variables by reference. Fixes #571
2020-03-28 15:28:12 +00:00
menu->AddItem(_("Remove Spline Point"), [this, r]() {
Implement a platform abstraction for menus. This commit removes a large amount of redundant code that needed to be kept in sync between platforms and also makes it much easier to add new menu-related functionality since little to no platform code needs to be altered anymore. This commit also greatly improves code locality in context menu handling by allowing context menu click handlers to be closures. This commit temporarily introduces a SetMainMenu API, which is rather hacky but only necessary until an abstraction for windows is added.
2018-07-11 10:48:38 +00:00
int index = r->IndexOfPoint(gs.point[0]);
ssassert(r->extraPoints != 0,
"Expected a bezier with interior control points");
SS.UndoRemember();
Entity *e = SK.GetEntity(r->h.entity(0));
// First, fix point-coincident constraints involving this point.
// Then, remove all other constraints, since they would otherwise
// jump to an adjacent one and mess up the bezier after generation.
FixConstraintsForPointBeingDeleted(e->point[index]);
RemoveConstraintsForPointBeingDeleted(e->point[index]);
for(int i = index; i < MAX_POINTS_IN_ENTITY - 1; i++) {
if(e->point[i + 1].v == 0) break;
Entity *p0 = SK.GetEntity(e->point[i]);
Entity *p1 = SK.GetEntity(e->point[i + 1]);
ReplacePointInConstraints(p1->h, p0->h);
p0->PointForceTo(p1->PointGetNum());
}
r->extraPoints--;
SS.MarkGroupDirtyByEntity(gs.point[0]);
ClearSelection();
});
Allow removing spline points.
2016-04-07 14:44:56 +00:00
}
Remove the toggle semantics from all the selection stuff. Now left-clicking always selects, and there's a special context menu item to deselect. Also streamline the right-click behavior by making that select the hovered item, and making all the context menu items work on the selection. [git-p4: depot-paths = "//depot/solvespace/": change = 2091]
2010-01-03 10:26:15 +00:00
}
Don't crash after right-clicking on derived entities.
2016-04-17 01:16:47 +00:00
if(gs.entities == 1 && gs.entity[0].isFromRequest()) {
Request *r = SK.GetRequest(gs.entity[0].request());
Convert all enumerations to use `enum class`. Specifically, take the old code that looks like this: class Foo { enum { X = 1, Y = 2 }; int kind; } ... foo.kind = Foo::X; ... and convert it to this: class Foo { enum class Kind : uint32_t { X = 1, Y = 2 }; Kind kind; } ... foo.kind = Foo::Kind::X; (In some cases the enumeration would not be in the class namespace, such as when it is generally useful.) The benefits are as follows: * The type of the field gives a clear indication of intent, both to humans and tools (such as binding generators). * The compiler is able to automatically warn when a switch is not exhaustive; but this is currently suppressed by the default: ssassert(false, ...) idiom. * Integers and plain enums are weakly type checked: they implicitly convert into each other. This can hide bugs where type conversion is performed but not intended. Enum classes are strongly type checked. * Plain enums pollute parent namespaces; enum classes do not. Almost every defined enum we have already has a kind of ad-hoc namespacing via `NAMESPACE_`, which is now explicit. * Plain enums do not have a well-defined ABI size, which is important for bindings. Enum classes can have it, if specified. We specify the base type for all enums as uint32_t, which is a safe choice and allows us to not change the numeric values of any variants. This commit introduces absolutely no functional change to the code, just renaming and change of types. It handles almost all cases, except GraphicsWindow::pending.operation, which needs minor functional change.
2016-05-20 08:31:20 +00:00
if(r->type == Request::Type::CUBIC || r->type == Request::Type::CUBIC_PERIODIC) {
Don't crash after right-clicking on derived entities.
2016-04-17 01:16:47 +00:00
Entity *e = SK.GetEntity(gs.entity[0]);
Implement a platform abstraction for menus. This commit removes a large amount of redundant code that needed to be kept in sync between platforms and also makes it much easier to add new menu-related functionality since little to no platform code needs to be altered anymore. This commit also greatly improves code locality in context menu handling by allowing context menu click handlers to be closures. This commit temporarily introduces a SetMainMenu API, which is rather hacky but only necessary until an abstraction for windows is added.
2018-07-11 10:48:38 +00:00
int addAfterPoint = e->GetPositionOfPoint(GetCamera(), Point2d::From(x, y));
Replace all oops() checks with ssassert()s. This includes explanation and context for non-obvious cases and shortens debug cycles when just-in-time debugging is not available (like on Linux) by immediately printing description of the assert as well as symbolized backtrace.
2016-05-18 22:51:36 +00:00
ssassert(addAfterPoint != -1, "Expected a nearest bezier point to be located");
Don't crash after right-clicking on derived entities.
2016-04-17 01:16:47 +00:00
// Skip derivative point.
Convert all enumerations to use `enum class`. Specifically, take the old code that looks like this: class Foo { enum { X = 1, Y = 2 }; int kind; } ... foo.kind = Foo::X; ... and convert it to this: class Foo { enum class Kind : uint32_t { X = 1, Y = 2 }; Kind kind; } ... foo.kind = Foo::Kind::X; (In some cases the enumeration would not be in the class namespace, such as when it is generally useful.) The benefits are as follows: * The type of the field gives a clear indication of intent, both to humans and tools (such as binding generators). * The compiler is able to automatically warn when a switch is not exhaustive; but this is currently suppressed by the default: ssassert(false, ...) idiom. * Integers and plain enums are weakly type checked: they implicitly convert into each other. This can hide bugs where type conversion is performed but not intended. Enum classes are strongly type checked. * Plain enums pollute parent namespaces; enum classes do not. Almost every defined enum we have already has a kind of ad-hoc namespacing via `NAMESPACE_`, which is now explicit. * Plain enums do not have a well-defined ABI size, which is important for bindings. Enum classes can have it, if specified. We specify the base type for all enums as uint32_t, which is a safe choice and allows us to not change the numeric values of any variants. This commit introduces absolutely no functional change to the code, just renaming and change of types. It handles almost all cases, except GraphicsWindow::pending.operation, which needs minor functional change.
2016-05-20 08:31:20 +00:00
if(r->type == Request::Type::CUBIC) addAfterPoint++;
Implement a platform abstraction for menus. This commit removes a large amount of redundant code that needed to be kept in sync between platforms and also makes it much easier to add new menu-related functionality since little to no platform code needs to be altered anymore. This commit also greatly improves code locality in context menu handling by allowing context menu click handlers to be closures. This commit temporarily introduces a SetMainMenu API, which is rather hacky but only necessary until an abstraction for windows is added.
2018-07-11 10:48:38 +00:00
menu->AddItem(_("Add Spline Point"), [&]() {
int pointCount = r->extraPoints +
((r->type == Request::Type::CUBIC_PERIODIC) ? 3 : 4);
if(pointCount >= MAX_POINTS_IN_ENTITY) {
Error(_("Cannot add spline point: maximum number of points reached."));
return;
}
SS.UndoRemember();
r->extraPoints++;
SS.MarkGroupDirtyByEntity(gs.entity[0]);
SS.GenerateAll(SolveSpaceUI::Generate::REGEN);
Entity *e = SK.GetEntity(r->h.entity(0));
for(int i = MAX_POINTS_IN_ENTITY; i > addAfterPoint + 1; i--) {
Entity *p0 = SK.entity.FindByIdNoOops(e->point[i]);
if(p0 == NULL) continue;
Entity *p1 = SK.GetEntity(e->point[i - 1]);
ReplacePointInConstraints(p1->h, p0->h);
p0->PointForceTo(p1->PointGetNum());
}
Entity *p = SK.GetEntity(e->point[addAfterPoint + 1]);
p->PointForceTo(v);
SS.MarkGroupDirtyByEntity(gs.entity[0]);
ClearSelection();
});
Allow adding spline points.
2016-04-08 08:20:42 +00:00
}
}
Add "Toggle Construction" to context menu.
2016-10-09 22:13:01 +00:00
if(gs.entities == gs.n) {
Implement a platform abstraction for menus. This commit removes a large amount of redundant code that needed to be kept in sync between platforms and also makes it much easier to add new menu-related functionality since little to no platform code needs to be altered anymore. This commit also greatly improves code locality in context menu handling by allowing context menu click handlers to be closures. This commit temporarily introduces a SetMainMenu API, which is rather hacky but only necessary until an abstraction for windows is added.
2018-07-11 10:48:38 +00:00
menu->AddItem(_("Toggle Construction"),
[&]() { MenuRequest(Command::CONSTRUCTION); });
Add "Toggle Construction" to context menu.
2016-10-09 22:13:01 +00:00
}
Allow adding spline points.
2016-04-08 08:20:42 +00:00
Remove the toggle semantics from all the selection stuff. Now left-clicking always selects, and there's a special context menu item to deselect. Also streamline the right-click behavior by making that select the hovered item, and making all the context menu items work on the selection. [git-p4: depot-paths = "//depot/solvespace/": change = 2091]
2010-01-03 10:26:15 +00:00
if(gs.points == 1) {
Entity *p = SK.GetEntity(gs.point[0]);
Constraint *c;
IdList<Constraint,hConstraint> *lc = &(SK.constraint);
for(c = lc->First(); c; c = lc->NextAfter(c)) {
Convert all enumerations to use `enum class`. Specifically, take the old code that looks like this: class Foo { enum { X = 1, Y = 2 }; int kind; } ... foo.kind = Foo::X; ... and convert it to this: class Foo { enum class Kind : uint32_t { X = 1, Y = 2 }; Kind kind; } ... foo.kind = Foo::Kind::X; (In some cases the enumeration would not be in the class namespace, such as when it is generally useful.) The benefits are as follows: * The type of the field gives a clear indication of intent, both to humans and tools (such as binding generators). * The compiler is able to automatically warn when a switch is not exhaustive; but this is currently suppressed by the default: ssassert(false, ...) idiom. * Integers and plain enums are weakly type checked: they implicitly convert into each other. This can hide bugs where type conversion is performed but not intended. Enum classes are strongly type checked. * Plain enums pollute parent namespaces; enum classes do not. Almost every defined enum we have already has a kind of ad-hoc namespacing via `NAMESPACE_`, which is now explicit. * Plain enums do not have a well-defined ABI size, which is important for bindings. Enum classes can have it, if specified. We specify the base type for all enums as uint32_t, which is a safe choice and allows us to not change the numeric values of any variants. This commit introduces absolutely no functional change to the code, just renaming and change of types. It handles almost all cases, except GraphicsWindow::pending.operation, which needs minor functional change.
2016-05-20 08:31:20 +00:00
if(c->type != Constraint::Type::POINTS_COINCIDENT) continue;
Use the new equality/inequality operators of handles to reduce references to .v. NFC.
2019-07-09 14:44:57 +00:00
if(c->ptA == p->h || c->ptB == p->h) {
Remove the toggle semantics from all the selection stuff. Now left-clicking always selects, and there's a special context menu item to deselect. Also streamline the right-click behavior by making that select the hovered item, and making all the context menu items work on the selection. [git-p4: depot-paths = "//depot/solvespace/": change = 2091]
2010-01-03 10:26:15 +00:00
break;
Add context menu item to delete a point-coincident constraint, which can't be selected with the mouse and would otherwise have to get deleted by selecting it in the text window. [git-p4: depot-paths = "//depot/solvespace/": change = 2065]
2009-11-04 03:46:06 +00:00
}
}
Remove the toggle semantics from all the selection stuff. Now left-clicking always selects, and there's a special context menu item to deselect. Also streamline the right-click behavior by making that select the hovered item, and making all the context menu items work on the selection. [git-p4: depot-paths = "//depot/solvespace/": change = 2091]
2010-01-03 10:26:15 +00:00
if(c) {
Implement a platform abstraction for menus. This commit removes a large amount of redundant code that needed to be kept in sync between platforms and also makes it much easier to add new menu-related functionality since little to no platform code needs to be altered anymore. This commit also greatly improves code locality in context menu handling by allowing context menu click handlers to be closures. This commit temporarily introduces a SetMainMenu API, which is rather hacky but only necessary until an abstraction for windows is added.
2018-07-11 10:48:38 +00:00
menu->AddItem(_("Delete Point-Coincident Constraint"), [&]() {
if(!p->IsPoint()) return;
SS.UndoRemember();
SK.constraint.ClearTags();
Constraint *c;
for(c = SK.constraint.First(); c; c = SK.constraint.NextAfter(c)) {
if(c->type != Constraint::Type::POINTS_COINCIDENT) continue;
Use the new equality/inequality operators of handles to reduce references to .v. NFC.
2019-07-09 14:44:57 +00:00
if(c->ptA == p->h || c->ptB == p->h) {
Implement a platform abstraction for menus. This commit removes a large amount of redundant code that needed to be kept in sync between platforms and also makes it much easier to add new menu-related functionality since little to no platform code needs to be altered anymore. This commit also greatly improves code locality in context menu handling by allowing context menu click handlers to be closures. This commit temporarily introduces a SetMainMenu API, which is rather hacky but only necessary until an abstraction for windows is added.
2018-07-11 10:48:38 +00:00
c->tag = 1;
}
}
SK.constraint.RemoveTagged();
ClearSelection();
});
Remove the toggle semantics from all the selection stuff. Now left-clicking always selects, and there's a special context menu item to deselect. Also streamline the right-click behavior by making that select the hovered item, and making all the context menu items work on the selection. [git-p4: depot-paths = "//depot/solvespace/": change = 2091]
2010-01-03 10:26:15 +00:00
}
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
}
Implement a platform abstraction for menus. This commit removes a large amount of redundant code that needed to be kept in sync between platforms and also makes it much easier to add new menu-related functionality since little to no platform code needs to be altered anymore. This commit also greatly improves code locality in context menu handling by allowing context menu click handlers to be closures. This commit temporarily introduces a SetMainMenu API, which is rather hacky but only necessary until an abstraction for windows is added.
2018-07-11 10:48:38 +00:00
menu->AddSeparator();
Tweak drag and selection behavior: selection is kept after dragging selected entities, but cleared after dragging an unselected entity. Marquee selection is select-only (not toggle), and "Select All" replaces "Invert Selection". Left-click on nothing will clear the selection. Also add context menu entries for cut, copy, and paste. [git-p4: depot-paths = "//depot/solvespace/": change = 2089]
2009-12-21 16:44:00 +00:00
if(LockedInWorkplane()) {
Implement a platform abstraction for menus. This commit removes a large amount of redundant code that needed to be kept in sync between platforms and also makes it much easier to add new menu-related functionality since little to no platform code needs to be altered anymore. This commit also greatly improves code locality in context menu handling by allowing context menu click handlers to be closures. This commit temporarily introduces a SetMainMenu API, which is rather hacky but only necessary until an abstraction for windows is added.
2018-07-11 10:48:38 +00:00
menu->AddItem(_("Cut"),
[&]() { MenuClipboard(Command::CUT); });
menu->AddItem(_("Copy"),
[&]() { MenuClipboard(Command::COPY); });
Tweak drag and selection behavior: selection is kept after dragging selected entities, but cleared after dragging an unselected entity. Marquee selection is select-only (not toggle), and "Select All" replaces "Invert Selection". Left-click on nothing will clear the selection. Also add context menu entries for cut, copy, and paste. [git-p4: depot-paths = "//depot/solvespace/": change = 2089]
2009-12-21 16:44:00 +00:00
}
Add "Select All" to context menu for no selection.
2016-10-09 22:26:25 +00:00
} else {
Implement a platform abstraction for menus. This commit removes a large amount of redundant code that needed to be kept in sync between platforms and also makes it much easier to add new menu-related functionality since little to no platform code needs to be altered anymore. This commit also greatly improves code locality in context menu handling by allowing context menu click handlers to be closures. This commit temporarily introduces a SetMainMenu API, which is rather hacky but only necessary until an abstraction for windows is added.
2018-07-11 10:48:38 +00:00
menu->AddItem(_("Select All"),
[&]() { MenuEdit(Command::SELECT_ALL); });
Tweak drag and selection behavior: selection is kept after dragging selected entities, but cleared after dragging an unselected entity. Marquee selection is select-only (not toggle), and "Select All" replaces "Invert Selection". Left-click on nothing will clear the selection. Also add context menu entries for cut, copy, and paste. [git-p4: depot-paths = "//depot/solvespace/": change = 2089]
2009-12-21 16:44:00 +00:00
}
Add and use IdList::IsEmpty. NFC. Removes consuming code from the implementation details, easing swap of the underlying container, etc.
2018-01-03 21:10:18 +00:00
if((!SS.clipboard.r.IsEmpty() || !SS.clipboard.c.IsEmpty()) && LockedInWorkplane()) {
Implement a platform abstraction for menus. This commit removes a large amount of redundant code that needed to be kept in sync between platforms and also makes it much easier to add new menu-related functionality since little to no platform code needs to be altered anymore. This commit also greatly improves code locality in context menu handling by allowing context menu click handlers to be closures. This commit temporarily introduces a SetMainMenu API, which is rather hacky but only necessary until an abstraction for windows is added.
2018-07-11 10:48:38 +00:00
menu->AddItem(_("Paste"),
[&]() { MenuClipboard(Command::PASTE); });
menu->AddItem(_("Paste Transformed..."),
[&]() { MenuClipboard(Command::PASTE_TRANSFORM); });
Tweak drag and selection behavior: selection is kept after dragging selected entities, but cleared after dragging an unselected entity. Marquee selection is select-only (not toggle), and "Select All" replaces "Invert Selection". Left-click on nothing will clear the selection. Also add context menu entries for cut, copy, and paste. [git-p4: depot-paths = "//depot/solvespace/": change = 2089]
2009-12-21 16:44:00 +00:00
}
Remove the toggle semantics from all the selection stuff. Now left-clicking always selects, and there's a special context menu item to deselect. Also streamline the right-click behavior by making that select the hovered item, and making all the context menu items work on the selection. [git-p4: depot-paths = "//depot/solvespace/": change = 2091]
2010-01-03 10:26:15 +00:00
if(itemsSelected) {
Implement a platform abstraction for menus. This commit removes a large amount of redundant code that needed to be kept in sync between platforms and also makes it much easier to add new menu-related functionality since little to no platform code needs to be altered anymore. This commit also greatly improves code locality in context menu handling by allowing context menu click handlers to be closures. This commit temporarily introduces a SetMainMenu API, which is rather hacky but only necessary until an abstraction for windows is added.
2018-07-11 10:48:38 +00:00
menu->AddItem(_("Delete"),
[&]() { MenuClipboard(Command::DELETE); });
menu->AddSeparator();
menu->AddItem(_("Unselect All"),
[&]() { MenuEdit(Command::UNSELECT_ALL); });
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
}
Remove the toggle semantics from all the selection stuff. Now left-clicking always selects, and there's a special context menu item to deselect. Also streamline the right-click behavior by making that select the hovered item, and making all the context menu items work on the selection. [git-p4: depot-paths = "//depot/solvespace/": change = 2091]
2010-01-03 10:26:15 +00:00
// If only one item is selected, then it must be the one that we just
// selected from the hovered item; in which case unselect all and hovered
// are equivalent.
if(!hover.IsEmpty() && selection.n > 1) {
Implement a platform abstraction for menus. This commit removes a large amount of redundant code that needed to be kept in sync between platforms and also makes it much easier to add new menu-related functionality since little to no platform code needs to be altered anymore. This commit also greatly improves code locality in context menu handling by allowing context menu click handlers to be closures. This commit temporarily introduces a SetMainMenu API, which is rather hacky but only necessary until an abstraction for windows is added.
2018-07-11 10:48:38 +00:00
menu->AddItem(_("Unselect Hovered"), [&] {
Remove the toggle semantics from all the selection stuff. Now left-clicking always selects, and there's a special context menu item to deselect. Also streamline the right-click behavior by making that select the hovered item, and making all the context menu items work on the selection. [git-p4: depot-paths = "//depot/solvespace/": change = 2091]
2010-01-03 10:26:15 +00:00
if(!hover.IsEmpty()) {
Annotate constants passed as boolean function arguments. This is to ensure that: * it is clear, when looking at the point of usage, what is the purpose of "true" or "false"; * when refactoring, a simple search will bring up any places that need to be changed. Also, argument names were synchronized between declaration and implementation. As an exception, these are not annotated: * Printf(/*halfLine=*/), to avoid pointless churn.
2016-05-25 12:08:19 +00:00
MakeUnselected(&hover, /*coincidentPointTrick=*/true);
Remove the toggle semantics from all the selection stuff. Now left-clicking always selects, and there's a special context menu item to deselect. Also streamline the right-click behavior by making that select the hovered item, and making all the context menu items work on the selection. [git-p4: depot-paths = "//depot/solvespace/": change = 2091]
2010-01-03 10:26:15 +00:00
}
Implement a platform abstraction for menus. This commit removes a large amount of redundant code that needed to be kept in sync between platforms and also makes it much easier to add new menu-related functionality since little to no platform code needs to be altered anymore. This commit also greatly improves code locality in context menu handling by allowing context menu click handlers to be closures. This commit temporarily introduces a SetMainMenu API, which is rather hacky but only necessary until an abstraction for windows is added.
2018-07-11 10:48:38 +00:00
});
}
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
Implement a platform abstraction for menus. This commit removes a large amount of redundant code that needed to be kept in sync between platforms and also makes it much easier to add new menu-related functionality since little to no platform code needs to be altered anymore. This commit also greatly improves code locality in context menu handling by allowing context menu click handlers to be closures. This commit temporarily introduces a SetMainMenu API, which is rather hacky but only necessary until an abstraction for windows is added.
2018-07-11 10:48:38 +00:00
if(itemsSelected) {
menu->AddSeparator();
menu->AddItem(_("Zoom to Fit"),
[&]() { MenuView(Command::ZOOM_TO_FIT); });
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
}
Implement a platform abstraction for menus. This commit removes a large amount of redundant code that needed to be kept in sync between platforms and also makes it much easier to add new menu-related functionality since little to no platform code needs to be altered anymore. This commit also greatly improves code locality in context menu handling by allowing context menu click handlers to be closures. This commit temporarily introduces a SetMainMenu API, which is rather hacky but only necessary until an abstraction for windows is added.
2018-07-11 10:48:38 +00:00
menu->PopUp();
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
context.active = false;
Add a GTK2/3 port. In principle, GTK3 is the way forward, and GTK2 is officially deprecated, though still maintained. In practice however, GTK3 is often unbearably buggy; e.g. on my system, combo boxes don't ever roll up in GTK3 windows. So I have added support for both. This required a few minor changes to the core, namely: * GTK wants to know beforehand whether a menu item is a check menu item or a regular one. * GTK doesn't give us an easy way to execute something after any event is processed, so an explicit idle timer is added. This is a no-op on Win32. * A few function signatures were const'ed, since GTK expects immutable strings when converting to Glib::ustring.
2015-03-18 17:02:11 +00:00
SS.ScheduleShowTW();
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
}
Convert all enumerations to use `enum class`. Specifically, take the old code that looks like this: class Foo { enum { X = 1, Y = 2 }; int kind; } ... foo.kind = Foo::X; ... and convert it to this: class Foo { enum class Kind : uint32_t { X = 1, Y = 2 }; Kind kind; } ... foo.kind = Foo::Kind::X; (In some cases the enumeration would not be in the class namespace, such as when it is generally useful.) The benefits are as follows: * The type of the field gives a clear indication of intent, both to humans and tools (such as binding generators). * The compiler is able to automatically warn when a switch is not exhaustive; but this is currently suppressed by the default: ssassert(false, ...) idiom. * Integers and plain enums are weakly type checked: they implicitly convert into each other. This can hide bugs where type conversion is performed but not intended. Enum classes are strongly type checked. * Plain enums pollute parent namespaces; enum classes do not. Almost every defined enum we have already has a kind of ad-hoc namespacing via `NAMESPACE_`, which is now explicit. * Plain enums do not have a well-defined ABI size, which is important for bindings. Enum classes can have it, if specified. We specify the base type for all enums as uint32_t, which is a safe choice and allows us to not change the numeric values of any variants. This commit introduces absolutely no functional change to the code, just renaming and change of types. It handles almost all cases, except GraphicsWindow::pending.operation, which needs minor functional change.
2016-05-20 08:31:20 +00:00
hRequest GraphicsWindow::AddRequest(Request::Type type) {
Annotate constants passed as boolean function arguments. This is to ensure that: * it is clear, when looking at the point of usage, what is the purpose of "true" or "false"; * when refactoring, a simple search will bring up any places that need to be changed. Also, argument names were synchronized between declaration and implementation. As an exception, these are not annotated: * Printf(/*halfLine=*/), to avoid pointless churn.
2016-05-25 12:08:19 +00:00
return AddRequest(type, /*rememberForUndo=*/true);
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
}
Convert all enumerations to use `enum class`. Specifically, take the old code that looks like this: class Foo { enum { X = 1, Y = 2 }; int kind; } ... foo.kind = Foo::X; ... and convert it to this: class Foo { enum class Kind : uint32_t { X = 1, Y = 2 }; Kind kind; } ... foo.kind = Foo::Kind::X; (In some cases the enumeration would not be in the class namespace, such as when it is generally useful.) The benefits are as follows: * The type of the field gives a clear indication of intent, both to humans and tools (such as binding generators). * The compiler is able to automatically warn when a switch is not exhaustive; but this is currently suppressed by the default: ssassert(false, ...) idiom. * Integers and plain enums are weakly type checked: they implicitly convert into each other. This can hide bugs where type conversion is performed but not intended. Enum classes are strongly type checked. * Plain enums pollute parent namespaces; enum classes do not. Almost every defined enum we have already has a kind of ad-hoc namespacing via `NAMESPACE_`, which is now explicit. * Plain enums do not have a well-defined ABI size, which is important for bindings. Enum classes can have it, if specified. We specify the base type for all enums as uint32_t, which is a safe choice and allows us to not change the numeric values of any variants. This commit introduces absolutely no functional change to the code, just renaming and change of types. It handles almost all cases, except GraphicsWindow::pending.operation, which needs minor functional change.
2016-05-20 08:31:20 +00:00
hRequest GraphicsWindow::AddRequest(Request::Type type, bool rememberForUndo) {
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
if(rememberForUndo) SS.UndoRemember();
Replace all ZERO and memset with C++11 brace-initialization. This will allow us to use non-POD classes inside these objects in future and is otherwise functionally equivalent, as well as more concise. Note that there are some subtleties with handling of brace-initialization. Specifically: On aggregates (e.g. simple C-style structures) using an empty brace-initializer zero-initializes the aggregate, i.e. it makes all members zero. On non-aggregates an empty brace-initializer calls the default constructor. And if the constructor doesn't explicitly initialize the members (which the auto-generated constructor doesn't) then the members will be constructed but otherwise uninitialized. So, what is an aggregate class? To quote the C++ standard (C++03 8.5.1 §1): An aggregate is an array or a class (clause 9) with no user-declared constructors (12.1), no private or protected non-static data members (clause 11), no base classes (clause 10), and no virtual functions (10.3). In SolveSpace, we only have to handle the case of base classes; Constraint and Entity have those. Thus, they had to gain a default constructor that does nothing but initializes the members to zero.
2015-03-27 15:31:23 +00:00
Request r = {};
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
r.group = activeGroup;
Group *g = SK.GetGroup(activeGroup);
Convert all enumerations to use `enum class`. Specifically, take the old code that looks like this: class Foo { enum { X = 1, Y = 2 }; int kind; } ... foo.kind = Foo::X; ... and convert it to this: class Foo { enum class Kind : uint32_t { X = 1, Y = 2 }; Kind kind; } ... foo.kind = Foo::Kind::X; (In some cases the enumeration would not be in the class namespace, such as when it is generally useful.) The benefits are as follows: * The type of the field gives a clear indication of intent, both to humans and tools (such as binding generators). * The compiler is able to automatically warn when a switch is not exhaustive; but this is currently suppressed by the default: ssassert(false, ...) idiom. * Integers and plain enums are weakly type checked: they implicitly convert into each other. This can hide bugs where type conversion is performed but not intended. Enum classes are strongly type checked. * Plain enums pollute parent namespaces; enum classes do not. Almost every defined enum we have already has a kind of ad-hoc namespacing via `NAMESPACE_`, which is now explicit. * Plain enums do not have a well-defined ABI size, which is important for bindings. Enum classes can have it, if specified. We specify the base type for all enums as uint32_t, which is a safe choice and allows us to not change the numeric values of any variants. This commit introduces absolutely no functional change to the code, just renaming and change of types. It handles almost all cases, except GraphicsWindow::pending.operation, which needs minor functional change.
2016-05-20 08:31:20 +00:00
if(g->type == Group::Type::DRAWING_3D || g->type == Group::Type::DRAWING_WORKPLANE) {
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
r.construction = false;
} else {
r.construction = true;
}
r.workplane = ActiveWorkplane();
r.type = type;
SK.request.AddAndAssignId(&r);
// We must regenerate the parameters, so that the code that tries to
// place this request's entities where the mouse is can do so. But
// we mustn't try to solve until reasonable values have been supplied
// for these new parameters, or else we'll get a numerical blowup.
Don't regenerate the entire sketch in AddRequest(). This is unnecessary and leads to huge slowdowns on large sketches. E.g. this speeds up import of a certain large DXF from ~60s to ~3s.
2016-10-10 20:33:02 +00:00
r.Generate(&SK.entity, &SK.param);
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
SS.MarkGroupDirty(r.group);
return r.h;
}
Snap point to entity when constraining to a hovered entity. Before this commit, when a point is constrained to an entity (point, circle, arc of circle or line segment) by clicking on it, the resulting constraint is not necessarily satisfied, and the next regeneration may place the newly constrained point somewhere other than the intended position. After this commit, the parameters are modified to satisfy the constraint.
2017-02-02 03:48:54 +00:00
Vector GraphicsWindow::SnapToEntityByScreenPoint(Point2d pp, hEntity he) {
Entity *e = SK.GetEntity(he);
if(e->IsPoint()) return e->PointGetNum();
SEdgeList *edges = e->GetOrGenerateEdges();
double minD = -1.0f;
double k;
const SEdge *edge = NULL;
for(const auto &e : edges->l) {
Point2d p0 = ProjectPoint(e.a);
Point2d p1 = ProjectPoint(e.b);
Point2d dir = p1.Minus(p0);
double d = pp.DistanceToLine(p0, dir, /*asSegment=*/true);
if(minD > 0.0 && d > minD) continue;
minD = d;
k = pp.Minus(p0).Dot(dir) / dir.Dot(dir);
edge = &e;
}
if(edge == NULL) return UnProjectPoint(pp);
return edge->a.Plus(edge->b.Minus(edge->a).ScaledBy(k));
}
bool GraphicsWindow::ConstrainPointByHovered(hEntity pt, const Point2d *projected) {
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
if(!hover.entity.v) return false;
Snap point to entity when constraining to a hovered entity. Before this commit, when a point is constrained to an entity (point, circle, arc of circle or line segment) by clicking on it, the resulting constraint is not necessarily satisfied, and the next regeneration may place the newly constrained point somewhere other than the intended position. After this commit, the parameters are modified to satisfy the constraint.
2017-02-02 03:48:54 +00:00
Entity *point = SK.GetEntity(pt);
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
Entity *e = SK.GetEntity(hover.entity);
if(e->IsPoint()) {
Don't move points when automatically constraining coincident. This can change the sketch dramatically, e.g. extrude a rectangle and draw a line diagonally from the top to the bottom face.
2017-01-09 16:57:45 +00:00
point->PointForceTo(e->PointGetNum());
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
Constraint::ConstrainCoincident(e->h, pt);
return true;
}
if(e->IsCircle()) {
Snap point to entity when constraining to a hovered entity. Before this commit, when a point is constrained to an entity (point, circle, arc of circle or line segment) by clicking on it, the resulting constraint is not necessarily satisfied, and the next regeneration may place the newly constrained point somewhere other than the intended position. After this commit, the parameters are modified to satisfy the constraint.
2017-02-02 03:48:54 +00:00
if(projected != NULL) {
Vector snapPos = SnapToEntityByScreenPoint(*projected, e->h);
point->PointForceTo(snapPos);
}
Convert all enumerations to use `enum class`. Specifically, take the old code that looks like this: class Foo { enum { X = 1, Y = 2 }; int kind; } ... foo.kind = Foo::X; ... and convert it to this: class Foo { enum class Kind : uint32_t { X = 1, Y = 2 }; Kind kind; } ... foo.kind = Foo::Kind::X; (In some cases the enumeration would not be in the class namespace, such as when it is generally useful.) The benefits are as follows: * The type of the field gives a clear indication of intent, both to humans and tools (such as binding generators). * The compiler is able to automatically warn when a switch is not exhaustive; but this is currently suppressed by the default: ssassert(false, ...) idiom. * Integers and plain enums are weakly type checked: they implicitly convert into each other. This can hide bugs where type conversion is performed but not intended. Enum classes are strongly type checked. * Plain enums pollute parent namespaces; enum classes do not. Almost every defined enum we have already has a kind of ad-hoc namespacing via `NAMESPACE_`, which is now explicit. * Plain enums do not have a well-defined ABI size, which is important for bindings. Enum classes can have it, if specified. We specify the base type for all enums as uint32_t, which is a safe choice and allows us to not change the numeric values of any variants. This commit introduces absolutely no functional change to the code, just renaming and change of types. It handles almost all cases, except GraphicsWindow::pending.operation, which needs minor functional change.
2016-05-20 08:31:20 +00:00
Constraint::Constrain(Constraint::Type::PT_ON_CIRCLE,
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
pt, Entity::NO_ENTITY, e->h);
return true;
}
Convert all enumerations to use `enum class`. Specifically, take the old code that looks like this: class Foo { enum { X = 1, Y = 2 }; int kind; } ... foo.kind = Foo::X; ... and convert it to this: class Foo { enum class Kind : uint32_t { X = 1, Y = 2 }; Kind kind; } ... foo.kind = Foo::Kind::X; (In some cases the enumeration would not be in the class namespace, such as when it is generally useful.) The benefits are as follows: * The type of the field gives a clear indication of intent, both to humans and tools (such as binding generators). * The compiler is able to automatically warn when a switch is not exhaustive; but this is currently suppressed by the default: ssassert(false, ...) idiom. * Integers and plain enums are weakly type checked: they implicitly convert into each other. This can hide bugs where type conversion is performed but not intended. Enum classes are strongly type checked. * Plain enums pollute parent namespaces; enum classes do not. Almost every defined enum we have already has a kind of ad-hoc namespacing via `NAMESPACE_`, which is now explicit. * Plain enums do not have a well-defined ABI size, which is important for bindings. Enum classes can have it, if specified. We specify the base type for all enums as uint32_t, which is a safe choice and allows us to not change the numeric values of any variants. This commit introduces absolutely no functional change to the code, just renaming and change of types. It handles almost all cases, except GraphicsWindow::pending.operation, which needs minor functional change.
2016-05-20 08:31:20 +00:00
if(e->type == Entity::Type::LINE_SEGMENT) {
Snap point to entity when constraining to a hovered entity. Before this commit, when a point is constrained to an entity (point, circle, arc of circle or line segment) by clicking on it, the resulting constraint is not necessarily satisfied, and the next regeneration may place the newly constrained point somewhere other than the intended position. After this commit, the parameters are modified to satisfy the constraint.
2017-02-02 03:48:54 +00:00
if(projected != NULL) {
Vector snapPos = SnapToEntityByScreenPoint(*projected, e->h);
point->PointForceTo(snapPos);
}
Convert all enumerations to use `enum class`. Specifically, take the old code that looks like this: class Foo { enum { X = 1, Y = 2 }; int kind; } ... foo.kind = Foo::X; ... and convert it to this: class Foo { enum class Kind : uint32_t { X = 1, Y = 2 }; Kind kind; } ... foo.kind = Foo::Kind::X; (In some cases the enumeration would not be in the class namespace, such as when it is generally useful.) The benefits are as follows: * The type of the field gives a clear indication of intent, both to humans and tools (such as binding generators). * The compiler is able to automatically warn when a switch is not exhaustive; but this is currently suppressed by the default: ssassert(false, ...) idiom. * Integers and plain enums are weakly type checked: they implicitly convert into each other. This can hide bugs where type conversion is performed but not intended. Enum classes are strongly type checked. * Plain enums pollute parent namespaces; enum classes do not. Almost every defined enum we have already has a kind of ad-hoc namespacing via `NAMESPACE_`, which is now explicit. * Plain enums do not have a well-defined ABI size, which is important for bindings. Enum classes can have it, if specified. We specify the base type for all enums as uint32_t, which is a safe choice and allows us to not change the numeric values of any variants. This commit introduces absolutely no functional change to the code, just renaming and change of types. It handles almost all cases, except GraphicsWindow::pending.operation, which needs minor functional change.
2016-05-20 08:31:20 +00:00
Constraint::Constrain(Constraint::Type::PT_ON_LINE,
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
pt, Entity::NO_ENTITY, e->h);
return true;
}
return false;
}
Implement a platform abstraction for windows. This commit removes a large amount of code partially duplicated between the text and the graphics windows, and opens the path to having more than one model window on screen at any given time, as well as simplifies platform work. This commit also adds complete support for High-DPI device pixel ratio. It adds support for font scale factor (a fractional factor on top of integral device pixel ratio) on the platform side, but not on the application side. This commit also adds error checking to all Windows API calls (within the abstracted code) and fixes a significant number of misuses and non-future-proof uses of Windows API. This commit also makes uses of Windows API idiomatic, e.g. using the built-in vertical scroll bar, native tooltips, control subclassing instead of hooks in the global dispatch loop, and so on. It reinstates tooltip support and removes menu-related hacks.
2018-07-12 19:29:44 +00:00
bool GraphicsWindow::MouseEvent(Platform::MouseEvent event) {
using Platform::MouseEvent;
double width, height;
window->GetContentSize(&width, &height);
event.x = event.x - width / 2;
event.y = height / 2 - event.y;
switch(event.type) {
case MouseEvent::Type::MOTION:
this->MouseMoved(event.x, event.y,
event.button == MouseEvent::Button::LEFT,
event.button == MouseEvent::Button::MIDDLE,
event.button == MouseEvent::Button::RIGHT,
event.shiftDown,
event.controlDown);
break;
case MouseEvent::Type::PRESS:
if(event.button == MouseEvent::Button::LEFT) {
Deselect entities with Ctrl-LMB. In other words, Ctrl inverts the normal action of LMB. It is already possible to deselect entities through the context menu, but that can be very awkward on laptop touchpads with a crowded sketch; with Ctrl, a misclick is easily corrected without moving cursor at all.
2019-05-24 19:11:56 +00:00
this->MouseLeftDown(event.x, event.y, event.shiftDown, event.controlDown);
Implement a platform abstraction for windows. This commit removes a large amount of code partially duplicated between the text and the graphics windows, and opens the path to having more than one model window on screen at any given time, as well as simplifies platform work. This commit also adds complete support for High-DPI device pixel ratio. It adds support for font scale factor (a fractional factor on top of integral device pixel ratio) on the platform side, but not on the application side. This commit also adds error checking to all Windows API calls (within the abstracted code) and fixes a significant number of misuses and non-future-proof uses of Windows API. This commit also makes uses of Windows API idiomatic, e.g. using the built-in vertical scroll bar, native tooltips, control subclassing instead of hooks in the global dispatch loop, and so on. It reinstates tooltip support and removes menu-related hacks.
2018-07-12 19:29:44 +00:00
} else if(event.button == MouseEvent::Button::MIDDLE ||
event.button == MouseEvent::Button::RIGHT) {
this->MouseMiddleOrRightDown(event.x, event.y);
}
break;
case MouseEvent::Type::DBL_PRESS:
if(event.button == MouseEvent::Button::LEFT) {
this->MouseLeftDoubleClick(event.x, event.y);
}
break;
case MouseEvent::Type::RELEASE:
if(event.button == MouseEvent::Button::LEFT) {
Deselect entities with Ctrl-LMB. In other words, Ctrl inverts the normal action of LMB. It is already possible to deselect entities through the context menu, but that can be very awkward on laptop touchpads with a crowded sketch; with Ctrl, a misclick is easily corrected without moving cursor at all.
2019-05-24 19:11:56 +00:00
this->MouseLeftUp(event.x, event.y, event.shiftDown, event.controlDown);
Implement a platform abstraction for windows. This commit removes a large amount of code partially duplicated between the text and the graphics windows, and opens the path to having more than one model window on screen at any given time, as well as simplifies platform work. This commit also adds complete support for High-DPI device pixel ratio. It adds support for font scale factor (a fractional factor on top of integral device pixel ratio) on the platform side, but not on the application side. This commit also adds error checking to all Windows API calls (within the abstracted code) and fixes a significant number of misuses and non-future-proof uses of Windows API. This commit also makes uses of Windows API idiomatic, e.g. using the built-in vertical scroll bar, native tooltips, control subclassing instead of hooks in the global dispatch loop, and so on. It reinstates tooltip support and removes menu-related hacks.
2018-07-12 19:29:44 +00:00
} else if(event.button == MouseEvent::Button::RIGHT) {
this->MouseRightUp(event.x, event.y);
}
break;
case MouseEvent::Type::SCROLL_VERT:
Make some dubious type conversions explicit. This is to address MSVC warnings. This commit changes a few configuration fields to use double instead of float. There doesn't seem to be any reason these use float except for the legacy Windows code using float for saved configuration. Changing their type to double improves consistency.
2018-07-18 01:13:05 +00:00
this->MouseScroll(event.x, event.y, (int)event.scrollDelta);
Implement a platform abstraction for windows. This commit removes a large amount of code partially duplicated between the text and the graphics windows, and opens the path to having more than one model window on screen at any given time, as well as simplifies platform work. This commit also adds complete support for High-DPI device pixel ratio. It adds support for font scale factor (a fractional factor on top of integral device pixel ratio) on the platform side, but not on the application side. This commit also adds error checking to all Windows API calls (within the abstracted code) and fixes a significant number of misuses and non-future-proof uses of Windows API. This commit also makes uses of Windows API idiomatic, e.g. using the built-in vertical scroll bar, native tooltips, control subclassing instead of hooks in the global dispatch loop, and so on. It reinstates tooltip support and removes menu-related hacks.
2018-07-12 19:29:44 +00:00
break;
case MouseEvent::Type::LEAVE:
this->MouseLeave();
break;
}
return true;
}
Deselect entities with Ctrl-LMB. In other words, Ctrl inverts the normal action of LMB. It is already possible to deselect entities through the context menu, but that can be very awkward on laptop touchpads with a crowded sketch; with Ctrl, a misclick is easily corrected without moving cursor at all.
2019-05-24 19:11:56 +00:00
void GraphicsWindow::MouseLeftDown(double mx, double my, bool shiftDown, bool ctrlDown) {
Add ability to set a background image. I import a png with libpng, load it as a texture, and show it instead of a flat-color background. Includes user interface to specify scale and translation of image, but the rotation is always aligned to the view. [git-p4: depot-paths = "//depot/solvespace/": change = 2071]
2009-11-08 01:11:38 +00:00
orig.mouseDown = true;
Implement a platform abstraction for windows. This commit removes a large amount of code partially duplicated between the text and the graphics windows, and opens the path to having more than one model window on screen at any given time, as well as simplifies platform work. This commit also adds complete support for High-DPI device pixel ratio. It adds support for font scale factor (a fractional factor on top of integral device pixel ratio) on the platform side, but not on the application side. This commit also adds error checking to all Windows API calls (within the abstracted code) and fixes a significant number of misuses and non-future-proof uses of Windows API. This commit also makes uses of Windows API idiomatic, e.g. using the built-in vertical scroll bar, native tooltips, control subclassing instead of hooks in the global dispatch loop, and so on. It reinstates tooltip support and removes menu-related hacks.
2018-07-12 19:29:44 +00:00
if(window->IsEditorVisible()) {
Hide the text or graphics edit control when the user left-clicks somewhere in the text or graphics window. Previously, those left-clicks just did nothing. [git-p4: depot-paths = "//depot/solvespace/": change = 2100]
2010-01-08 09:55:22 +00:00
orig.mouse = Point2d::From(mx, my);
orig.mouseOnButtonDown = orig.mouse;
Implement a platform abstraction for windows. This commit removes a large amount of code partially duplicated between the text and the graphics windows, and opens the path to having more than one model window on screen at any given time, as well as simplifies platform work. This commit also adds complete support for High-DPI device pixel ratio. It adds support for font scale factor (a fractional factor on top of integral device pixel ratio) on the platform side, but not on the application side. This commit also adds error checking to all Windows API calls (within the abstracted code) and fixes a significant number of misuses and non-future-proof uses of Windows API. This commit also makes uses of Windows API idiomatic, e.g. using the built-in vertical scroll bar, native tooltips, control subclassing instead of hooks in the global dispatch loop, and so on. It reinstates tooltip support and removes menu-related hacks.
2018-07-12 19:29:44 +00:00
window->HideEditor();
Hide the text or graphics edit control when the user left-clicks somewhere in the text or graphics window. Previously, those left-clicks just did nothing. [git-p4: depot-paths = "//depot/solvespace/": change = 2100]
2010-01-08 09:55:22 +00:00
return;
}
Put wrappers around the functions to show and hide the edit control in the text window. This means that I can move the conversion from half-row and column to (x, y) into the platform-independent code, and that I'll be ready to add my color picker. [git-p4: depot-paths = "//depot/solvespace/": change = 2171]
2010-07-12 07:51:12 +00:00
SS.TW.HideEditControl();
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
if(SS.showToolbar) {
if(ToolbarMouseDown((int)mx, (int)my)) return;
}
Fix disabling of autoconstrainter via Ctrl.
2016-06-11 22:26:36 +00:00
// This will be clobbered by MouseMoved below.
Skip creating an automatic H/V constraint if it would be redundant. This means that automatically added H/V constraints now will never cause the sketch to become overconstrained, which currently makes that feature almost unusable.
2019-05-24 15:06:53 +00:00
bool hasConstraintSuggestion = pending.hasSuggestion;
Constraint::Type constraintSuggestion = pending.suggestion;
Fix disabling of autoconstrainter via Ctrl.
2016-06-11 22:26:36 +00:00
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
// Make sure the hover is up to date.
Show "Paste" context menu item even when only constraints are copied.
2016-06-20 13:47:14 +00:00
MouseMoved(mx, my, /*leftDown=*/false, /*middleDown=*/false, /*rightDown=*/false,
Annotate constants passed as boolean function arguments. This is to ensure that: * it is clear, when looking at the point of usage, what is the purpose of "true" or "false"; * when refactoring, a simple search will bring up any places that need to be changed. Also, argument names were synchronized between declaration and implementation. As an exception, these are not annotated: * Printf(/*halfLine=*/), to avoid pointless churn.
2016-05-25 12:08:19 +00:00
/*shiftDown=*/false, /*ctrlDown=*/false);
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
orig.mouse.x = mx;
orig.mouse.y = my;
Remove arbitrary limits on the selection size, and permit more than one point to be dragged simultaneously. So now a dragged point drags all the selected points and entities, and a dragged entity drags its points (except for circles, which drag the radius). This means that the number of forced points for the solver must now be unlimited, and it is. Also add commands to invert the selection within the active group, and to select an edge chain starting from the current selection. And redo the context menus a bit; still not great, but less cluttered and more systematic. [git-p4: depot-paths = "//depot/solvespace/": change = 2064]
2009-11-03 18:54:49 +00:00
orig.mouseOnButtonDown = orig.mouse;
Snap point to entity when constraining to a hovered entity. Before this commit, when a point is constrained to an entity (point, circle, arc of circle or line segment) by clicking on it, the resulting constraint is not necessarily satisfied, and the next regeneration may place the newly constrained point somewhere other than the intended position. After this commit, the parameters are modified to satisfy the constraint.
2017-02-02 03:48:54 +00:00
Point2d mouse = Point2d::From(mx, my);
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
// The current mouse location
Vector v = offset.ScaledBy(-1);
v = v.Plus(projRight.ScaledBy(mx/scale));
v = v.Plus(projUp.ScaledBy(my/scale));
Forcibly show the current group once we start a drawing operation.
2016-08-07 12:59:51 +00:00
hRequest hr = {};
hConstraint hc = {};
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
switch(pending.operation) {
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
case Pending::COMMAND:
switch(pending.command) {
case Command::DATUM_POINT:
hr = AddRequest(Request::Type::DATUM_POINT);
SK.GetEntity(hr.entity(0))->PointForceTo(v);
Snap point to entity when constraining to a hovered entity. Before this commit, when a point is constrained to an entity (point, circle, arc of circle or line segment) by clicking on it, the resulting constraint is not necessarily satisfied, and the next regeneration may place the newly constrained point somewhere other than the intended position. After this commit, the parameters are modified to satisfy the constraint.
2017-02-02 03:48:54 +00:00
ConstrainPointByHovered(hr.entity(0), &mouse);
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
ClearSuper();
break;
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
case Command::LINE_SEGMENT:
case Command::CONSTR_SEGMENT:
hr = AddRequest(Request::Type::LINE_SEGMENT);
SK.GetRequest(hr)->construction = (pending.command == Command::CONSTR_SEGMENT);
SK.GetEntity(hr.entity(1))->PointForceTo(v);
Snap point to entity when constraining to a hovered entity. Before this commit, when a point is constrained to an entity (point, circle, arc of circle or line segment) by clicking on it, the resulting constraint is not necessarily satisfied, and the next regeneration may place the newly constrained point somewhere other than the intended position. After this commit, the parameters are modified to satisfy the constraint.
2017-02-02 03:48:54 +00:00
ConstrainPointByHovered(hr.entity(1), &mouse);
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
ClearSuper();
Fix logic introduced in 55ae10b. Before this commit, the effect of the AddPending() call was immediately reversed by ClearSuper.
2017-01-24 16:54:10 +00:00
AddToPending(hr);
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
pending.operation = Pending::DRAGGING_NEW_LINE_POINT;
pending.request = hr;
pending.point = hr.entity(2);
Internationalize all messages without substitutions.
2017-01-07 06:41:13 +00:00
pending.description = _("click next point of line, or press Esc");
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
SK.GetEntity(pending.point)->PointForceTo(v);
break;
Put information about which requests generate which entities, and how many points are associated with each, into a single table. [git-p4: depot-paths = "//depot/solvespace/": change = 2056]
2009-10-22 14:02:08 +00:00
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
case Command::RECTANGLE: {
if(!SS.GW.LockedInWorkplane()) {
Internationalize all messages without substitutions.
2017-01-07 06:41:13 +00:00
Error(_("Can't draw rectangle in 3d; first, activate a workplane "
"with Sketch -> In Workplane."));
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
ClearSuper();
break;
}
hRequest lns[4];
int i;
SS.UndoRemember();
for(i = 0; i < 4; i++) {
Annotate constants passed as boolean function arguments. This is to ensure that: * it is clear, when looking at the point of usage, what is the purpose of "true" or "false"; * when refactoring, a simple search will bring up any places that need to be changed. Also, argument names were synchronized between declaration and implementation. As an exception, these are not annotated: * Printf(/*halfLine=*/), to avoid pointless churn.
2016-05-25 12:08:19 +00:00
lns[i] = AddRequest(Request::Type::LINE_SEGMENT, /*rememberForUndo=*/false);
Do not hover or select entities from any pending request.
2017-01-09 16:54:24 +00:00
AddToPending(lns[i]);
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
}
for(i = 0; i < 4; i++) {
Constraint::ConstrainCoincident(
lns[i].entity(1), lns[(i+1)%4].entity(2));
SK.GetEntity(lns[i].entity(1))->PointForceTo(v);
SK.GetEntity(lns[i].entity(2))->PointForceTo(v);
}
for(i = 0; i < 4; i++) {
Constraint::Constrain(
(i % 2) ? Constraint::Type::HORIZONTAL : Constraint::Type::VERTICAL,
Entity::NO_ENTITY, Entity::NO_ENTITY,
lns[i].entity(0));
}
Snap point to entity when constraining to a hovered entity. Before this commit, when a point is constrained to an entity (point, circle, arc of circle or line segment) by clicking on it, the resulting constraint is not necessarily satisfied, and the next regeneration may place the newly constrained point somewhere other than the intended position. After this commit, the parameters are modified to satisfy the constraint.
2017-02-02 03:48:54 +00:00
if(ConstrainPointByHovered(lns[2].entity(1), &mouse)) {
Don't move points when automatically constraining coincident. This can change the sketch dramatically, e.g. extrude a rectangle and draw a line diagonally from the top to the bottom face.
2017-01-09 16:57:45 +00:00
Vector pos = SK.GetEntity(lns[2].entity(1))->PointGetNum();
for(i = 0; i < 4; i++) {
SK.GetEntity(lns[i].entity(1))->PointForceTo(pos);
SK.GetEntity(lns[i].entity(2))->PointForceTo(pos);
}
}
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
pending.operation = Pending::DRAGGING_NEW_POINT;
pending.point = lns[1].entity(2);
Internationalize all messages without substitutions.
2017-01-07 06:41:13 +00:00
pending.description = _("click to place other corner of rectangle");
Forcibly show the current group once we start a drawing operation.
2016-08-07 12:59:51 +00:00
hr = lns[0];
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
break;
}
case Command::CIRCLE:
hr = AddRequest(Request::Type::CIRCLE);
// Centered where we clicked
SK.GetEntity(hr.entity(1))->PointForceTo(v);
// Normal to the screen
SK.GetEntity(hr.entity(32))->NormalForceTo(
Quaternion::From(SS.GW.projRight, SS.GW.projUp));
// Initial radius zero
SK.GetEntity(hr.entity(64))->DistanceForceTo(0);
Snap point to entity when constraining to a hovered entity. Before this commit, when a point is constrained to an entity (point, circle, arc of circle or line segment) by clicking on it, the resulting constraint is not necessarily satisfied, and the next regeneration may place the newly constrained point somewhere other than the intended position. After this commit, the parameters are modified to satisfy the constraint.
2017-02-02 03:48:54 +00:00
ConstrainPointByHovered(hr.entity(1), &mouse);
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
ClearSuper();
pending.operation = Pending::DRAGGING_NEW_RADIUS;
pending.circle = hr.entity(0);
Internationalize all messages without substitutions.
2017-01-07 06:41:13 +00:00
pending.description = _("click to set radius");
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
break;
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
case Command::ARC: {
if(!SS.GW.LockedInWorkplane()) {
Internationalize all messages without substitutions.
2017-01-07 06:41:13 +00:00
Error(_("Can't draw arc in 3d; first, activate a workplane "
"with Sketch -> In Workplane."));
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
ClearPending();
break;
}
hr = AddRequest(Request::Type::ARC_OF_CIRCLE);
// This fudge factor stops us from immediately failing to solve
// because of the arc's implicit (equal radius) tangent.
Vector adj = SS.GW.projRight.WithMagnitude(2/SS.GW.scale);
SK.GetEntity(hr.entity(1))->PointForceTo(v.Minus(adj));
SK.GetEntity(hr.entity(2))->PointForceTo(v);
SK.GetEntity(hr.entity(3))->PointForceTo(v);
Snap point to entity when constraining to a hovered entity. Before this commit, when a point is constrained to an entity (point, circle, arc of circle or line segment) by clicking on it, the resulting constraint is not necessarily satisfied, and the next regeneration may place the newly constrained point somewhere other than the intended position. After this commit, the parameters are modified to satisfy the constraint.
2017-02-02 03:48:54 +00:00
ConstrainPointByHovered(hr.entity(2), &mouse);
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
ClearSuper();
Fix logic introduced in 55ae10b. Before this commit, the effect of the AddPending() call was immediately reversed by ClearSuper.
2017-01-24 16:54:10 +00:00
AddToPending(hr);
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
pending.operation = Pending::DRAGGING_NEW_ARC_POINT;
pending.point = hr.entity(3);
Internationalize all messages without substitutions.
2017-01-07 06:41:13 +00:00
pending.description = _("click to place point");
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
break;
}
case Command::CUBIC:
hr = AddRequest(Request::Type::CUBIC);
SK.GetEntity(hr.entity(1))->PointForceTo(v);
SK.GetEntity(hr.entity(2))->PointForceTo(v);
SK.GetEntity(hr.entity(3))->PointForceTo(v);
SK.GetEntity(hr.entity(4))->PointForceTo(v);
Snap point to entity when constraining to a hovered entity. Before this commit, when a point is constrained to an entity (point, circle, arc of circle or line segment) by clicking on it, the resulting constraint is not necessarily satisfied, and the next regeneration may place the newly constrained point somewhere other than the intended position. After this commit, the parameters are modified to satisfy the constraint.
2017-02-02 03:48:54 +00:00
ConstrainPointByHovered(hr.entity(1), &mouse);
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
ClearSuper();
Fix logic introduced in 55ae10b. Before this commit, the effect of the AddPending() call was immediately reversed by ClearSuper.
2017-01-24 16:54:10 +00:00
AddToPending(hr);
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
pending.operation = Pending::DRAGGING_NEW_CUBIC_POINT;
pending.point = hr.entity(4);
Internationalize all messages without substitutions.
2017-01-07 06:41:13 +00:00
pending.description = _("click next point of cubic, or press Esc");
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
break;
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
case Command::WORKPLANE:
if(LockedInWorkplane()) {
Internationalize all messages without substitutions.
2017-01-07 06:41:13 +00:00
Error(_("Sketching in a workplane already; sketch in 3d before "
"creating new workplane."));
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
ClearSuper();
break;
}
hr = AddRequest(Request::Type::WORKPLANE);
SK.GetEntity(hr.entity(1))->PointForceTo(v);
SK.GetEntity(hr.entity(32))->NormalForceTo(
Quaternion::From(SS.GW.projRight, SS.GW.projUp));
Snap point to entity when constraining to a hovered entity. Before this commit, when a point is constrained to an entity (point, circle, arc of circle or line segment) by clicking on it, the resulting constraint is not necessarily satisfied, and the next regeneration may place the newly constrained point somewhere other than the intended position. After this commit, the parameters are modified to satisfy the constraint.
2017-02-02 03:48:54 +00:00
ConstrainPointByHovered(hr.entity(1), &mouse);
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
ClearSuper();
break;
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
case Command::TTF_TEXT: {
if(!SS.GW.LockedInWorkplane()) {
Internationalize all messages without substitutions.
2017-01-07 06:41:13 +00:00
Error(_("Can't draw text in 3d; first, activate a workplane "
"with Sketch -> In Workplane."));
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
ClearSuper();
break;
}
hr = AddRequest(Request::Type::TTF_TEXT);
Fix logic introduced in 55ae10b. Before this commit, the effect of the AddPending() call was immediately reversed by ClearSuper.
2017-01-24 16:54:10 +00:00
AddToPending(hr);
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
Request *r = SK.GetRequest(hr);
r->str = "Abc";
Add a built-in Bitstream Vera Sans Roman font. Before this commit, the default font chosen for TTF text is Arial (chosen by the basename of arial.ttf), which isn't present on most Linux systems, and cannot be redistributed. After this commit, it is replaced with Bitstream Vera Sans, which can be. Existing files are not affected. The font name in the TTF file was artificially modified to add the (built-in) suffix, which will need to be done if more built-in fonts are added.
2018-07-12 18:58:44 +00:00
r->font = "BitstreamVeraSans-Roman-builtin.ttf";
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
Make help text for image and TTF request creation reflect reality. Before this commit it would prompt for top left and bottom left corner, neither of which was what in fact was being used. Those two specific points cannot be used because of the way equations are written, so instead change that to top left and bottom right, which is more convenient anyway.
2017-05-16 15:21:12 +00:00
for(int i = 1; i <= 4; i++) {
SK.GetEntity(hr.entity(i))->PointForceTo(v);
}
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
pending.operation = Pending::DRAGGING_NEW_POINT;
Make help text for image and TTF request creation reflect reality. Before this commit it would prompt for top left and bottom left corner, neither of which was what in fact was being used. Those two specific points cannot be used because of the way equations are written, so instead change that to top left and bottom right, which is more convenient anyway.
2017-05-16 15:21:12 +00:00
pending.point = hr.entity(3);
pending.description = _("click to place bottom right of text");
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
break;
}
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
Implement an image request.
2016-11-29 16:49:20 +00:00
case Command::IMAGE: {
if(!SS.GW.LockedInWorkplane()) {
Error(_("Can't draw image in 3d; first, activate a workplane "
"with Sketch -> In Workplane."));
ClearSuper();
break;
}
hr = AddRequest(Request::Type::IMAGE);
AddToPending(hr);
Request *r = SK.GetRequest(hr);
r->file = pending.filename;
Make help text for image and TTF request creation reflect reality. Before this commit it would prompt for top left and bottom left corner, neither of which was what in fact was being used. Those two specific points cannot be used because of the way equations are written, so instead change that to top left and bottom right, which is more convenient anyway.
2017-05-16 15:21:12 +00:00
for(int i = 1; i <= 4; i++) {
SK.GetEntity(hr.entity(i))->PointForceTo(v);
}
Implement an image request.
2016-11-29 16:49:20 +00:00
pending.operation = Pending::DRAGGING_NEW_POINT;
Make help text for image and TTF request creation reflect reality. Before this commit it would prompt for top left and bottom left corner, neither of which was what in fact was being used. Those two specific points cannot be used because of the way equations are written, so instead change that to top left and bottom right, which is more convenient anyway.
2017-05-16 15:21:12 +00:00
pending.point = hr.entity(3);
pending.description = "click to place bottom right of image";
Implement an image request.
2016-11-29 16:49:20 +00:00
break;
}
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
case Command::COMMENT: {
ClearSuper();
Constraint c = {};
c.group = SS.GW.activeGroup;
c.workplane = SS.GW.ActiveWorkplane();
c.type = Constraint::Type::COMMENT;
c.disp.offset = v;
Internationalize all messages without substitutions.
2017-01-07 06:41:13 +00:00
c.comment = _("NEW COMMENT -- DOUBLE-CLICK TO EDIT");
Forcibly show the current group once we start a drawing operation.
2016-08-07 12:59:51 +00:00
hc = Constraint::AddConstraint(&c);
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
break;
}
default: ssassert(false, "Unexpected pending menu id");
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
}
break;
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
case Pending::DRAGGING_RADIUS:
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
ClearPending();
break;
Automatically constrain arc or rectangle points.
2017-01-11 04:16:48 +00:00
case Pending::DRAGGING_NEW_POINT:
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
case Pending::DRAGGING_NEW_ARC_POINT:
Snap point to entity when constraining to a hovered entity. Before this commit, when a point is constrained to an entity (point, circle, arc of circle or line segment) by clicking on it, the resulting constraint is not necessarily satisfied, and the next regeneration may place the newly constrained point somewhere other than the intended position. After this commit, the parameters are modified to satisfy the constraint.
2017-02-02 03:48:54 +00:00
ConstrainPointByHovered(pending.point, &mouse);
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
ClearPending();
break;
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
case Pending::DRAGGING_NEW_CUBIC_POINT: {
Add interpolating splines: both periodic splines (that form a loop), and open-ended splines, with their tangents specified at their endpoints. Also change constraint solver matrix size to 1024, on the theory that a power of two will generate better array indexing, and replace fabs() with my own function that for some reason is faster. [git-p4: depot-paths = "//depot/solvespace/": change = 2055]
2009-10-21 04:46:01 +00:00
hRequest hr = pending.point.request();
Request *r = SK.GetRequest(hr);
Use the new equality/inequality operators of handles to reduce references to .v. NFC.
2019-07-09 14:44:57 +00:00
if(hover.entity == hr.entity(1) && r->extraPoints >= 2) {
Add interpolating splines: both periodic splines (that form a loop), and open-ended splines, with their tangents specified at their endpoints. Also change constraint solver matrix size to 1024, on the theory that a power of two will generate better array indexing, and replace fabs() with my own function that for some reason is faster. [git-p4: depot-paths = "//depot/solvespace/": change = 2055]
2009-10-21 04:46:01 +00:00
// They want the endpoints coincident, which means a periodic
// spline instead.
Convert all enumerations to use `enum class`. Specifically, take the old code that looks like this: class Foo { enum { X = 1, Y = 2 }; int kind; } ... foo.kind = Foo::X; ... and convert it to this: class Foo { enum class Kind : uint32_t { X = 1, Y = 2 }; Kind kind; } ... foo.kind = Foo::Kind::X; (In some cases the enumeration would not be in the class namespace, such as when it is generally useful.) The benefits are as follows: * The type of the field gives a clear indication of intent, both to humans and tools (such as binding generators). * The compiler is able to automatically warn when a switch is not exhaustive; but this is currently suppressed by the default: ssassert(false, ...) idiom. * Integers and plain enums are weakly type checked: they implicitly convert into each other. This can hide bugs where type conversion is performed but not intended. Enum classes are strongly type checked. * Plain enums pollute parent namespaces; enum classes do not. Almost every defined enum we have already has a kind of ad-hoc namespacing via `NAMESPACE_`, which is now explicit. * Plain enums do not have a well-defined ABI size, which is important for bindings. Enum classes can have it, if specified. We specify the base type for all enums as uint32_t, which is a safe choice and allows us to not change the numeric values of any variants. This commit introduces absolutely no functional change to the code, just renaming and change of types. It handles almost all cases, except GraphicsWindow::pending.operation, which needs minor functional change.
2016-05-20 08:31:20 +00:00
r->type = Request::Type::CUBIC_PERIODIC;
Add interpolating splines: both periodic splines (that form a loop), and open-ended splines, with their tangents specified at their endpoints. Also change constraint solver matrix size to 1024, on the theory that a power of two will generate better array indexing, and replace fabs() with my own function that for some reason is faster. [git-p4: depot-paths = "//depot/solvespace/": change = 2055]
2009-10-21 04:46:01 +00:00
// Remove the off-curve control points, which are no longer
// needed here; so move [2,ep+1] down, skipping first pt.
int i;
for(i = 2; i <= r->extraPoints+1; i++) {
SK.GetEntity(hr.entity((i-1)+1))->PointForceTo(
SK.GetEntity(hr.entity(i+1))->PointGetNum());
}
// and move ep+3 down by two, skipping both
SK.GetEntity(hr.entity((r->extraPoints+1)+1))->PointForceTo(
SK.GetEntity(hr.entity((r->extraPoints+3)+1))->PointGetNum());
r->extraPoints -= 2;
// And we're done.
SS.MarkGroupDirty(r->group);
ClearPending();
break;
}
Snap point to entity when constraining to a hovered entity. Before this commit, when a point is constrained to an entity (point, circle, arc of circle or line segment) by clicking on it, the resulting constraint is not necessarily satisfied, and the next regeneration may place the newly constrained point somewhere other than the intended position. After this commit, the parameters are modified to satisfy the constraint.
2017-02-02 03:48:54 +00:00
if(ConstrainPointByHovered(pending.point, &mouse)) {
Add interpolating splines: both periodic splines (that form a loop), and open-ended splines, with their tangents specified at their endpoints. Also change constraint solver matrix size to 1024, on the theory that a power of two will generate better array indexing, and replace fabs() with my own function that for some reason is faster. [git-p4: depot-paths = "//depot/solvespace/": change = 2055]
2009-10-21 04:46:01 +00:00
ClearPending();
break;
}
Entity e;
Use casts to bridge mismatches in integer-type sizes and signedness The compiler gets nervous when we (for example) pass in a size_t as an int parameter, or assign an int to a char, or assign -1 to an unsigned type. By adding appropriate casts, we inform the compiler that, yes, we know what we're doing. This change also upgrades a va_arg() type from char to int, as char is always promoted to int when passed through '...'.
2013-08-26 20:09:15 +00:00
if(r->extraPoints >= (int)arraylen(e.point) - 4) {
Add interpolating splines: both periodic splines (that form a loop), and open-ended splines, with their tangents specified at their endpoints. Also change constraint solver matrix size to 1024, on the theory that a power of two will generate better array indexing, and replace fabs() with my own function that for some reason is faster. [git-p4: depot-paths = "//depot/solvespace/": change = 2055]
2009-10-21 04:46:01 +00:00
ClearPending();
break;
}
(SK.GetRequest(hr)->extraPoints)++;
Convert all enumerations to use `enum class`. Specifically, take the old code that looks like this: class Foo { enum { X = 1, Y = 2 }; int kind; } ... foo.kind = Foo::X; ... and convert it to this: class Foo { enum class Kind : uint32_t { X = 1, Y = 2 }; Kind kind; } ... foo.kind = Foo::Kind::X; (In some cases the enumeration would not be in the class namespace, such as when it is generally useful.) The benefits are as follows: * The type of the field gives a clear indication of intent, both to humans and tools (such as binding generators). * The compiler is able to automatically warn when a switch is not exhaustive; but this is currently suppressed by the default: ssassert(false, ...) idiom. * Integers and plain enums are weakly type checked: they implicitly convert into each other. This can hide bugs where type conversion is performed but not intended. Enum classes are strongly type checked. * Plain enums pollute parent namespaces; enum classes do not. Almost every defined enum we have already has a kind of ad-hoc namespacing via `NAMESPACE_`, which is now explicit. * Plain enums do not have a well-defined ABI size, which is important for bindings. Enum classes can have it, if specified. We specify the base type for all enums as uint32_t, which is a safe choice and allows us to not change the numeric values of any variants. This commit introduces absolutely no functional change to the code, just renaming and change of types. It handles almost all cases, except GraphicsWindow::pending.operation, which needs minor functional change.
2016-05-20 08:31:20 +00:00
SS.GenerateAll(SolveSpaceUI::Generate::REGEN);
Add interpolating splines: both periodic splines (that form a loop), and open-ended splines, with their tangents specified at their endpoints. Also change constraint solver matrix size to 1024, on the theory that a power of two will generate better array indexing, and replace fabs() with my own function that for some reason is faster. [git-p4: depot-paths = "//depot/solvespace/": change = 2055]
2009-10-21 04:46:01 +00:00
int ep = r->extraPoints;
Vector last = SK.GetEntity(hr.entity(3+ep))->PointGetNum();
SK.GetEntity(hr.entity(2+ep))->PointForceTo(last);
SK.GetEntity(hr.entity(3+ep))->PointForceTo(v);
SK.GetEntity(hr.entity(4+ep))->PointForceTo(v);
pending.point = hr.entity(4+ep);
break;
}
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
case Pending::DRAGGING_NEW_LINE_POINT: {
A big nasty change, originally just to add paste transformed. So it does that, and adds a scale factor to that transformation (instead of just mirroring, as before), but also: * Replace the "import mirrored" mechanism with a scale factor, which if negative corresponds to a reflection as well. * Fix self-intersection checker to report a meaningful point when edges are collinear. * Don't blow an assertion on some types of invalid file; instead provide a nice error message to the user. * Clear the naked edges before each regen. * Don't create zero-length line segments by snapping a line segment's end to its beginning. [git-p4: depot-paths = "//depot/solvespace/": change = 2086]
2009-12-15 12:26:22 +00:00
if(hover.entity.v) {
Entity *e = SK.GetEntity(hover.entity);
if(e->IsPoint()) {
hRequest hrl = pending.point.request();
Entity *sp = SK.GetEntity(hrl.entity(1));
if(( e->PointGetNum()).Equals(
(sp->PointGetNum())))
{
// If we constrained by the hovered point, then we
// would create a zero-length line segment. That's
// not good, so just stop drawing.
ClearPending();
break;
}
}
}
Skip creating an automatic H/V constraint if it would be redundant. This means that automatically added H/V constraints now will never cause the sketch to become overconstrained, which currently makes that feature almost unusable.
2019-05-24 15:06:53 +00:00
bool doneDragging = ConstrainPointByHovered(pending.point, &mouse);
// Constrain the line segment horizontal or vertical if close enough
if(hasConstraintSuggestion) {
Constraint::TryConstrain(constraintSuggestion,
Entity::NO_ENTITY, Entity::NO_ENTITY, pending.request.entity(0));
}
if(doneDragging) {
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
ClearPending();
break;
}
A big nasty change, originally just to add paste transformed. So it does that, and adds a scale factor to that transformation (instead of just mirroring, as before), but also: * Replace the "import mirrored" mechanism with a scale factor, which if negative corresponds to a reflection as well. * Fix self-intersection checker to report a meaningful point when edges are collinear. * Don't blow an assertion on some types of invalid file; instead provide a nice error message to the user. * Clear the naked edges before each regen. * Don't create zero-length line segments by snapping a line segment's end to its beginning. [git-p4: depot-paths = "//depot/solvespace/": change = 2086]
2009-12-15 12:26:22 +00:00
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
// Create a new line segment, so that we continue drawing.
Convert all enumerations to use `enum class`. Specifically, take the old code that looks like this: class Foo { enum { X = 1, Y = 2 }; int kind; } ... foo.kind = Foo::X; ... and convert it to this: class Foo { enum class Kind : uint32_t { X = 1, Y = 2 }; Kind kind; } ... foo.kind = Foo::Kind::X; (In some cases the enumeration would not be in the class namespace, such as when it is generally useful.) The benefits are as follows: * The type of the field gives a clear indication of intent, both to humans and tools (such as binding generators). * The compiler is able to automatically warn when a switch is not exhaustive; but this is currently suppressed by the default: ssassert(false, ...) idiom. * Integers and plain enums are weakly type checked: they implicitly convert into each other. This can hide bugs where type conversion is performed but not intended. Enum classes are strongly type checked. * Plain enums pollute parent namespaces; enum classes do not. Almost every defined enum we have already has a kind of ad-hoc namespacing via `NAMESPACE_`, which is now explicit. * Plain enums do not have a well-defined ABI size, which is important for bindings. Enum classes can have it, if specified. We specify the base type for all enums as uint32_t, which is a safe choice and allows us to not change the numeric values of any variants. This commit introduces absolutely no functional change to the code, just renaming and change of types. It handles almost all cases, except GraphicsWindow::pending.operation, which needs minor functional change.
2016-05-20 08:31:20 +00:00
hRequest hr = AddRequest(Request::Type::LINE_SEGMENT);
Fix logic introduced in 55ae10b. Before this commit, the effect of the AddPending() call was immediately reversed by ClearSuper.
2017-01-24 16:54:10 +00:00
ReplacePending(pending.request, hr);
Add a shortcut for drawing construction line segments. Almost all construction requests are lines, and allowing to draw them as construction obviates the need to select them one by one afterwards to convert them. Also, it removes the "not closed contour" error message, which is a nice usability improvement.
2015-07-06 02:45:28 +00:00
SK.GetRequest(hr)->construction = SK.GetRequest(pending.request)->construction;
Don't create new line segments as zero-length when left-clicking to draw more line segments, to avoid annoying warnings. [git-p4: depot-paths = "//depot/solvespace/": change = 2083]
2009-12-03 19:47:44 +00:00
// Displace the second point of the new line segment slightly,
// to avoid creating zero-length edge warnings.
SK.GetEntity(hr.entity(2))->PointForceTo(
v.Plus(projRight.ScaledBy(0.5/scale)));
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
// Constrain the line segments to share an endpoint
Constraint::ConstrainCoincident(pending.point, hr.entity(1));
Snap point to entity when constraining to a hovered entity. Before this commit, when a point is constrained to an entity (point, circle, arc of circle or line segment) by clicking on it, the resulting constraint is not necessarily satisfied, and the next regeneration may place the newly constrained point somewhere other than the intended position. After this commit, the parameters are modified to satisfy the constraint.
2017-02-02 03:48:54 +00:00
Vector pendingPos = SK.GetEntity(pending.point)->PointGetNum();
SK.GetEntity(hr.entity(1))->PointForceTo(pendingPos);
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
// And drag an endpoint of the new line segment
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
pending.operation = Pending::DRAGGING_NEW_LINE_POINT;
Automatically add horz/vert constraints to lines if close enough.
2015-03-29 22:26:07 +00:00
pending.request = hr;
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
pending.point = hr.entity(2);
Internationalize all messages without substitutions.
2017-01-07 06:41:13 +00:00
pending.description = _("click next point of line, or press Esc");
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
break;
}
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
case Pending::NONE:
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
default:
ClearPending();
Remove the toggle semantics from all the selection stuff. Now left-clicking always selects, and there's a special context menu item to deselect. Also streamline the right-click behavior by making that select the hovered item, and making all the context menu items work on the selection. [git-p4: depot-paths = "//depot/solvespace/": change = 2091]
2010-01-03 10:26:15 +00:00
if(!hover.IsEmpty()) {
Deselect entities with Ctrl-LMB. In other words, Ctrl inverts the normal action of LMB. It is already possible to deselect entities through the context menu, but that can be very awkward on laptop touchpads with a crowded sketch; with Ctrl, a misclick is easily corrected without moving cursor at all.
2019-05-24 19:11:56 +00:00
if(!ctrlDown) {
hoverWasSelectedOnMousedown = IsSelected(&hover);
MakeSelected(&hover);
} else {
MakeUnselected(&hover, /*coincidentPointTrick=*/true);
}
Tweak drag and selection behavior: selection is kept after dragging selected entities, but cleared after dragging an unselected entity. Marquee selection is select-only (not toggle), and "Select All" replaces "Invert Selection". Left-click on nothing will clear the selection. Also add context menu entries for cut, copy, and paste. [git-p4: depot-paths = "//depot/solvespace/": change = 2089]
2009-12-21 16:44:00 +00:00
}
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
break;
}
Forcibly show the current group once we start a drawing operation.
2016-08-07 12:59:51 +00:00
// Activate group with newly created request/constraint
Group *g = NULL;
if(hr.v != 0) {
g = SK.GetGroup(SK.GetRequest(hr)->group);
}
if(hc.v != 0) {
g = SK.GetGroup(SK.GetConstraint(hc)->group);
}
if(g != NULL) {
g->visible = true;
}
Add a GTK2/3 port. In principle, GTK3 is the way forward, and GTK2 is officially deprecated, though still maintained. In practice however, GTK3 is often unbearably buggy; e.g. on my system, combo boxes don't ever roll up in GTK3 windows. So I have added support for both. This required a few minor changes to the core, namely: * GTK wants to know beforehand whether a menu item is a check menu item or a regular one. * GTK doesn't give us an easy way to execute something after any event is processed, so an explicit idle timer is added. This is a no-op on Win32. * A few function signatures were const'ed, since GTK expects immutable strings when converting to Glib::ustring.
2015-03-18 17:02:11 +00:00
SS.ScheduleShowTW();
Implement a platform abstraction for windows. This commit removes a large amount of code partially duplicated between the text and the graphics windows, and opens the path to having more than one model window on screen at any given time, as well as simplifies platform work. This commit also adds complete support for High-DPI device pixel ratio. It adds support for font scale factor (a fractional factor on top of integral device pixel ratio) on the platform side, but not on the application side. This commit also adds error checking to all Windows API calls (within the abstracted code) and fixes a significant number of misuses and non-future-proof uses of Windows API. This commit also makes uses of Windows API idiomatic, e.g. using the built-in vertical scroll bar, native tooltips, control subclassing instead of hooks in the global dispatch loop, and so on. It reinstates tooltip support and removes menu-related hacks.
2018-07-12 19:29:44 +00:00
Invalidate();
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
}
Deselect entities with Ctrl-LMB. In other words, Ctrl inverts the normal action of LMB. It is already possible to deselect entities through the context menu, but that can be very awkward on laptop touchpads with a crowded sketch; with Ctrl, a misclick is easily corrected without moving cursor at all.
2019-05-24 19:11:56 +00:00
void GraphicsWindow::MouseLeftUp(double mx, double my, bool shiftDown, bool ctrlDown) {
Add ability to set a background image. I import a png with libpng, load it as a texture, and show it instead of a flat-color background. Includes user interface to specify scale and translation of image, but the rotation is always aligned to the view. [git-p4: depot-paths = "//depot/solvespace/": change = 2071]
2009-11-08 01:11:38 +00:00
orig.mouseDown = false;
Remove the toggle semantics from all the selection stuff. Now left-clicking always selects, and there's a special context menu item to deselect. Also streamline the right-click behavior by making that select the hovered item, and making all the context menu items work on the selection. [git-p4: depot-paths = "//depot/solvespace/": change = 2091]
2010-01-03 10:26:15 +00:00
hoverWasSelectedOnMousedown = false;
Add ability to set a background image. I import a png with libpng, load it as a texture, and show it instead of a flat-color background. Includes user interface to specify scale and translation of image, but the rotation is always aligned to the view. [git-p4: depot-paths = "//depot/solvespace/": change = 2071]
2009-11-08 01:11:38 +00:00
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
switch(pending.operation) {
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
case Pending::DRAGGING_POINTS:
Fix some cases where the green line (that indicates the center of an in-plane rotation of the view, or of a set of entities) would remain on screen after the action was over. [git-p4: depot-paths = "//depot/solvespace/": change = 2142]
2010-05-12 04:47:58 +00:00
SS.extraLine.draw = false;
// fall through
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
case Pending::DRAGGING_CONSTRAINT:
case Pending::DRAGGING_NORMAL:
case Pending::DRAGGING_RADIUS:
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
ClearPending();
Implement a platform abstraction for windows. This commit removes a large amount of code partially duplicated between the text and the graphics windows, and opens the path to having more than one model window on screen at any given time, as well as simplifies platform work. This commit also adds complete support for High-DPI device pixel ratio. It adds support for font scale factor (a fractional factor on top of integral device pixel ratio) on the platform side, but not on the application side. This commit also adds error checking to all Windows API calls (within the abstracted code) and fixes a significant number of misuses and non-future-proof uses of Windows API. This commit also makes uses of Windows API idiomatic, e.g. using the built-in vertical scroll bar, native tooltips, control subclassing instead of hooks in the global dispatch loop, and so on. It reinstates tooltip support and removes menu-related hacks.
2018-07-12 19:29:44 +00:00
Invalidate();
Add marquee selection, a view-aligned rectangle such that everything even partially within that rectangle gets selected when I release. Also make deselecting a point deselect all coincident points too; otherwise there now exist ways to select both coincident points, which meant that it was impossible to deselect the lower one. And fix text window to show selection info even if just constraints are selected, seems more consistent. [git-p4: depot-paths = "//depot/solvespace/": change = 2066]
2009-11-04 07:52:58 +00:00
break;
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
case Pending::DRAGGING_MARQUEE:
Add marquee selection, a view-aligned rectangle such that everything even partially within that rectangle gets selected when I release. Also make deselecting a point deselect all coincident points too; otherwise there now exist ways to select both coincident points, which meant that it was impossible to deselect the lower one. And fix text window to show selection info even if just constraints are selected, seems more consistent. [git-p4: depot-paths = "//depot/solvespace/": change = 2066]
2009-11-04 07:52:58 +00:00
SelectByMarquee();
ClearPending();
Implement a platform abstraction for windows. This commit removes a large amount of code partially duplicated between the text and the graphics windows, and opens the path to having more than one model window on screen at any given time, as well as simplifies platform work. This commit also adds complete support for High-DPI device pixel ratio. It adds support for font scale factor (a fractional factor on top of integral device pixel ratio) on the platform side, but not on the application side. This commit also adds error checking to all Windows API calls (within the abstracted code) and fixes a significant number of misuses and non-future-proof uses of Windows API. This commit also makes uses of Windows API idiomatic, e.g. using the built-in vertical scroll bar, native tooltips, control subclassing instead of hooks in the global dispatch loop, and so on. It reinstates tooltip support and removes menu-related hacks.
2018-07-12 19:29:44 +00:00
Invalidate();
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
break;
Convert GraphicsWindow::pending.operation to `enum class`. This follows the previous commit. Unlike it, though, a small change to control flow is made to separate the command and pending operation enumerations.
2016-05-23 10:15:38 +00:00
case Pending::NONE:
Deselect entities with Ctrl-LMB. In other words, Ctrl inverts the normal action of LMB. It is already possible to deselect entities through the context menu, but that can be very awkward on laptop touchpads with a crowded sketch; with Ctrl, a misclick is easily corrected without moving cursor at all.
2019-05-24 19:11:56 +00:00
if(hover.IsEmpty() && !ctrlDown) {
Tweak drag and selection behavior: selection is kept after dragging selected entities, but cleared after dragging an unselected entity. Marquee selection is select-only (not toggle), and "Select All" replaces "Invert Selection". Left-click on nothing will clear the selection. Also add context menu entries for cut, copy, and paste. [git-p4: depot-paths = "//depot/solvespace/": change = 2089]
2009-12-21 16:44:00 +00:00
ClearSelection();
}
break;
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
default:
break; // do nothing
}
}
Add an option to edit dimension immediately after adding.
2019-11-26 22:34:53 +00:00
void GraphicsWindow::EditConstraint(hConstraint constraint) {
constraintBeingEdited = constraint;
ClearSuper();
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
Add an option to edit dimension immediately after adding.
2019-11-26 22:34:53 +00:00
Constraint *c = SK.GetConstraint(constraintBeingEdited);
if(!c->HasLabel()) {
// Not meaningful to edit a constraint without a dimension
return;
}
if(c->reference) {
// Not meaningful to edit a reference dimension
return;
}
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
Add an option to edit dimension immediately after adding.
2019-11-26 22:34:53 +00:00
Vector p3 = c->GetLabelPos(GetCamera());
Point2d p2 = ProjectPoint(p3);
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
Add an option to edit dimension immediately after adding.
2019-11-26 22:34:53 +00:00
std::string editValue;
std::string editPlaceholder;
switch(c->type) {
case Constraint::Type::COMMENT:
editValue = c->comment;
editPlaceholder = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
break;
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
Add an option to edit dimension immediately after adding.
2019-11-26 22:34:53 +00:00
default: {
double value = fabs(c->valA);
Allow displaying and editing diameter constraints as radius. The savefile format is not changed; the display option is stored in Constraint::other.
2015-03-22 13:07:49 +00:00
Add an option to edit dimension immediately after adding.
2019-11-26 22:34:53 +00:00
// If displayed as radius, also edit as radius.
if(c->type == Constraint::Type::DIAMETER && c->other)
value /= 2;
Allow configuring the amount of digits displayed after decimal point. This is useful in niche cases, like making angular measurement tools. Also, use simpler and more principled code for numeric precision while editing constraints: don't special-case angles, but use up to 10 digits after the decimal point for everything.
2019-05-23 17:19:37 +00:00
Add an option to edit dimension immediately after adding.
2019-11-26 22:34:53 +00:00
// Try showing value with default number of digits after decimal first.
if(c->type == Constraint::Type::LENGTH_RATIO) {
editValue = ssprintf("%.3f", value);
} else if(c->type == Constraint::Type::ANGLE) {
editValue = SS.DegreeToString(value);
} else {
editValue = SS.MmToString(value);
value /= SS.MmPerUnit();
Make default text in dimension box the exact (up to ten digits after decimal) current value of the dimension, not the value truncated to the same number of digits that are usually displayed. And make the paste transformed screen accept expressions, not just integers, for the count, angle, and scale. [git-p4: depot-paths = "//depot/solvespace/": change = 2181]
2010-10-12 03:13:41 +00:00
}
Add an option to edit dimension immediately after adding.
2019-11-26 22:34:53 +00:00
// If that's not enough to represent it exactly, show the value with as many
// digits after decimal as required, up to 10.
int digits = 0;
while(fabs(std::stod(editValue) - value) > 1e-10) {
editValue = ssprintf("%.*f", digits, value);
digits++;
}
editPlaceholder = "10.000000";
break;
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
}
Add an option to edit dimension immediately after adding.
2019-11-26 22:34:53 +00:00
}
Implement a platform abstraction for windows. This commit removes a large amount of code partially duplicated between the text and the graphics windows, and opens the path to having more than one model window on screen at any given time, as well as simplifies platform work. This commit also adds complete support for High-DPI device pixel ratio. It adds support for font scale factor (a fractional factor on top of integral device pixel ratio) on the platform side, but not on the application side. This commit also adds error checking to all Windows API calls (within the abstracted code) and fixes a significant number of misuses and non-future-proof uses of Windows API. This commit also makes uses of Windows API idiomatic, e.g. using the built-in vertical scroll bar, native tooltips, control subclassing instead of hooks in the global dispatch loop, and so on. It reinstates tooltip support and removes menu-related hacks.
2018-07-12 19:29:44 +00:00
Add an option to edit dimension immediately after adding.
2019-11-26 22:34:53 +00:00
double width, height;
window->GetContentSize(&width, &height);
hStyle hs = c->disp.style;
if(hs.v == 0) hs.v = Style::CONSTRAINT;
double capHeight = Style::TextHeight(hs);
double fontHeight = VectorFont::Builtin()->GetHeight(capHeight);
double editMinWidth = VectorFont::Builtin()->GetWidth(capHeight, editPlaceholder);
window->ShowEditor(p2.x + width / 2, height / 2 - p2.y,
fontHeight, editMinWidth,
/*isMonospace=*/false, editValue);
}
void GraphicsWindow::MouseLeftDoubleClick(double mx, double my) {
if(window->IsEditorVisible()) return;
SS.TW.HideEditControl();
if(hover.constraint.v) {
EditConstraint(hover.constraint);
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
}
}
Implement a platform abstraction for windows. This commit removes a large amount of code partially duplicated between the text and the graphics windows, and opens the path to having more than one model window on screen at any given time, as well as simplifies platform work. This commit also adds complete support for High-DPI device pixel ratio. It adds support for font scale factor (a fractional factor on top of integral device pixel ratio) on the platform side, but not on the application side. This commit also adds error checking to all Windows API calls (within the abstracted code) and fixes a significant number of misuses and non-future-proof uses of Windows API. This commit also makes uses of Windows API idiomatic, e.g. using the built-in vertical scroll bar, native tooltips, control subclassing instead of hooks in the global dispatch loop, and so on. It reinstates tooltip support and removes menu-related hacks.
2018-07-12 19:29:44 +00:00
void GraphicsWindow::EditControlDone(const std::string &s) {
window->HideEditor();
window->Invalidate();
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
Constraint *c = SK.GetConstraint(constraintBeingEdited);
Convert all enumerations to use `enum class`. Specifically, take the old code that looks like this: class Foo { enum { X = 1, Y = 2 }; int kind; } ... foo.kind = Foo::X; ... and convert it to this: class Foo { enum class Kind : uint32_t { X = 1, Y = 2 }; Kind kind; } ... foo.kind = Foo::Kind::X; (In some cases the enumeration would not be in the class namespace, such as when it is generally useful.) The benefits are as follows: * The type of the field gives a clear indication of intent, both to humans and tools (such as binding generators). * The compiler is able to automatically warn when a switch is not exhaustive; but this is currently suppressed by the default: ssassert(false, ...) idiom. * Integers and plain enums are weakly type checked: they implicitly convert into each other. This can hide bugs where type conversion is performed but not intended. Enum classes are strongly type checked. * Plain enums pollute parent namespaces; enum classes do not. Almost every defined enum we have already has a kind of ad-hoc namespacing via `NAMESPACE_`, which is now explicit. * Plain enums do not have a well-defined ABI size, which is important for bindings. Enum classes can have it, if specified. We specify the base type for all enums as uint32_t, which is a safe choice and allows us to not change the numeric values of any variants. This commit introduces absolutely no functional change to the code, just renaming and change of types. It handles almost all cases, except GraphicsWindow::pending.operation, which needs minor functional change.
2016-05-20 08:31:20 +00:00
if(c->type == Constraint::Type::COMMENT) {
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
SS.UndoRemember();
Replace NameStr with std::string. This removes the arbitrary 64 byte restriction (which effectively limits us to as little as 16 Unicode characters with CJK encodings), makes classes smaller, and is easier to use. As a consequence of making the length of all ex-NameStr fields unbounded, all functions that returned a buffer derived from those were changed to return std::string. Then, functions that are contextually similar to the ones described above were changed to return std::string. Then, functions that now happened to mostly take an std::string argument converted to a C string were changed to accept std::string. This has produced a bit of churn, but is probably for the better.
2015-11-06 08:40:12 +00:00
c->comment = s;
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
return;
}
Implement a platform abstraction for windows. This commit removes a large amount of code partially duplicated between the text and the graphics windows, and opens the path to having more than one model window on screen at any given time, as well as simplifies platform work. This commit also adds complete support for High-DPI device pixel ratio. It adds support for font scale factor (a fractional factor on top of integral device pixel ratio) on the platform side, but not on the application side. This commit also adds error checking to all Windows API calls (within the abstracted code) and fixes a significant number of misuses and non-future-proof uses of Windows API. This commit also makes uses of Windows API idiomatic, e.g. using the built-in vertical scroll bar, native tooltips, control subclassing instead of hooks in the global dispatch loop, and so on. It reinstates tooltip support and removes menu-related hacks.
2018-07-12 19:29:44 +00:00
if(Expr *e = Expr::From(s, true)) {
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
SS.UndoRemember();
switch(c->type) {
Convert all enumerations to use `enum class`. Specifically, take the old code that looks like this: class Foo { enum { X = 1, Y = 2 }; int kind; } ... foo.kind = Foo::X; ... and convert it to this: class Foo { enum class Kind : uint32_t { X = 1, Y = 2 }; Kind kind; } ... foo.kind = Foo::Kind::X; (In some cases the enumeration would not be in the class namespace, such as when it is generally useful.) The benefits are as follows: * The type of the field gives a clear indication of intent, both to humans and tools (such as binding generators). * The compiler is able to automatically warn when a switch is not exhaustive; but this is currently suppressed by the default: ssassert(false, ...) idiom. * Integers and plain enums are weakly type checked: they implicitly convert into each other. This can hide bugs where type conversion is performed but not intended. Enum classes are strongly type checked. * Plain enums pollute parent namespaces; enum classes do not. Almost every defined enum we have already has a kind of ad-hoc namespacing via `NAMESPACE_`, which is now explicit. * Plain enums do not have a well-defined ABI size, which is important for bindings. Enum classes can have it, if specified. We specify the base type for all enums as uint32_t, which is a safe choice and allows us to not change the numeric values of any variants. This commit introduces absolutely no functional change to the code, just renaming and change of types. It handles almost all cases, except GraphicsWindow::pending.operation, which needs minor functional change.
2016-05-20 08:31:20 +00:00
case Constraint::Type::PROJ_PT_DISTANCE:
case Constraint::Type::PT_LINE_DISTANCE:
case Constraint::Type::PT_FACE_DISTANCE:
case Constraint::Type::PT_PLANE_DISTANCE:
case Constraint::Type::LENGTH_DIFFERENCE: {
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
// The sign is not displayed to the user, but this is a signed
// distance internally. To flip the sign, the user enters a
// negative distance.
bool wasNeg = (c->valA < 0);
if(wasNeg) {
c->valA = -SS.ExprToMm(e);
} else {
c->valA = SS.ExprToMm(e);
}
break;
}
Convert all enumerations to use `enum class`. Specifically, take the old code that looks like this: class Foo { enum { X = 1, Y = 2 }; int kind; } ... foo.kind = Foo::X; ... and convert it to this: class Foo { enum class Kind : uint32_t { X = 1, Y = 2 }; Kind kind; } ... foo.kind = Foo::Kind::X; (In some cases the enumeration would not be in the class namespace, such as when it is generally useful.) The benefits are as follows: * The type of the field gives a clear indication of intent, both to humans and tools (such as binding generators). * The compiler is able to automatically warn when a switch is not exhaustive; but this is currently suppressed by the default: ssassert(false, ...) idiom. * Integers and plain enums are weakly type checked: they implicitly convert into each other. This can hide bugs where type conversion is performed but not intended. Enum classes are strongly type checked. * Plain enums pollute parent namespaces; enum classes do not. Almost every defined enum we have already has a kind of ad-hoc namespacing via `NAMESPACE_`, which is now explicit. * Plain enums do not have a well-defined ABI size, which is important for bindings. Enum classes can have it, if specified. We specify the base type for all enums as uint32_t, which is a safe choice and allows us to not change the numeric values of any variants. This commit introduces absolutely no functional change to the code, just renaming and change of types. It handles almost all cases, except GraphicsWindow::pending.operation, which needs minor functional change.
2016-05-20 08:31:20 +00:00
case Constraint::Type::ANGLE:
case Constraint::Type::LENGTH_RATIO:
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
// These don't get the units conversion for distance, and
// they're always positive
c->valA = fabs(e->Eval());
break;
Convert all enumerations to use `enum class`. Specifically, take the old code that looks like this: class Foo { enum { X = 1, Y = 2 }; int kind; } ... foo.kind = Foo::X; ... and convert it to this: class Foo { enum class Kind : uint32_t { X = 1, Y = 2 }; Kind kind; } ... foo.kind = Foo::Kind::X; (In some cases the enumeration would not be in the class namespace, such as when it is generally useful.) The benefits are as follows: * The type of the field gives a clear indication of intent, both to humans and tools (such as binding generators). * The compiler is able to automatically warn when a switch is not exhaustive; but this is currently suppressed by the default: ssassert(false, ...) idiom. * Integers and plain enums are weakly type checked: they implicitly convert into each other. This can hide bugs where type conversion is performed but not intended. Enum classes are strongly type checked. * Plain enums pollute parent namespaces; enum classes do not. Almost every defined enum we have already has a kind of ad-hoc namespacing via `NAMESPACE_`, which is now explicit. * Plain enums do not have a well-defined ABI size, which is important for bindings. Enum classes can have it, if specified. We specify the base type for all enums as uint32_t, which is a safe choice and allows us to not change the numeric values of any variants. This commit introduces absolutely no functional change to the code, just renaming and change of types. It handles almost all cases, except GraphicsWindow::pending.operation, which needs minor functional change.
2016-05-20 08:31:20 +00:00
case Constraint::Type::DIAMETER:
Allow displaying and editing diameter constraints as radius. The savefile format is not changed; the display option is stored in Constraint::other.
2015-03-22 13:07:49 +00:00
c->valA = fabs(SS.ExprToMm(e));
// If displayed and edited as radius, convert back
// to diameter
if(c->other)
c->valA *= 2;
break;
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
default:
// These are always positive, and they get the units conversion.
c->valA = fabs(SS.ExprToMm(e));
break;
}
SS.MarkGroupDirty(c->group);
}
}
void GraphicsWindow::MouseScroll(double x, double y, int delta) {
double offsetRight = offset.Dot(projRight);
double offsetUp = offset.Dot(projUp);
double righti = x/scale - offsetRight;
double upi = y/scale - offsetUp;
if(delta > 0) {
scale *= 1.2;
Add a GTK2/3 port. In principle, GTK3 is the way forward, and GTK2 is officially deprecated, though still maintained. In practice however, GTK3 is often unbearably buggy; e.g. on my system, combo boxes don't ever roll up in GTK3 windows. So I have added support for both. This required a few minor changes to the core, namely: * GTK wants to know beforehand whether a menu item is a check menu item or a regular one. * GTK doesn't give us an easy way to execute something after any event is processed, so an explicit idle timer is added. This is a no-op on Win32. * A few function signatures were const'ed, since GTK expects immutable strings when converting to Glib::ustring.
2015-03-18 17:02:11 +00:00
} else if(delta < 0) {
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
scale /= 1.2;
Add a GTK2/3 port. In principle, GTK3 is the way forward, and GTK2 is officially deprecated, though still maintained. In practice however, GTK3 is often unbearably buggy; e.g. on my system, combo boxes don't ever roll up in GTK3 windows. So I have added support for both. This required a few minor changes to the core, namely: * GTK wants to know beforehand whether a menu item is a check menu item or a regular one. * GTK doesn't give us an easy way to execute something after any event is processed, so an explicit idle timer is added. This is a no-op on Win32. * A few function signatures were const'ed, since GTK expects immutable strings when converting to Glib::ustring.
2015-03-18 17:02:11 +00:00
} else return;
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
double rightf = x/scale - offsetRight;
double upf = y/scale - offsetUp;
offset = offset.Plus(projRight.ScaledBy(rightf - righti));
offset = offset.Plus(projUp.ScaledBy(upf - upi));
Convert all enumerations to use `enum class`. Specifically, take the old code that looks like this: class Foo { enum { X = 1, Y = 2 }; int kind; } ... foo.kind = Foo::X; ... and convert it to this: class Foo { enum class Kind : uint32_t { X = 1, Y = 2 }; Kind kind; } ... foo.kind = Foo::Kind::X; (In some cases the enumeration would not be in the class namespace, such as when it is generally useful.) The benefits are as follows: * The type of the field gives a clear indication of intent, both to humans and tools (such as binding generators). * The compiler is able to automatically warn when a switch is not exhaustive; but this is currently suppressed by the default: ssassert(false, ...) idiom. * Integers and plain enums are weakly type checked: they implicitly convert into each other. This can hide bugs where type conversion is performed but not intended. Enum classes are strongly type checked. * Plain enums pollute parent namespaces; enum classes do not. Almost every defined enum we have already has a kind of ad-hoc namespacing via `NAMESPACE_`, which is now explicit. * Plain enums do not have a well-defined ABI size, which is important for bindings. Enum classes can have it, if specified. We specify the base type for all enums as uint32_t, which is a safe choice and allows us to not change the numeric values of any variants. This commit introduces absolutely no functional change to the code, just renaming and change of types. It handles almost all cases, except GraphicsWindow::pending.operation, which needs minor functional change.
2016-05-20 08:31:20 +00:00
if(SS.TW.shown.screen == TextWindow::Screen::EDIT_VIEW) {
Add a screen to edit the view parameters; scale, translation, rotation. Also clean up the handling of units, by putting the conversion factors in only one place, and clean up the expression-parsing but removing all the copies of the same error message. [git-p4: depot-paths = "//depot/solvespace/": change = 2093]
2010-01-04 00:35:28 +00:00
if(havePainted) {
Add a GTK2/3 port. In principle, GTK3 is the way forward, and GTK2 is officially deprecated, though still maintained. In practice however, GTK3 is often unbearably buggy; e.g. on my system, combo boxes don't ever roll up in GTK3 windows. So I have added support for both. This required a few minor changes to the core, namely: * GTK wants to know beforehand whether a menu item is a check menu item or a regular one. * GTK doesn't give us an easy way to execute something after any event is processed, so an explicit idle timer is added. This is a no-op on Win32. * A few function signatures were const'ed, since GTK expects immutable strings when converting to Glib::ustring.
2015-03-18 17:02:11 +00:00
SS.ScheduleShowTW();
Add a screen to edit the view parameters; scale, translation, rotation. Also clean up the handling of units, by putting the conversion factors in only one place, and clean up the expression-parsing but removing all the copies of the same error message. [git-p4: depot-paths = "//depot/solvespace/": change = 2093]
2010-01-04 00:35:28 +00:00
}
}
havePainted = false;
Implement a platform abstraction for windows. This commit removes a large amount of code partially duplicated between the text and the graphics windows, and opens the path to having more than one model window on screen at any given time, as well as simplifies platform work. This commit also adds complete support for High-DPI device pixel ratio. It adds support for font scale factor (a fractional factor on top of integral device pixel ratio) on the platform side, but not on the application side. This commit also adds error checking to all Windows API calls (within the abstracted code) and fixes a significant number of misuses and non-future-proof uses of Windows API. This commit also makes uses of Windows API idiomatic, e.g. using the built-in vertical scroll bar, native tooltips, control subclassing instead of hooks in the global dispatch loop, and so on. It reinstates tooltip support and removes menu-related hacks.
2018-07-12 19:29:44 +00:00
Invalidate();
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
}
Rewrite declarations of form f(void) as f(). In C++ there is no difference and newly added functions are all declared as f(), so this brings back consistency.
2016-05-05 05:54:05 +00:00
void GraphicsWindow::MouseLeave() {
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
// Un-hover everything when the mouse leaves our window, unless there's
// currently a context menu shown.
if(!context.active) {
hover.Clear();
Convert all enumerations to use `enum class`. Specifically, take the old code that looks like this: class Foo { enum { X = 1, Y = 2 }; int kind; } ... foo.kind = Foo::X; ... and convert it to this: class Foo { enum class Kind : uint32_t { X = 1, Y = 2 }; Kind kind; } ... foo.kind = Foo::Kind::X; (In some cases the enumeration would not be in the class namespace, such as when it is generally useful.) The benefits are as follows: * The type of the field gives a clear indication of intent, both to humans and tools (such as binding generators). * The compiler is able to automatically warn when a switch is not exhaustive; but this is currently suppressed by the default: ssassert(false, ...) idiom. * Integers and plain enums are weakly type checked: they implicitly convert into each other. This can hide bugs where type conversion is performed but not intended. Enum classes are strongly type checked. * Plain enums pollute parent namespaces; enum classes do not. Almost every defined enum we have already has a kind of ad-hoc namespacing via `NAMESPACE_`, which is now explicit. * Plain enums do not have a well-defined ABI size, which is important for bindings. Enum classes can have it, if specified. We specify the base type for all enums as uint32_t, which is a safe choice and allows us to not change the numeric values of any variants. This commit introduces absolutely no functional change to the code, just renaming and change of types. It handles almost all cases, except GraphicsWindow::pending.operation, which needs minor functional change.
2016-05-20 08:31:20 +00:00
toolbarHovered = Command::NONE;
Implement a platform abstraction for windows. This commit removes a large amount of code partially duplicated between the text and the graphics windows, and opens the path to having more than one model window on screen at any given time, as well as simplifies platform work. This commit also adds complete support for High-DPI device pixel ratio. It adds support for font scale factor (a fractional factor on top of integral device pixel ratio) on the platform side, but not on the application side. This commit also adds error checking to all Windows API calls (within the abstracted code) and fixes a significant number of misuses and non-future-proof uses of Windows API. This commit also makes uses of Windows API idiomatic, e.g. using the built-in vertical scroll bar, native tooltips, control subclassing instead of hooks in the global dispatch loop, and so on. It reinstates tooltip support and removes menu-related hacks.
2018-07-12 19:29:44 +00:00
Invalidate();
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
}
Fix some cases where the green line (that indicates the center of an in-plane rotation of the view, or of a set of entities) would remain on screen after the action was over. [git-p4: depot-paths = "//depot/solvespace/": change = 2142]
2010-05-12 04:47:58 +00:00
SS.extraLine.draw = false;
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
}
Add a platform abstraction for 6-DOF input devices. This commit mostly just moves code around.
2018-07-18 00:48:49 +00:00
void GraphicsWindow::SixDofEvent(Platform::SixDofEvent event) {
if(event.type == Platform::SixDofEvent::Type::RELEASE) {
ZoomToFit(/*includingInvisibles=*/false, /*useSelection=*/true);
Invalidate();
return;
}
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
if(!havePainted) return;
Vector out = projRight.Cross(projUp);
// rotation vector is axis of rotation, and its magnitude is angle
Add a platform abstraction for 6-DOF input devices. This commit mostly just moves code around.
2018-07-18 00:48:49 +00:00
Vector aa = Vector::From(event.rotationX, event.rotationY, event.rotationZ);
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
// but it's given with respect to screen projection frame
aa = aa.ScaleOutOfCsys(projRight, projUp, out);
double aam = aa.Magnitude();
Warning fixes
2013-12-02 06:22:35 +00:00
if(aam > 0.0) aa = aa.WithMagnitude(1);
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
Rename the old "Import / Assemble" feature to "Link / Assemble". This better reflects what it does and avoids clashes with the new DXF import feature.
2016-05-07 05:27:54 +00:00
// This can either transform our view, or transform a linked part.
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
GroupSelection();
Entity *e = NULL;
Group *g = NULL;
if(gs.points == 1 && gs.n == 1) e = SK.GetEntity(gs.point [0]);
if(gs.entities == 1 && gs.n == 1) e = SK.GetEntity(gs.entity[0]);
if(e) g = SK.GetGroup(e->group);
Add a platform abstraction for 6-DOF input devices. This commit mostly just moves code around.
2018-07-18 00:48:49 +00:00
if(g && g->type == Group::Type::LINKED && !event.shiftDown) {
Rename the old "Import / Assemble" feature to "Link / Assemble". This better reflects what it does and avoids clashes with the new DXF import feature.
2016-05-07 05:27:54 +00:00
// Apply the transformation to a linked part. Gain down the Z
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
// axis, since it's hard to see what you're doing on that one since
// it's normal to the screen.
Add a platform abstraction for 6-DOF input devices. This commit mostly just moves code around.
2018-07-18 00:48:49 +00:00
Vector t = projRight.ScaledBy(event.translationX/scale).Plus(
projUp .ScaledBy(event.translationY/scale).Plus(
out .ScaledBy(0.1*event.translationZ/scale)));
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
Quaternion q = Quaternion::From(aa, aam);
// If we go five seconds without SpaceNavigator input, or if we've
// switched groups, then consider that a new action and save an undo
// point.
Changed GetMilliseconds() to return a 64-bit value This function previously returned an int32_t. Presuming that it measures the length of time since the application was started, the 32-bit type would cause the returned value to wrap from 2^31-1 to -2^31 after a little less than twenty-five days.
2013-10-28 04:28:39 +00:00
int64_t now = GetMilliseconds();
Add a platform abstraction for 6-DOF input devices. This commit mostly just moves code around.
2018-07-18 00:48:49 +00:00
if(now - last6DofTime > 5000 ||
Use the new equality/inequality operators of handles to reduce references to .v. NFC.
2019-07-09 14:44:57 +00:00
last6DofGroup != g->h)
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
{
SS.UndoRemember();
}
g->TransformImportedBy(t, q);
Add a platform abstraction for 6-DOF input devices. This commit mostly just moves code around.
2018-07-18 00:48:49 +00:00
last6DofTime = now;
last6DofGroup = g->h;
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
SS.MarkGroupDirty(g->h);
} else {
// Apply the transformation to the view of the everything. The
// x and y components are translation; but z component is scale,
// not translation, or else it would do nothing in a parallel
// projection
Add a platform abstraction for 6-DOF input devices. This commit mostly just moves code around.
2018-07-18 00:48:49 +00:00
offset = offset.Plus(projRight.ScaledBy(event.translationX/scale));
offset = offset.Plus(projUp.ScaledBy(event.translationY/scale));
scale *= exp(0.001*event.translationZ);
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
Warning fixes
2013-12-02 06:22:35 +00:00
if(aam > 0.0) {
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
projRight = projRight.RotatedAbout(aa, -aam);
projUp = projUp. RotatedAbout(aa, -aam);
NormalizeProjectionVectors();
}
}
havePainted = false;
Implement a platform abstraction for windows. This commit removes a large amount of code partially duplicated between the text and the graphics windows, and opens the path to having more than one model window on screen at any given time, as well as simplifies platform work. This commit also adds complete support for High-DPI device pixel ratio. It adds support for font scale factor (a fractional factor on top of integral device pixel ratio) on the platform side, but not on the application side. This commit also adds error checking to all Windows API calls (within the abstracted code) and fixes a significant number of misuses and non-future-proof uses of Windows API. This commit also makes uses of Windows API idiomatic, e.g. using the built-in vertical scroll bar, native tooltips, control subclassing instead of hooks in the global dispatch loop, and so on. It reinstates tooltip support and removes menu-related hacks.
2018-07-12 19:29:44 +00:00
Invalidate();
Split draw.cpp and textscreens.cpp, and move a few things around. This creates mouse.cpp and confscreen.cpp. [git-p4: depot-paths = "//depot/solvespace/": change = 2040]
2009-09-29 13:14:47 +00:00
}