2013-07-28 22:08:34 +00:00
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
// Top-level implementation of the program's main window, in which a graphical
|
|
|
|
// representation of the model is drawn and edited by the user.
|
|
|
|
//
|
|
|
|
// Copyright 2008-2013 Jonathan Westhues.
|
|
|
|
//-----------------------------------------------------------------------------
|
2008-03-27 09:53:51 +00:00
|
|
|
#include "solvespace.h"
|
2016-04-23 23:00:16 +00:00
|
|
|
#include "config.h"
|
2008-03-26 09:18:12 +00:00
|
|
|
|
2008-04-12 15:17:58 +00:00
|
|
|
#define mView (&GraphicsWindow::MenuView)
|
|
|
|
#define mEdit (&GraphicsWindow::MenuEdit)
|
2009-12-04 08:08:41 +00:00
|
|
|
#define mClip (&GraphicsWindow::MenuClipboard)
|
2008-04-13 10:57:41 +00:00
|
|
|
#define mReq (&GraphicsWindow::MenuRequest)
|
2008-04-14 10:28:32 +00:00
|
|
|
#define mCon (&Constraint::MenuConstrain)
|
2015-03-23 17:49:04 +00:00
|
|
|
#define mFile (&SolveSpaceUI::MenuFile)
|
2008-04-27 09:03:01 +00:00
|
|
|
#define mGrp (&Group::MenuGroup)
|
2015-03-23 17:49:04 +00:00
|
|
|
#define mAna (&SolveSpaceUI::MenuAnalyze)
|
|
|
|
#define mHelp (&SolveSpaceUI::MenuHelp)
|
2013-09-20 17:54:57 +00:00
|
|
|
#define DEL DELETE_KEY
|
|
|
|
#define ESC ESCAPE_KEY
|
|
|
|
#define S SHIFT_MASK
|
|
|
|
#define C CTRL_MASK
|
|
|
|
#define F(k) (FUNCTION_KEY_BASE+(k))
|
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
|
|
|
#define TN MenuKind::NORMAL
|
|
|
|
#define TC MenuKind::CHECK
|
|
|
|
#define TR MenuKind::RADIO
|
2008-03-26 09:18:12 +00:00
|
|
|
const GraphicsWindow::MenuEntry GraphicsWindow::menu[] = {
|
2013-09-20 18:16:38 +00:00
|
|
|
//level
|
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
|
|
|
// label id accel ty fn
|
|
|
|
{ 0, "&File", Command::NONE, 0, TN, NULL },
|
|
|
|
{ 1, "&New", Command::NEW, C|'N', TN, mFile },
|
|
|
|
{ 1, "&Open...", Command::OPEN, C|'O', TN, mFile },
|
|
|
|
{ 1, "Open &Recent", Command::OPEN_RECENT, 0, TN, mFile },
|
|
|
|
{ 1, "&Save", Command::SAVE, C|'S', TN, mFile },
|
|
|
|
{ 1, "Save &As...", Command::SAVE_AS, 0, TN, mFile },
|
|
|
|
{ 1, NULL, Command::NONE, 0, TN, NULL },
|
|
|
|
{ 1, "Export &Image...", Command::EXPORT_PNG, 0, TN, mFile },
|
|
|
|
{ 1, "Export 2d &View...", Command::EXPORT_VIEW, 0, TN, mFile },
|
|
|
|
{ 1, "Export 2d &Section...", Command::EXPORT_SECTION, 0, TN, mFile },
|
|
|
|
{ 1, "Export 3d &Wireframe...", Command::EXPORT_WIREFRAME, 0, TN, mFile },
|
|
|
|
{ 1, "Export Triangle &Mesh...", Command::EXPORT_MESH, 0, TN, mFile },
|
|
|
|
{ 1, "Export &Surfaces...", Command::EXPORT_SURFACES, 0, TN, mFile },
|
|
|
|
{ 1, "Im&port...", Command::IMPORT, 0, TN, mFile },
|
2015-03-24 06:45:53 +00:00
|
|
|
#ifndef __APPLE__
|
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
|
|
|
{ 1, NULL, Command::NONE, 0, TN, NULL },
|
|
|
|
{ 1, "E&xit", Command::EXIT, C|'Q', TN, mFile },
|
2015-03-24 06:45:53 +00:00
|
|
|
#endif
|
2015-03-18 17:02:11 +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
|
|
|
{ 0, "&Edit", Command::NONE, 0, TN, NULL },
|
|
|
|
{ 1, "&Undo", Command::UNDO, C|'Z', TN, mEdit },
|
|
|
|
{ 1, "&Redo", Command::REDO, C|'Y', TN, mEdit },
|
|
|
|
{ 1, "Re&generate All", Command::REGEN_ALL, ' ', TN, mEdit },
|
|
|
|
{ 1, NULL, Command::NONE, 0, TN, NULL },
|
|
|
|
{ 1, "Snap Selection to &Grid", Command::SNAP_TO_GRID, '.', TN, mEdit },
|
|
|
|
{ 1, "Rotate Imported &90°", Command::ROTATE_90, '9', TN, mEdit },
|
|
|
|
{ 1, NULL, Command::NONE, 0, TN, NULL },
|
|
|
|
{ 1, "Cu&t", Command::CUT, C|'X', TN, mClip },
|
|
|
|
{ 1, "&Copy", Command::COPY, C|'C', TN, mClip },
|
|
|
|
{ 1, "&Paste", Command::PASTE, C|'V', TN, mClip },
|
|
|
|
{ 1, "Paste &Transformed...", Command::PASTE_TRANSFORM, C|'T', TN, mClip },
|
|
|
|
{ 1, "&Delete", Command::DELETE, DEL, TN, mClip },
|
|
|
|
{ 1, NULL, Command::NONE, 0, TN, NULL },
|
|
|
|
{ 1, "Select &Edge Chain", Command::SELECT_CHAIN, C|'E', TN, mEdit },
|
|
|
|
{ 1, "Select &All", Command::SELECT_ALL, C|'A', TN, mEdit },
|
|
|
|
{ 1, "&Unselect All", Command::UNSELECT_ALL, ESC, TN, mEdit },
|
|
|
|
|
|
|
|
{ 0, "&View", Command::NONE, 0, TN, NULL },
|
|
|
|
{ 1, "Zoom &In", Command::ZOOM_IN, '+', TN, mView },
|
|
|
|
{ 1, "Zoom &Out", Command::ZOOM_OUT, '-', TN, mView },
|
|
|
|
{ 1, "Zoom To &Fit", Command::ZOOM_TO_FIT, 'F', TN, mView },
|
|
|
|
{ 1, NULL, Command::NONE, 0, TN, NULL },
|
|
|
|
{ 1, "Align View to &Workplane", Command::ONTO_WORKPLANE, 'W', TN, mView },
|
|
|
|
{ 1, "Nearest &Ortho View", Command::NEAREST_ORTHO, F(2), TN, mView },
|
|
|
|
{ 1, "Nearest &Isometric View", Command::NEAREST_ISO, F(3), TN, mView },
|
|
|
|
{ 1, "&Center View At Point", Command::CENTER_VIEW, F(4), TN, mView },
|
|
|
|
{ 1, NULL, Command::NONE, 0, TN, NULL },
|
|
|
|
{ 1, "Show Snap &Grid", Command::SHOW_GRID, '>', TC, mView },
|
|
|
|
{ 1, "Use &Perspective Projection", Command::PERSPECTIVE_PROJ, '`', TC, mView },
|
|
|
|
{ 1, NULL, Command::NONE, 0, TN, NULL },
|
2015-03-24 23:38:06 +00:00
|
|
|
#if defined(__APPLE__)
|
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
|
|
|
{ 1, "Show Menu &Bar", Command::SHOW_MENU_BAR, C|F(12), TC, mView },
|
2013-10-25 05:04:16 +00:00
|
|
|
#endif
|
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
|
|
|
{ 1, "Show &Toolbar", Command::SHOW_TOOLBAR, 0, TC, mView },
|
|
|
|
{ 1, "Show Property Bro&wser", Command::SHOW_TEXT_WND, '\t', TC, mView },
|
|
|
|
{ 1, NULL, Command::NONE, 0, TN, NULL },
|
|
|
|
{ 1, "Dimensions in &Inches", Command::UNITS_INCHES, 0, TR, mView },
|
|
|
|
{ 1, "Dimensions in &Millimeters", Command::UNITS_MM, 0, TR, mView },
|
2015-03-24 23:38:06 +00:00
|
|
|
#if defined(HAVE_GTK) || defined(__APPLE__)
|
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
|
|
|
{ 1, NULL, Command::NONE, 0, TN, NULL },
|
|
|
|
{ 1, "&Full Screen", Command::FULL_SCREEN, C|F(11), TC, mView },
|
2013-10-25 05:04:16 +00:00
|
|
|
#endif
|
2013-09-20 19:01:00 +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
|
|
|
{ 0, "&New Group", Command::NONE, 0, TN, NULL },
|
|
|
|
{ 1, "Sketch In &3d", Command::GROUP_3D, S|'3', TN, mGrp },
|
|
|
|
{ 1, "Sketch In New &Workplane", Command::GROUP_WRKPL, S|'W', TN, mGrp },
|
|
|
|
{ 1, NULL, Command::NONE, 0, TN, NULL },
|
|
|
|
{ 1, "Step &Translating", Command::GROUP_TRANS, S|'T', TN, mGrp },
|
|
|
|
{ 1, "Step &Rotating", Command::GROUP_ROT, S|'R', TN, mGrp },
|
|
|
|
{ 1, NULL, Command::NONE, 0, TN, NULL },
|
|
|
|
{ 1, "E&xtrude", Command::GROUP_EXTRUDE, S|'X', TN, mGrp },
|
|
|
|
{ 1, "&Lathe", Command::GROUP_LATHE, S|'L', TN, mGrp },
|
|
|
|
{ 1, NULL, Command::NONE, 0, TN, NULL },
|
|
|
|
{ 1, "Link / Assemble...", Command::GROUP_LINK, S|'I', TN, mGrp },
|
|
|
|
{ 1, "Link Recent", Command::GROUP_RECENT, 0, TN, mGrp },
|
|
|
|
|
|
|
|
{ 0, "&Sketch", Command::NONE, 0, TN, NULL },
|
|
|
|
{ 1, "In &Workplane", Command::SEL_WORKPLANE, '2', TR, mReq },
|
|
|
|
{ 1, "Anywhere In &3d", Command::FREE_IN_3D, '3', TR, mReq },
|
|
|
|
{ 1, NULL, Command::NONE, 0, TN, NULL },
|
|
|
|
{ 1, "Datum &Point", Command::DATUM_POINT, 'P', TN, mReq },
|
|
|
|
{ 1, "&Workplane", Command::WORKPLANE, 0, TN, mReq },
|
|
|
|
{ 1, NULL, Command::NONE, 0, TN, NULL },
|
|
|
|
{ 1, "Line &Segment", Command::LINE_SEGMENT, 'S', TN, mReq },
|
|
|
|
{ 1, "C&onstruction Line Segment", Command::CONSTR_SEGMENT, S|'S', TN, mReq },
|
|
|
|
{ 1, "&Rectangle", Command::RECTANGLE, 'R', TN, mReq },
|
|
|
|
{ 1, "&Circle", Command::CIRCLE, 'C', TN, mReq },
|
|
|
|
{ 1, "&Arc of a Circle", Command::ARC, 'A', TN, mReq },
|
|
|
|
{ 1, "&Bezier Cubic Spline", Command::CUBIC, 'B', TN, mReq },
|
|
|
|
{ 1, NULL, Command::NONE, 0, TN, NULL },
|
|
|
|
{ 1, "&Text in TrueType Font", Command::TTF_TEXT, 'T', TN, mReq },
|
|
|
|
{ 1, NULL, Command::NONE, 0, TN, NULL },
|
|
|
|
{ 1, "To&ggle Construction", Command::CONSTRUCTION, 'G', TN, mReq },
|
|
|
|
{ 1, "Tangent &Arc at Point", Command::TANGENT_ARC, S|'A', TN, mReq },
|
|
|
|
{ 1, "Split Curves at &Intersection", Command::SPLIT_CURVES, 'I', TN, mReq },
|
|
|
|
|
|
|
|
{ 0, "&Constrain", Command::NONE, 0, TN, NULL },
|
|
|
|
{ 1, "&Distance / Diameter", Command::DISTANCE_DIA, 'D', TN, mCon },
|
|
|
|
{ 1, "Re&ference Dimension", Command::REF_DISTANCE, S|'D', TN, mCon },
|
|
|
|
{ 1, "A&ngle", Command::ANGLE, 'N', TN, mCon },
|
|
|
|
{ 1, "Reference An&gle", Command::REF_ANGLE, S|'N', TN, mCon },
|
|
|
|
{ 1, "Other S&upplementary Angle", Command::OTHER_ANGLE, 'U', TN, mCon },
|
|
|
|
{ 1, "Toggle R&eference Dim", Command::REFERENCE, 'E', TN, mCon },
|
|
|
|
{ 1, NULL, Command::NONE, 0, TN, NULL },
|
|
|
|
{ 1, "&Horizontal", Command::HORIZONTAL, 'H', TN, mCon },
|
|
|
|
{ 1, "&Vertical", Command::VERTICAL, 'V', TN, mCon },
|
|
|
|
{ 1, NULL, Command::NONE, 0, TN, NULL },
|
|
|
|
{ 1, "&On Point / Curve / Plane", Command::ON_ENTITY, 'O', TN, mCon },
|
|
|
|
{ 1, "E&qual Length / Radius / Angle", Command::EQUAL, 'Q', TN, mCon },
|
|
|
|
{ 1, "Length Ra&tio", Command::RATIO, 'Z', TN, mCon },
|
|
|
|
{ 1, "Length Diff&erence", Command::DIFFERENCE, 'J', TN, mCon },
|
|
|
|
{ 1, "At &Midpoint", Command::AT_MIDPOINT, 'M', TN, mCon },
|
|
|
|
{ 1, "S&ymmetric", Command::SYMMETRIC, 'Y', TN, mCon },
|
|
|
|
{ 1, "Para&llel / Tangent", Command::PARALLEL, 'L', TN, mCon },
|
|
|
|
{ 1, "&Perpendicular", Command::PERPENDICULAR, '[', TN, mCon },
|
|
|
|
{ 1, "Same Orient&ation", Command::ORIENTED_SAME, 'X', TN, mCon },
|
|
|
|
{ 1, "Lock Point Where &Dragged", Command::WHERE_DRAGGED, ']', TN, mCon },
|
|
|
|
{ 1, NULL, Command::NONE, 0, TN, NULL },
|
|
|
|
{ 1, "Comment", Command::COMMENT, ';', TN, mCon },
|
|
|
|
|
|
|
|
{ 0, "&Analyze", Command::NONE, 0, TN, NULL },
|
|
|
|
{ 1, "Measure &Volume", Command::VOLUME, C|S|'V', TN, mAna },
|
|
|
|
{ 1, "Measure &Area", Command::AREA, C|S|'A', TN, mAna },
|
|
|
|
{ 1, "Show &Interfering Parts", Command::INTERFERENCE, C|S|'I', TN, mAna },
|
|
|
|
{ 1, "Show &Naked Edges", Command::NAKED_EDGES, C|S|'N', TN, mAna },
|
|
|
|
{ 1, NULL, Command::NONE, 0, TN, NULL },
|
|
|
|
{ 1, "Show Degrees of &Freedom", Command::SHOW_DOF, C|S|'F', TN, mAna },
|
|
|
|
{ 1, NULL, Command::NONE, 0, TN, NULL },
|
|
|
|
{ 1, "&Trace Point", Command::TRACE_PT, C|S|'T', TN, mAna },
|
|
|
|
{ 1, "&Stop Tracing...", Command::STOP_TRACING, C|S|'S', TN, mAna },
|
|
|
|
{ 1, "Step &Dimension...", Command::STEP_DIM, C|S|'D', TN, mAna },
|
|
|
|
|
|
|
|
{ 0, "&Help", Command::NONE, 0, TN, NULL },
|
|
|
|
{ 1, "&Website / Manual", Command::WEBSITE, 0, TN, mHelp },
|
2015-03-24 06:45:53 +00:00
|
|
|
#ifndef __APPLE__
|
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
|
|
|
{ 1, "&About", Command::ABOUT, 0, TN, mHelp },
|
2015-03-24 06:45:53 +00:00
|
|
|
#endif
|
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
|
|
|
{ -1, 0, Command::NONE, 0, TN, 0 }
|
2008-03-26 09:18:12 +00:00
|
|
|
};
|
|
|
|
|
2013-09-20 18:16:38 +00:00
|
|
|
#undef DEL
|
|
|
|
#undef ESC
|
|
|
|
#undef S
|
|
|
|
#undef C
|
|
|
|
#undef F
|
2016-04-10 12:30:25 +00:00
|
|
|
#undef TN
|
|
|
|
#undef TC
|
|
|
|
#undef TR
|
2013-09-20 18:16:38 +00:00
|
|
|
|
2016-04-17 10:01:44 +00:00
|
|
|
std::string SolveSpace::MakeAcceleratorLabel(int accel) {
|
|
|
|
if(!accel) return "";
|
2013-09-20 19:01:00 +00:00
|
|
|
|
2016-04-17 10:01:44 +00:00
|
|
|
std::string label;
|
|
|
|
if(accel & GraphicsWindow::CTRL_MASK) {
|
|
|
|
label += "Ctrl+";
|
|
|
|
}
|
|
|
|
if(accel & GraphicsWindow::SHIFT_MASK) {
|
|
|
|
label += "Shift+";
|
|
|
|
}
|
2013-09-20 19:01:00 +00:00
|
|
|
if(accel >= GraphicsWindow::FUNCTION_KEY_BASE + 1 &&
|
|
|
|
accel <= GraphicsWindow::FUNCTION_KEY_BASE + 12) {
|
2016-04-17 10:01:44 +00:00
|
|
|
label += ssprintf("F%d", accel - GraphicsWindow::FUNCTION_KEY_BASE);
|
|
|
|
} else if(accel == '\t') {
|
|
|
|
label += "Tab";
|
|
|
|
} else if(accel == ' ') {
|
|
|
|
label += "Space";
|
|
|
|
} else if(accel == GraphicsWindow::ESCAPE_KEY) {
|
|
|
|
label += "Esc";
|
|
|
|
} else if(accel == GraphicsWindow::DELETE_KEY) {
|
|
|
|
label += "Del";
|
|
|
|
} else {
|
|
|
|
label += (char)(accel & 0xff);
|
2013-09-20 19:01:00 +00:00
|
|
|
}
|
2016-04-17 10:01:44 +00:00
|
|
|
return label;
|
2013-09-20 19:01:00 +00:00
|
|
|
}
|
|
|
|
|
2016-05-05 05:54:05 +00:00
|
|
|
void GraphicsWindow::Init() {
|
2008-05-11 10:40:37 +00:00
|
|
|
scale = 5;
|
2008-06-12 07:31:41 +00:00
|
|
|
offset = Vector::From(0, 0, 0);
|
|
|
|
projRight = Vector::From(1, 0, 0);
|
|
|
|
projUp = Vector::From(0, 1, 0);
|
2008-03-27 09:53:51 +00:00
|
|
|
|
2008-08-24 01:32:25 +00:00
|
|
|
// Make sure those are valid; could get a mouse move without a mouse
|
|
|
|
// down if someone depresses the button, then drags into our window.
|
|
|
|
orig.projRight = projRight;
|
|
|
|
orig.projUp = projUp;
|
|
|
|
|
2008-06-14 23:31:36 +00:00
|
|
|
// And with the last group active
|
2016-02-17 10:03:07 +00:00
|
|
|
activeGroup = SK.groupOrder.elem[SK.groupOrder.n - 1];
|
2009-04-19 05:53:16 +00:00
|
|
|
SK.GetGroup(activeGroup)->Activate();
|
2008-05-25 13:11:44 +00:00
|
|
|
|
2008-06-14 09:51:25 +00:00
|
|
|
showWorkplanes = false;
|
2008-05-05 06:18:01 +00:00
|
|
|
showNormals = true;
|
2008-04-11 12:47:14 +00:00
|
|
|
showPoints = true;
|
|
|
|
showConstraints = true;
|
2008-05-02 10:54:22 +00:00
|
|
|
showHdnLines = false;
|
2008-05-28 10:34:55 +00:00
|
|
|
showShaded = true;
|
2009-03-18 04:26:04 +00:00
|
|
|
showEdges = true;
|
2008-06-01 04:31:28 +00:00
|
|
|
showMesh = false;
|
2016-03-14 16:14:24 +00:00
|
|
|
showOutlines = false;
|
2008-04-27 05:00:12 +00:00
|
|
|
|
|
|
|
showTextWindow = true;
|
|
|
|
ShowTextWindow(showTextWindow);
|
2008-06-13 04:41:27 +00:00
|
|
|
|
2009-09-29 11:35:19 +00:00
|
|
|
showSnapGrid = false;
|
2009-09-23 10:59:59 +00:00
|
|
|
context.active = false;
|
|
|
|
|
2008-06-13 04:41:27 +00:00
|
|
|
// Do this last, so that all the menus get updated correctly.
|
2016-04-16 02:16:47 +00:00
|
|
|
ClearSuper();
|
2008-03-27 09:53:51 +00:00
|
|
|
}
|
|
|
|
|
2016-05-05 05:54:05 +00:00
|
|
|
void GraphicsWindow::AnimateOntoWorkplane() {
|
2008-05-27 02:22:20 +00:00
|
|
|
if(!LockedInWorkplane()) return;
|
|
|
|
|
2009-04-19 05:53:16 +00:00
|
|
|
Entity *w = SK.GetEntity(ActiveWorkplane());
|
2008-05-27 02:22:20 +00:00
|
|
|
Quaternion quatf = w->Normal()->NormalGetNum();
|
2009-04-19 05:53:16 +00:00
|
|
|
Vector offsetf = (SK.GetEntity(w->point[0])->PointGetNum()).ScaledBy(-1);
|
2008-05-27 02:22:20 +00:00
|
|
|
|
2009-01-02 04:06:47 +00:00
|
|
|
AnimateOnto(quatf, offsetf);
|
|
|
|
}
|
|
|
|
|
|
|
|
void GraphicsWindow::AnimateOnto(Quaternion quatf, Vector offsetf) {
|
2008-04-25 08:26:15 +00:00
|
|
|
// Get our initial orientation and translation.
|
2008-06-01 08:45:11 +00:00
|
|
|
Quaternion quat0 = Quaternion::From(projRight, projUp);
|
2008-05-05 11:17:00 +00:00
|
|
|
Vector offset0 = offset;
|
2008-04-25 08:26:15 +00:00
|
|
|
|
|
|
|
// Make sure we take the shorter of the two possible paths.
|
|
|
|
double mp = (quatf.Minus(quat0)).Magnitude();
|
|
|
|
double mm = (quatf.Plus(quat0)).Magnitude();
|
|
|
|
if(mp > mm) {
|
|
|
|
quatf = quatf.ScaledBy(-1);
|
|
|
|
mp = mm;
|
|
|
|
}
|
2008-05-11 10:40:37 +00:00
|
|
|
double mo = (offset0.Minus(offsetf)).Magnitude()*scale;
|
2008-04-25 08:26:15 +00:00
|
|
|
|
|
|
|
// Animate transition, unless it's a tiny move.
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
int32_t dt = (mp < 0.01 && mo < 10) ? (-20) :
|
|
|
|
(int32_t)(100 + 1000*mp + 0.4*mo);
|
2009-09-29 11:35:19 +00:00
|
|
|
// Don't ever animate for longer than 2000 ms; we can get absurdly
|
|
|
|
// long translations (as measured in pixels) if the user zooms out, moves,
|
|
|
|
// and then zooms in again.
|
|
|
|
if(dt > 2000) dt = 2000;
|
2013-10-28 04:28:39 +00:00
|
|
|
int64_t tn, t0 = GetMilliseconds();
|
2008-04-25 08:26:15 +00:00
|
|
|
double s = 0;
|
2008-05-14 14:23:58 +00:00
|
|
|
Quaternion dq = quatf.Times(quat0.Inverse());
|
2008-04-25 08:26:15 +00:00
|
|
|
do {
|
|
|
|
offset = (offset0.ScaledBy(1 - s)).Plus(offsetf.ScaledBy(s));
|
2008-05-14 14:23:58 +00:00
|
|
|
Quaternion quat = (dq.ToThe(s)).Times(quat0);
|
2008-04-25 08:26:15 +00:00
|
|
|
quat = quat.WithMagnitude(1);
|
|
|
|
|
|
|
|
projRight = quat.RotationU();
|
|
|
|
projUp = quat.RotationV();
|
|
|
|
PaintGraphics();
|
|
|
|
|
|
|
|
tn = GetMilliseconds();
|
|
|
|
s = (tn - t0)/((double)dt);
|
|
|
|
} while((tn - t0) < dt);
|
|
|
|
|
|
|
|
projRight = quatf.RotationU();
|
|
|
|
projUp = quatf.RotationV();
|
|
|
|
offset = offsetf;
|
|
|
|
InvalidateGraphics();
|
2010-02-28 18:55:49 +00:00
|
|
|
// If the view screen is open, then we need to refresh it.
|
2015-03-18 17:02:11 +00:00
|
|
|
SS.ScheduleShowTW();
|
2008-04-25 08:26:15 +00:00
|
|
|
}
|
|
|
|
|
2016-01-30 10:38:38 +00:00
|
|
|
void GraphicsWindow::HandlePointForZoomToFit(Vector p, Point2d *pmax, Point2d *pmin,
|
|
|
|
double *wmin, bool usePerspective)
|
2008-06-11 04:22:52 +00:00
|
|
|
{
|
2008-06-17 19:12:25 +00:00
|
|
|
double w;
|
|
|
|
Vector pp = ProjectPoint4(p, &w);
|
2016-01-30 10:38:38 +00:00
|
|
|
// If usePerspective is true, then we calculate a perspective projection of the point.
|
2009-05-29 05:40:17 +00:00
|
|
|
// If not, then we do a parallel projection regardless of the current
|
|
|
|
// scale factor.
|
2016-01-30 10:38:38 +00:00
|
|
|
if(usePerspective) {
|
2008-06-17 19:12:25 +00:00
|
|
|
pp = pp.ScaledBy(1.0/w);
|
|
|
|
}
|
2008-06-11 04:22:52 +00:00
|
|
|
|
2008-06-17 19:12:25 +00:00
|
|
|
pmax->x = max(pmax->x, pp.x);
|
|
|
|
pmax->y = max(pmax->y, pp.y);
|
|
|
|
pmin->x = min(pmin->x, pp.x);
|
|
|
|
pmin->y = min(pmin->y, pp.y);
|
|
|
|
*wmin = min(*wmin, w);
|
|
|
|
}
|
2016-01-30 10:38:38 +00:00
|
|
|
void GraphicsWindow::LoopOverPoints(const std::vector<Entity *> &entities,
|
2016-03-25 07:32:11 +00:00
|
|
|
const std::vector<hEntity> &faces,
|
2016-01-30 10:38:38 +00:00
|
|
|
Point2d *pmax, Point2d *pmin, double *wmin,
|
|
|
|
bool usePerspective, bool includeMesh) {
|
2008-06-11 04:22:52 +00:00
|
|
|
|
2008-06-17 19:12:25 +00:00
|
|
|
int i, j;
|
2016-01-30 10:38:38 +00:00
|
|
|
for(Entity *e : entities) {
|
2009-04-14 04:19:23 +00:00
|
|
|
if(e->IsPoint()) {
|
2016-01-30 10:38:38 +00:00
|
|
|
HandlePointForZoomToFit(e->PointGetNum(), pmax, pmin, wmin, usePerspective);
|
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::CIRCLE) {
|
2009-04-14 04:19:23 +00:00
|
|
|
// Lots of entities can extend outside the bbox of their points,
|
|
|
|
// but circles are particularly bad. We want to get things halfway
|
|
|
|
// reasonable without the mesh, because a zoom to fit is used to
|
|
|
|
// set the zoom level to set the chord tol.
|
|
|
|
double r = e->CircleGetRadiusNum();
|
2009-04-19 05:53:16 +00:00
|
|
|
Vector c = SK.GetEntity(e->point[0])->PointGetNum();
|
|
|
|
Quaternion q = SK.GetEntity(e->normal)->NormalGetNum();
|
2009-04-14 04:19:23 +00:00
|
|
|
for(j = 0; j < 4; j++) {
|
|
|
|
Vector p = (j == 0) ? (c.Plus(q.RotationU().ScaledBy( r))) :
|
|
|
|
(j == 1) ? (c.Plus(q.RotationU().ScaledBy(-r))) :
|
|
|
|
(j == 2) ? (c.Plus(q.RotationV().ScaledBy( r))) :
|
|
|
|
(c.Plus(q.RotationV().ScaledBy(-r)));
|
2016-01-30 10:38:38 +00:00
|
|
|
HandlePointForZoomToFit(p, pmax, pmin, wmin, usePerspective);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// We have to iterate children points, because we can select entites without points
|
|
|
|
for(int i = 0; i < MAX_POINTS_IN_ENTITY; i++) {
|
|
|
|
if(e->point[i].v == 0) break;
|
|
|
|
Vector p = SK.GetEntity(e->point[i])->PointGetNum();
|
|
|
|
HandlePointForZoomToFit(p, pmax, pmin, wmin, usePerspective);
|
2009-04-14 04:19:23 +00:00
|
|
|
}
|
|
|
|
}
|
2008-06-11 04:22:52 +00:00
|
|
|
}
|
2009-05-21 09:06:26 +00:00
|
|
|
|
2016-03-25 07:32:11 +00:00
|
|
|
if(!includeMesh && faces.empty()) return;
|
2016-01-30 10:38:38 +00:00
|
|
|
|
2009-04-19 05:53:16 +00:00
|
|
|
Group *g = SK.GetGroup(activeGroup);
|
2009-05-21 09:06:26 +00:00
|
|
|
g->GenerateDisplayItems();
|
|
|
|
for(i = 0; i < g->displayMesh.l.n; i++) {
|
|
|
|
STriangle *tr = &(g->displayMesh.l.elem[i]);
|
2016-03-25 07:32:11 +00:00
|
|
|
if(!includeMesh) {
|
|
|
|
bool found = false;
|
|
|
|
for(const hEntity &face : faces) {
|
|
|
|
if(face.v != tr->meta.face) continue;
|
|
|
|
found = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if(!found) continue;
|
|
|
|
}
|
2016-01-30 10:38:38 +00:00
|
|
|
HandlePointForZoomToFit(tr->a, pmax, pmin, wmin, usePerspective);
|
|
|
|
HandlePointForZoomToFit(tr->b, pmax, pmin, wmin, usePerspective);
|
|
|
|
HandlePointForZoomToFit(tr->c, pmax, pmin, wmin, usePerspective);
|
2008-06-11 04:22:52 +00:00
|
|
|
}
|
2016-03-25 07:32:11 +00:00
|
|
|
if(!includeMesh) return;
|
2009-10-29 07:16:28 +00:00
|
|
|
for(i = 0; i < g->polyLoops.l.n; i++) {
|
|
|
|
SContour *sc = &(g->polyLoops.l.elem[i]);
|
2008-06-11 04:22:52 +00:00
|
|
|
for(j = 0; j < sc->l.n; j++) {
|
2016-01-30 10:38:38 +00:00
|
|
|
HandlePointForZoomToFit(sc->l.elem[j].p, pmax, pmin, wmin, usePerspective);
|
2008-06-11 04:22:52 +00:00
|
|
|
}
|
|
|
|
}
|
2008-06-17 19:12:25 +00:00
|
|
|
}
|
2016-01-30 10:38:38 +00:00
|
|
|
void GraphicsWindow::ZoomToFit(bool includingInvisibles, bool useSelection) {
|
|
|
|
std::vector<Entity *> entities;
|
2016-03-25 07:32:11 +00:00
|
|
|
std::vector<hEntity> faces;
|
|
|
|
|
|
|
|
if(useSelection) {
|
2016-01-30 10:38:38 +00:00
|
|
|
for(int i = 0; i < selection.n; i++) {
|
|
|
|
Selection *s = &selection.elem[i];
|
|
|
|
if(s->entity.v == 0) continue;
|
|
|
|
Entity *e = SK.entity.FindById(s->entity);
|
2016-03-25 07:32:11 +00:00
|
|
|
if(e->IsFace()) {
|
|
|
|
faces.push_back(e->h);
|
|
|
|
continue;
|
|
|
|
}
|
2016-01-30 10:38:38 +00:00
|
|
|
entities.push_back(e);
|
|
|
|
}
|
2016-03-25 07:32:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
bool selectionUsed = !entities.empty() || !faces.empty();
|
|
|
|
|
|
|
|
if(!selectionUsed) {
|
2016-01-30 10:38:38 +00:00
|
|
|
for(int i = 0; i<SK.entity.n; i++) {
|
|
|
|
Entity *e = &(SK.entity.elem[i]);
|
|
|
|
// we don't want to handle separate points, because we will iterate them inside entities.
|
|
|
|
if(e->IsPoint()) continue;
|
|
|
|
if(!includingInvisibles && !e->IsVisible()) continue;
|
|
|
|
entities.push_back(e);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-06-17 19:12:25 +00:00
|
|
|
// On the first run, ignore perspective.
|
|
|
|
Point2d pmax = { -1e12, -1e12 }, pmin = { 1e12, 1e12 };
|
|
|
|
double wmin = 1;
|
2016-03-25 07:32:11 +00:00
|
|
|
LoopOverPoints(entities, faces, &pmax, &pmin, &wmin,
|
2016-01-30 10:38:38 +00:00
|
|
|
/*usePerspective=*/false, /*includeMesh=*/!selectionUsed);
|
2008-06-11 04:22:52 +00:00
|
|
|
|
|
|
|
double xm = (pmax.x + pmin.x)/2, ym = (pmax.y + pmin.y)/2;
|
|
|
|
double dx = pmax.x - pmin.x, dy = pmax.y - pmin.y;
|
|
|
|
|
|
|
|
offset = offset.Plus(projRight.ScaledBy(-xm)).Plus(
|
|
|
|
projUp. ScaledBy(-ym));
|
2015-03-29 00:30:52 +00:00
|
|
|
|
2008-06-17 19:12:25 +00:00
|
|
|
// And based on this, we calculate the scale and offset
|
2013-10-21 21:29:25 +00:00
|
|
|
if(EXACT(dx == 0 && dy == 0)) {
|
2008-06-11 04:22:52 +00:00
|
|
|
scale = 5;
|
|
|
|
} else {
|
|
|
|
double scalex = 1e12, scaley = 1e12;
|
2013-10-21 21:29:25 +00:00
|
|
|
if(EXACT(dx != 0)) scalex = 0.9*width /dx;
|
|
|
|
if(EXACT(dy != 0)) scaley = 0.9*height/dy;
|
2008-06-17 19:12:25 +00:00
|
|
|
scale = min(scalex, scaley);
|
|
|
|
|
2015-03-27 15:43:28 +00:00
|
|
|
scale = min(300.0, scale);
|
2009-03-15 23:04:45 +00:00
|
|
|
scale = max(0.003, scale);
|
2008-06-17 19:12:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Then do another run, considering the perspective.
|
|
|
|
pmax.x = -1e12; pmax.y = -1e12;
|
|
|
|
pmin.x = 1e12; pmin.y = 1e12;
|
|
|
|
wmin = 1;
|
2016-03-25 07:32:11 +00:00
|
|
|
LoopOverPoints(entities, faces, &pmax, &pmin, &wmin,
|
2016-01-30 10:38:38 +00:00
|
|
|
/*usePerspective=*/true, /*includeMesh=*/!selectionUsed);
|
2008-06-17 19:12:25 +00:00
|
|
|
|
|
|
|
// Adjust the scale so that no points are behind the camera
|
|
|
|
if(wmin < 0.1) {
|
2009-09-29 11:35:19 +00:00
|
|
|
double k = SS.CameraTangent();
|
2008-06-17 19:12:25 +00:00
|
|
|
// w = 1+k*scale*z
|
|
|
|
double zmin = (wmin - 1)/(k*scale);
|
|
|
|
// 0.1 = 1 + k*scale*zmin
|
|
|
|
// (0.1 - 1)/(k*zmin) = scale
|
|
|
|
scale = min(scale, (0.1 - 1)/(k*zmin));
|
2008-06-11 04:22:52 +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
|
|
|
void GraphicsWindow::MenuView(Command id) {
|
2008-04-12 15:17:58 +00:00
|
|
|
switch(id) {
|
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 Command::ZOOM_IN:
|
2008-04-12 15:17:58 +00:00
|
|
|
SS.GW.scale *= 1.2;
|
2015-03-18 17:02:11 +00:00
|
|
|
SS.ScheduleShowTW();
|
2008-04-12 15:17:58 +00:00
|
|
|
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 Command::ZOOM_OUT:
|
2008-04-12 15:17:58 +00:00
|
|
|
SS.GW.scale /= 1.2;
|
2015-03-18 17:02:11 +00:00
|
|
|
SS.ScheduleShowTW();
|
2008-04-12 15:17:58 +00:00
|
|
|
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 Command::ZOOM_TO_FIT:
|
2016-01-30 10:38:38 +00:00
|
|
|
SS.GW.ZoomToFit(/*includingInvisibles=*/false, /*useSelection=*/true);
|
2015-03-18 17:02:11 +00:00
|
|
|
SS.ScheduleShowTW();
|
2008-04-12 15:17:58 +00:00
|
|
|
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 Command::SHOW_GRID:
|
2009-09-29 11:35:19 +00:00
|
|
|
SS.GW.showSnapGrid = !SS.GW.showSnapGrid;
|
|
|
|
if(SS.GW.showSnapGrid && !SS.GW.LockedInWorkplane()) {
|
|
|
|
Message("No workplane is active, so the grid will not "
|
|
|
|
"appear.");
|
|
|
|
}
|
|
|
|
SS.GW.EnsureValidActives();
|
|
|
|
InvalidateGraphics();
|
|
|
|
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 Command::PERSPECTIVE_PROJ:
|
2010-05-03 05:15:28 +00:00
|
|
|
SS.usePerspectiveProj = !SS.usePerspectiveProj;
|
2009-09-29 11:35:19 +00:00
|
|
|
if(SS.cameraTangent < 1e-6) {
|
|
|
|
Error("The perspective factor is set to zero, so the view will "
|
2010-01-16 18:15:40 +00:00
|
|
|
"always be a parallel projection.\n\n"
|
2009-12-04 08:08:41 +00:00
|
|
|
"For a perspective projection, modify the perspective "
|
|
|
|
"factor in the configuration screen. A value around 0.3 "
|
|
|
|
"is typical.");
|
2009-09-29 11:35:19 +00:00
|
|
|
}
|
|
|
|
SS.GW.EnsureValidActives();
|
|
|
|
InvalidateGraphics();
|
|
|
|
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 Command::ONTO_WORKPLANE:
|
2015-03-22 13:23:40 +00:00
|
|
|
if(SS.GW.LockedInWorkplane()) {
|
|
|
|
SS.GW.AnimateOntoWorkplane();
|
|
|
|
SS.GW.ClearSuper();
|
|
|
|
SS.ScheduleShowTW();
|
2010-05-03 05:04:42 +00:00
|
|
|
break;
|
2015-03-22 13:23:40 +00:00
|
|
|
} // if not in 2d mode fall through and use ORTHO logic
|
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 Command::NEAREST_ORTHO:
|
|
|
|
case Command::NEAREST_ISO: {
|
2009-01-02 04:06:47 +00:00
|
|
|
static const Vector ortho[3] = {
|
|
|
|
Vector::From(1, 0, 0),
|
|
|
|
Vector::From(0, 1, 0),
|
|
|
|
Vector::From(0, 0, 1)
|
|
|
|
};
|
|
|
|
double sqrt2 = sqrt(2.0), sqrt6 = sqrt(6.0);
|
|
|
|
Quaternion quat0 = Quaternion::From(SS.GW.projRight, SS.GW.projUp);
|
|
|
|
Quaternion quatf = quat0;
|
|
|
|
double dmin = 1e10;
|
|
|
|
|
|
|
|
// There are 24 possible views; 3*2*2*2
|
|
|
|
int i, j, negi, negj;
|
|
|
|
for(i = 0; i < 3; i++) {
|
|
|
|
for(j = 0; j < 3; j++) {
|
|
|
|
if(i == j) continue;
|
|
|
|
for(negi = 0; negi < 2; negi++) {
|
|
|
|
for(negj = 0; negj < 2; negj++) {
|
|
|
|
Vector ou = ortho[i], ov = ortho[j];
|
|
|
|
if(negi) ou = ou.ScaledBy(-1);
|
|
|
|
if(negj) ov = ov.ScaledBy(-1);
|
|
|
|
Vector on = ou.Cross(ov);
|
|
|
|
|
|
|
|
Vector u, v;
|
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(id == Command::NEAREST_ORTHO || id == Command::ONTO_WORKPLANE) {
|
2009-01-02 04:06:47 +00:00
|
|
|
u = ou;
|
|
|
|
v = ov;
|
|
|
|
} else {
|
|
|
|
u =
|
|
|
|
ou.ScaledBy(1/sqrt2).Plus(
|
|
|
|
on.ScaledBy(-1/sqrt2));
|
|
|
|
v =
|
|
|
|
ou.ScaledBy(-1/sqrt6).Plus(
|
|
|
|
ov.ScaledBy(2/sqrt6).Plus(
|
|
|
|
on.ScaledBy(-1/sqrt6)));
|
|
|
|
}
|
|
|
|
|
|
|
|
Quaternion quatt = Quaternion::From(u, v);
|
|
|
|
double d = min(
|
|
|
|
(quatt.Minus(quat0)).Magnitude(),
|
|
|
|
(quatt.Plus(quat0)).Magnitude());
|
|
|
|
if(d < dmin) {
|
|
|
|
dmin = d;
|
|
|
|
quatf = quatt;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
SS.GW.AnimateOnto(quatf, SS.GW.offset);
|
|
|
|
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 Command::CENTER_VIEW:
|
2009-01-13 06:56:05 +00:00
|
|
|
SS.GW.GroupSelection();
|
|
|
|
if(SS.GW.gs.n == 1 && SS.GW.gs.points == 1) {
|
|
|
|
Quaternion quat0;
|
|
|
|
// Offset is the selected point, quaternion is same as before
|
2009-04-19 05:53:16 +00:00
|
|
|
Vector pt = SK.GetEntity(SS.GW.gs.point[0])->PointGetNum();
|
2009-01-13 06:56:05 +00:00
|
|
|
quat0 = Quaternion::From(SS.GW.projRight, SS.GW.projUp);
|
|
|
|
SS.GW.AnimateOnto(quat0, pt.ScaledBy(-1));
|
|
|
|
SS.GW.ClearSelection();
|
|
|
|
} else {
|
|
|
|
Error("Select a point; this point will become the center "
|
|
|
|
"of the view on screen.");
|
|
|
|
}
|
|
|
|
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 Command::SHOW_MENU_BAR:
|
2013-10-25 05:04:16 +00:00
|
|
|
ToggleMenuBar();
|
2008-04-27 05:00:12 +00:00
|
|
|
SS.GW.EnsureValidActives();
|
2013-10-25 05:04:16 +00:00
|
|
|
InvalidateGraphics();
|
2008-04-27 05:00:12 +00:00
|
|
|
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 Command::SHOW_TOOLBAR:
|
2009-01-02 10:38:36 +00:00
|
|
|
SS.showToolbar = !SS.showToolbar;
|
|
|
|
SS.GW.EnsureValidActives();
|
2009-09-29 11:35:19 +00:00
|
|
|
InvalidateGraphics();
|
2009-01-02 10:38:36 +00:00
|
|
|
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 Command::SHOW_TEXT_WND:
|
2013-10-25 05:04:16 +00:00
|
|
|
SS.GW.showTextWindow = !SS.GW.showTextWindow;
|
2008-04-22 13:14:15 +00:00
|
|
|
SS.GW.EnsureValidActives();
|
|
|
|
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 Command::UNITS_INCHES:
|
|
|
|
SS.viewUnits = Unit::INCHES;
|
2015-03-18 17:02:11 +00:00
|
|
|
SS.ScheduleShowTW();
|
2008-04-22 13:14:15 +00:00
|
|
|
SS.GW.EnsureValidActives();
|
|
|
|
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 Command::UNITS_MM:
|
|
|
|
SS.viewUnits = Unit::MM;
|
2015-03-18 17:02:11 +00:00
|
|
|
SS.ScheduleShowTW();
|
2013-10-25 05:04:16 +00:00
|
|
|
SS.GW.EnsureValidActives();
|
|
|
|
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 Command::FULL_SCREEN:
|
2013-10-25 05:04:16 +00:00
|
|
|
ToggleFullScreen();
|
|
|
|
SS.GW.EnsureValidActives();
|
|
|
|
break;
|
|
|
|
|
2016-05-18 22:51:36 +00:00
|
|
|
default: ssassert(false, "Unexpected menu ID");
|
2008-04-12 15:17:58 +00:00
|
|
|
}
|
|
|
|
InvalidateGraphics();
|
|
|
|
}
|
|
|
|
|
2016-05-05 05:54:05 +00:00
|
|
|
void GraphicsWindow::EnsureValidActives() {
|
2008-04-18 07:06:37 +00:00
|
|
|
bool change = false;
|
|
|
|
// The active group must exist, and not be the references.
|
2009-04-19 05:53:16 +00:00
|
|
|
Group *g = SK.group.FindByIdNoOops(activeGroup);
|
2008-04-18 07:06:37 +00:00
|
|
|
if((!g) || (g->h.v == Group::HGROUP_REFERENCES.v)) {
|
|
|
|
int i;
|
2016-02-17 10:03:07 +00:00
|
|
|
for(i = 0; i < SK.groupOrder.n; i++) {
|
|
|
|
if(SK.groupOrder.elem[i].v != Group::HGROUP_REFERENCES.v) {
|
2008-04-18 07:06:37 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2016-02-17 10:03:07 +00:00
|
|
|
if(i >= SK.groupOrder.n) {
|
2008-06-02 11:43:27 +00:00
|
|
|
// This can happen if the user deletes all the groups in the
|
|
|
|
// sketch. It's difficult to prevent that, because the last
|
|
|
|
// group might have been deleted automatically, because it failed
|
|
|
|
// a dependency. There needs to be something, so create a plane
|
|
|
|
// drawing group and activate that. They should never be able
|
|
|
|
// to delete the references, though.
|
|
|
|
activeGroup = SS.CreateDefaultDrawingGroup();
|
2016-02-18 11:11:59 +00:00
|
|
|
// We've created the default group, but not the workplane entity;
|
|
|
|
// do it now so that drawing mode isn't switched to "Free in 3d".
|
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::ALL);
|
2008-06-02 11:43:27 +00:00
|
|
|
} else {
|
2016-02-17 10:03:07 +00:00
|
|
|
activeGroup = SK.groupOrder.elem[i];
|
2008-06-02 11:43:27 +00:00
|
|
|
}
|
2009-04-19 05:53:16 +00:00
|
|
|
SK.GetGroup(activeGroup)->Activate();
|
2008-04-18 07:06:37 +00:00
|
|
|
change = true;
|
2008-04-13 10:57:41 +00:00
|
|
|
}
|
|
|
|
|
2008-04-18 07:06:37 +00:00
|
|
|
// The active coordinate system must also exist.
|
2008-05-27 02:22:20 +00:00
|
|
|
if(LockedInWorkplane()) {
|
2009-04-19 05:53:16 +00:00
|
|
|
Entity *e = SK.entity.FindByIdNoOops(ActiveWorkplane());
|
2008-05-17 23:48:58 +00:00
|
|
|
if(e) {
|
|
|
|
hGroup hgw = e->group;
|
|
|
|
if(hgw.v != activeGroup.v && SS.GroupsInOrder(activeGroup, hgw)) {
|
|
|
|
// The active workplane is in a group that comes after the
|
|
|
|
// active group; so any request or constraint will fail.
|
2008-05-27 02:22:20 +00:00
|
|
|
SetWorkplaneFreeIn3d();
|
2008-05-17 23:48:58 +00:00
|
|
|
change = true;
|
|
|
|
}
|
|
|
|
} else {
|
2008-05-27 02:22:20 +00:00
|
|
|
SetWorkplaneFreeIn3d();
|
2008-05-17 23:48:58 +00:00
|
|
|
change = true;
|
|
|
|
}
|
2008-04-13 10:57:41 +00:00
|
|
|
}
|
2008-04-18 11:11:48 +00:00
|
|
|
|
2008-06-04 10:22:30 +00:00
|
|
|
// And update the checked state for various menus
|
2008-05-27 02:22:20 +00:00
|
|
|
bool locked = LockedInWorkplane();
|
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
|
|
|
RadioMenuByCmd(Command::FREE_IN_3D, !locked);
|
|
|
|
RadioMenuByCmd(Command::SEL_WORKPLANE, locked);
|
2008-04-22 13:14:15 +00:00
|
|
|
|
2008-06-04 10:22:30 +00:00
|
|
|
SS.UndoEnableMenus();
|
|
|
|
|
2008-06-14 09:51:25 +00:00
|
|
|
switch(SS.viewUnits) {
|
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 Unit::MM:
|
|
|
|
case Unit::INCHES:
|
2008-04-22 13:14:15 +00:00
|
|
|
break;
|
|
|
|
default:
|
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.viewUnits = Unit::MM;
|
2010-01-04 00:35:28 +00:00
|
|
|
break;
|
2008-04-22 13:14:15 +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
|
|
|
RadioMenuByCmd(Command::UNITS_MM, SS.viewUnits == Unit::MM);
|
|
|
|
RadioMenuByCmd(Command::UNITS_INCHES, SS.viewUnits == Unit::INCHES);
|
2008-04-27 05:00:12 +00:00
|
|
|
|
|
|
|
ShowTextWindow(SS.GW.showTextWindow);
|
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
|
|
|
CheckMenuByCmd(Command::SHOW_TEXT_WND, SS.GW.showTextWindow);
|
2008-04-27 05:00:12 +00:00
|
|
|
|
2015-03-24 23:38:06 +00:00
|
|
|
#if defined(__APPLE__)
|
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
|
|
|
CheckMenuByCmd(Command::SHOW_MENU_BAR, MenuBarIsVisible());
|
2013-10-25 05:04:16 +00:00
|
|
|
#endif
|
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
|
|
|
CheckMenuByCmd(Command::SHOW_TOOLBAR, SS.showToolbar);
|
|
|
|
CheckMenuByCmd(Command::PERSPECTIVE_PROJ, SS.usePerspectiveProj);
|
|
|
|
CheckMenuByCmd(Command::SHOW_GRID, SS.GW.showSnapGrid);
|
2015-03-24 23:38:06 +00:00
|
|
|
#if defined(HAVE_GTK) || defined(__APPLE__)
|
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
|
|
|
CheckMenuByCmd(Command::FULL_SCREEN, FullScreenIsActive());
|
2013-10-25 05:04:16 +00:00
|
|
|
#endif
|
2009-01-02 10:38:36 +00:00
|
|
|
|
2015-03-18 17:02:11 +00:00
|
|
|
if(change) SS.ScheduleShowTW();
|
2008-04-13 10:57:41 +00:00
|
|
|
}
|
|
|
|
|
2016-05-05 05:54:05 +00:00
|
|
|
void GraphicsWindow::SetWorkplaneFreeIn3d() {
|
2009-04-19 05:53:16 +00:00
|
|
|
SK.GetGroup(activeGroup)->activeWorkplane = Entity::FREE_IN_3D;
|
2008-05-27 02:22:20 +00:00
|
|
|
}
|
2016-05-05 05:54:05 +00:00
|
|
|
hEntity GraphicsWindow::ActiveWorkplane() {
|
2009-04-19 05:53:16 +00:00
|
|
|
Group *g = SK.group.FindByIdNoOops(activeGroup);
|
2008-06-01 00:26:41 +00:00
|
|
|
if(g) {
|
|
|
|
return g->activeWorkplane;
|
|
|
|
} else {
|
|
|
|
return Entity::FREE_IN_3D;
|
|
|
|
}
|
2008-05-27 02:22:20 +00:00
|
|
|
}
|
2016-05-05 05:54:05 +00:00
|
|
|
bool GraphicsWindow::LockedInWorkplane() {
|
2008-05-27 02:22:20 +00:00
|
|
|
return (SS.GW.ActiveWorkplane().v != Entity::FREE_IN_3D.v);
|
|
|
|
}
|
|
|
|
|
2016-05-05 05:54:05 +00:00
|
|
|
void GraphicsWindow::ForceTextWindowShown() {
|
2008-09-17 10:13:37 +00:00
|
|
|
if(!showTextWindow) {
|
|
|
|
showTextWindow = 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
|
|
|
CheckMenuByCmd(Command::SHOW_TEXT_WND, true);
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
ShowTextWindow(true);
|
2008-09-17 10:13:37 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-05-05 05:54:05 +00:00
|
|
|
void GraphicsWindow::DeleteTaggedRequests() {
|
2009-07-08 09:36:18 +00:00
|
|
|
// Rewrite any point-coincident constraints that were affected by this
|
|
|
|
// deletion.
|
|
|
|
Request *r;
|
|
|
|
for(r = SK.request.First(); r; r = SK.request.NextAfter(r)) {
|
|
|
|
if(!r->tag) continue;
|
|
|
|
FixConstraintsForRequestBeingDeleted(r->h);
|
|
|
|
}
|
|
|
|
// and then delete the tagged requests.
|
2009-04-19 05:53:16 +00:00
|
|
|
SK.request.RemoveTagged();
|
2009-01-03 12:27:33 +00:00
|
|
|
|
|
|
|
// An edit might be in progress for the just-deleted item. So
|
|
|
|
// now it's not.
|
|
|
|
HideGraphicsEditControl();
|
2010-07-12 07:51:12 +00:00
|
|
|
SS.TW.HideEditControl();
|
2009-01-03 12:27:33 +00:00
|
|
|
// And clear out the selection, which could contain that item.
|
|
|
|
ClearSuper();
|
|
|
|
// And regenerate to get rid of what it generates, plus anything
|
|
|
|
// that references it (since the regen code checks for that).
|
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::ALL);
|
2009-01-03 12:27:33 +00:00
|
|
|
EnsureValidActives();
|
2015-03-18 17:02:11 +00:00
|
|
|
SS.ScheduleShowTW();
|
2009-01-03 12:27:33 +00:00
|
|
|
}
|
|
|
|
|
2009-09-29 11:35:19 +00:00
|
|
|
Vector GraphicsWindow::SnapToGrid(Vector p) {
|
|
|
|
if(!LockedInWorkplane()) return p;
|
|
|
|
|
|
|
|
EntityBase *wrkpl = SK.GetEntity(ActiveWorkplane()),
|
|
|
|
*norm = wrkpl->Normal();
|
|
|
|
Vector wo = SK.GetEntity(wrkpl->point[0])->PointGetNum(),
|
|
|
|
wu = norm->NormalU(),
|
|
|
|
wv = norm->NormalV(),
|
|
|
|
wn = norm->NormalN();
|
|
|
|
|
|
|
|
Vector pp = (p.Minus(wo)).DotInToCsys(wu, wv, wn);
|
|
|
|
pp.x = floor((pp.x / SS.gridSpacing) + 0.5)*SS.gridSpacing;
|
|
|
|
pp.y = floor((pp.y / SS.gridSpacing) + 0.5)*SS.gridSpacing;
|
|
|
|
pp.z = 0;
|
2015-03-29 00:30:52 +00:00
|
|
|
|
2009-09-29 11:35:19 +00:00
|
|
|
return pp.ScaleOutOfCsys(wu, wv, wn).Plus(wo);
|
|
|
|
}
|
|
|
|
|
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
|
|
|
void GraphicsWindow::MenuEdit(Command id) {
|
2008-04-12 15:17:58 +00:00
|
|
|
switch(id) {
|
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 Command::UNSELECT_ALL:
|
2008-06-01 04:31:28 +00:00
|
|
|
SS.GW.GroupSelection();
|
2009-09-18 08:14:15 +00:00
|
|
|
// If there's nothing selected to de-select, and no operation
|
|
|
|
// to cancel, then perhaps they want to return to the home
|
|
|
|
// screen in the text window.
|
2009-09-29 11:35:19 +00:00
|
|
|
if(SS.GW.gs.n == 0 &&
|
|
|
|
SS.GW.gs.constraints == 0 &&
|
2016-05-23 10:15:38 +00:00
|
|
|
SS.GW.pending.operation == Pending::NONE)
|
2009-09-29 11:35:19 +00:00
|
|
|
{
|
2009-09-24 15:52:48 +00:00
|
|
|
if(!(TextEditControlIsVisible() ||
|
|
|
|
GraphicsEditControlIsVisible()))
|
|
|
|
{
|
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::STYLE_INFO) {
|
|
|
|
SS.TW.GoToScreen(TextWindow::Screen::LIST_OF_STYLES);
|
2009-09-18 08:14:15 +00:00
|
|
|
} else {
|
|
|
|
SS.TW.ClearSuper();
|
|
|
|
}
|
2008-06-02 11:43:27 +00:00
|
|
|
}
|
2008-06-01 04:31:28 +00:00
|
|
|
}
|
2008-06-01 00:26:41 +00:00
|
|
|
SS.GW.ClearSuper();
|
2010-07-12 07:51:12 +00:00
|
|
|
SS.TW.HideEditControl();
|
2009-01-25 09:19:59 +00:00
|
|
|
SS.nakedEdges.Clear();
|
2010-01-14 05:24:32 +00:00
|
|
|
SS.justExportedInfo.draw = false;
|
2010-03-01 17:23:57 +00:00
|
|
|
// This clears the marks drawn to indicate which points are
|
|
|
|
// still free to drag.
|
|
|
|
Param *p;
|
|
|
|
for(p = SK.param.First(); p; p = SK.param.NextAfter(p)) {
|
|
|
|
p->free = false;
|
|
|
|
}
|
2016-01-27 04:07:54 +00:00
|
|
|
if(SS.exportMode) {
|
|
|
|
SS.exportMode = false;
|
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::ALL);
|
2016-01-27 04:07:54 +00:00
|
|
|
}
|
2008-04-13 10:57:41 +00:00
|
|
|
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 Command::SELECT_ALL: {
|
2009-11-03 18:54:49 +00:00
|
|
|
Entity *e;
|
|
|
|
for(e = SK.entity.First(); e; e = SK.entity.NextAfter(e)) {
|
|
|
|
if(e->group.v != SS.GW.activeGroup.v) continue;
|
|
|
|
if(e->IsFace() || e->IsDistance()) continue;
|
2009-11-04 07:59:23 +00:00
|
|
|
if(!e->IsVisible()) continue;
|
2009-11-03 18:54:49 +00:00
|
|
|
|
2010-01-03 10:26:15 +00:00
|
|
|
SS.GW.MakeSelected(e->h);
|
2009-11-03 18:54:49 +00:00
|
|
|
}
|
|
|
|
InvalidateGraphics();
|
2015-03-18 17:02:11 +00:00
|
|
|
SS.ScheduleShowTW();
|
2009-11-03 18:54:49 +00:00
|
|
|
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 Command::SELECT_CHAIN: {
|
2009-11-03 18:54:49 +00:00
|
|
|
Entity *e;
|
|
|
|
int newlySelected = 0;
|
|
|
|
bool didSomething;
|
|
|
|
do {
|
|
|
|
didSomething = false;
|
|
|
|
for(e = SK.entity.First(); e; e = SK.entity.NextAfter(e)) {
|
|
|
|
if(e->group.v != SS.GW.activeGroup.v) continue;
|
|
|
|
if(!e->HasEndpoints()) continue;
|
2009-11-04 07:59:23 +00:00
|
|
|
if(!e->IsVisible()) continue;
|
2009-11-03 18:54:49 +00:00
|
|
|
|
|
|
|
Vector st = e->EndpointStart(),
|
|
|
|
fi = e->EndpointFinish();
|
2015-03-29 00:30:52 +00:00
|
|
|
|
2009-11-03 18:54:49 +00:00
|
|
|
bool onChain = false, alreadySelected = false;
|
|
|
|
List<Selection> *ls = &(SS.GW.selection);
|
|
|
|
for(Selection *s = ls->First(); s; s = ls->NextAfter(s)) {
|
|
|
|
if(!s->entity.v) continue;
|
|
|
|
if(s->entity.v == e->h.v) {
|
|
|
|
alreadySelected = true;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
Entity *se = SK.GetEntity(s->entity);
|
|
|
|
if(!se->HasEndpoints()) continue;
|
|
|
|
|
|
|
|
Vector sst = se->EndpointStart(),
|
|
|
|
sfi = se->EndpointFinish();
|
|
|
|
|
|
|
|
if(sst.Equals(st) || sst.Equals(fi) ||
|
|
|
|
sfi.Equals(st) || sfi.Equals(fi))
|
|
|
|
{
|
|
|
|
onChain = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(onChain && !alreadySelected) {
|
2010-01-03 10:26:15 +00:00
|
|
|
SS.GW.MakeSelected(e->h);
|
2009-11-03 18:54:49 +00:00
|
|
|
newlySelected++;
|
|
|
|
didSomething = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} while(didSomething);
|
|
|
|
if(newlySelected == 0) {
|
2010-01-03 10:26:15 +00:00
|
|
|
Error("No additional entities share endpoints with the "
|
|
|
|
"selected entities.");
|
2009-11-03 18:54:49 +00:00
|
|
|
}
|
|
|
|
InvalidateGraphics();
|
2015-03-18 17:02:11 +00:00
|
|
|
SS.ScheduleShowTW();
|
2009-11-03 18:54:49 +00:00
|
|
|
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 Command::ROTATE_90: {
|
2009-06-21 20:39:42 +00:00
|
|
|
SS.GW.GroupSelection();
|
|
|
|
Entity *e = NULL;
|
|
|
|
if(SS.GW.gs.n == 1 && SS.GW.gs.points == 1) {
|
|
|
|
e = SK.GetEntity(SS.GW.gs.point[0]);
|
|
|
|
} else if(SS.GW.gs.n == 1 && SS.GW.gs.entities == 1) {
|
|
|
|
e = SK.GetEntity(SS.GW.gs.entity[0]);
|
|
|
|
}
|
|
|
|
SS.GW.ClearSelection();
|
|
|
|
|
|
|
|
hGroup hg = e ? e->group : SS.GW.activeGroup;
|
|
|
|
Group *g = SK.GetGroup(hg);
|
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::LINKED) {
|
2009-06-21 20:39:42 +00:00
|
|
|
Error("To use this command, select a point or other "
|
2016-05-07 05:27:54 +00:00
|
|
|
"entity from an linked part, or make a link "
|
2009-06-21 20:39:42 +00:00
|
|
|
"group the active group.");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SS.UndoRemember();
|
|
|
|
// Rotate by ninety degrees about the coordinate axis closest
|
|
|
|
// to the screen normal.
|
|
|
|
Vector norm = SS.GW.projRight.Cross(SS.GW.projUp);
|
|
|
|
norm = norm.ClosestOrtho();
|
|
|
|
norm = norm.WithMagnitude(1);
|
|
|
|
Quaternion qaa = Quaternion::From(norm, PI/2);
|
|
|
|
|
2009-07-20 19:05:33 +00:00
|
|
|
g->TransformImportedBy(Vector::From(0, 0, 0), qaa);
|
2009-06-21 20:39:42 +00:00
|
|
|
|
|
|
|
// and regenerate as necessary.
|
|
|
|
SS.MarkGroupDirty(hg);
|
|
|
|
SS.GenerateAll();
|
|
|
|
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 Command::SNAP_TO_GRID: {
|
2009-09-29 11:35:19 +00:00
|
|
|
if(!SS.GW.LockedInWorkplane()) {
|
|
|
|
Error("No workplane is active. Select a workplane to define "
|
|
|
|
"the plane for the snap grid.");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
SS.GW.GroupSelection();
|
2016-04-18 06:40:42 +00:00
|
|
|
if(SS.GW.gs.points == 0 && SS.GW.gs.constraintLabels == 0) {
|
|
|
|
Error("Can't snap these items to grid; select points, "
|
|
|
|
"text comments, or constraints with a label. "
|
|
|
|
"To snap a line, select its endpoints.");
|
2009-09-29 11:35:19 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
SS.UndoRemember();
|
2009-12-04 08:08:41 +00:00
|
|
|
|
|
|
|
List<Selection> *ls = &(SS.GW.selection);
|
|
|
|
for(Selection *s = ls->First(); s; s = ls->NextAfter(s)) {
|
|
|
|
if(s->entity.v) {
|
|
|
|
hEntity hp = s->entity;
|
|
|
|
Entity *ep = SK.GetEntity(hp);
|
|
|
|
if(!ep->IsPoint()) continue;
|
|
|
|
|
|
|
|
Vector p = ep->PointGetNum();
|
|
|
|
ep->PointForceTo(SS.GW.SnapToGrid(p));
|
|
|
|
SS.GW.pending.points.Add(&hp);
|
|
|
|
SS.MarkGroupDirty(ep->group);
|
|
|
|
} else if(s->constraint.v) {
|
|
|
|
Constraint *c = SK.GetConstraint(s->constraint);
|
|
|
|
c->disp.offset = SS.GW.SnapToGrid(c->disp.offset);
|
|
|
|
}
|
2009-09-29 11:35:19 +00:00
|
|
|
}
|
2009-11-03 18:54:49 +00:00
|
|
|
// Regenerate, with these points marked as dragged so that they
|
|
|
|
// get placed as close as possible to our snap grid.
|
|
|
|
SS.GenerateAll();
|
|
|
|
SS.GW.ClearPending();
|
|
|
|
|
2009-09-29 11:35:19 +00:00
|
|
|
SS.GW.ClearSelection();
|
|
|
|
InvalidateGraphics();
|
|
|
|
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 Command::UNDO:
|
2008-06-04 10:22:30 +00:00
|
|
|
SS.UndoUndo();
|
|
|
|
break;
|
2015-03-29 00:30:52 +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
|
|
|
case Command::REDO:
|
2008-06-04 10:22:30 +00:00
|
|
|
SS.UndoRedo();
|
|
|
|
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 Command::REGEN_ALL:
|
2008-06-30 09:34:03 +00:00
|
|
|
SS.ReloadAllImported();
|
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::UNTIL_ACTIVE);
|
2015-03-18 17:02:11 +00:00
|
|
|
SS.ScheduleShowTW();
|
2008-06-30 09:34:03 +00:00
|
|
|
break;
|
|
|
|
|
2016-05-18 22:51:36 +00:00
|
|
|
default: ssassert(false, "Unexpected menu ID");
|
2008-04-13 10:57:41 +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
|
|
|
void GraphicsWindow::MenuRequest(Command id) {
|
2013-08-26 18:58:35 +00:00
|
|
|
const char *s;
|
2008-04-13 10:57:41 +00:00
|
|
|
switch(id) {
|
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 Command::SEL_WORKPLANE: {
|
2008-04-18 07:06:37 +00:00
|
|
|
SS.GW.GroupSelection();
|
2009-04-19 05:53:16 +00:00
|
|
|
Group *g = SK.GetGroup(SS.GW.activeGroup);
|
2008-06-06 11:35:28 +00:00
|
|
|
|
2008-04-27 03:26:27 +00:00
|
|
|
if(SS.GW.gs.n == 1 && SS.GW.gs.workplanes == 1) {
|
2008-06-06 11:35:28 +00:00
|
|
|
// A user-selected workplane
|
|
|
|
g->activeWorkplane = SS.GW.gs.entity[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
|
|
|
} else if(g->type == Group::Type::DRAWING_WORKPLANE) {
|
2008-06-06 11:35:28 +00:00
|
|
|
// The group's default workplane
|
|
|
|
g->activeWorkplane = g->h.entity(0);
|
2010-05-03 05:04:42 +00:00
|
|
|
Message("No workplane selected. Activating default workplane "
|
|
|
|
"for this group.");
|
2008-04-25 08:26:15 +00:00
|
|
|
}
|
|
|
|
|
2008-05-27 02:22:20 +00:00
|
|
|
if(!SS.GW.LockedInWorkplane()) {
|
2010-05-03 05:04:42 +00:00
|
|
|
Error("No workplane is selected, and the active group does "
|
|
|
|
"not have a default workplane. Try selecting a "
|
|
|
|
"workplane, or activating a sketch-in-new-workplane "
|
|
|
|
"group.");
|
2008-04-25 08:26:15 +00:00
|
|
|
break;
|
2008-04-18 07:06:37 +00:00
|
|
|
}
|
2008-04-27 03:26:27 +00:00
|
|
|
// Align the view with the selected workplane
|
2008-05-27 02:22:20 +00:00
|
|
|
SS.GW.AnimateOntoWorkplane();
|
2008-05-17 23:48:58 +00:00
|
|
|
SS.GW.ClearSuper();
|
2015-03-18 17:02:11 +00:00
|
|
|
SS.ScheduleShowTW();
|
2008-04-18 07:06:37 +00:00
|
|
|
break;
|
2008-04-25 08:26:15 +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
|
|
|
case Command::FREE_IN_3D:
|
2008-05-27 02:22:20 +00:00
|
|
|
SS.GW.SetWorkplaneFreeIn3d();
|
2008-04-18 07:06:37 +00:00
|
|
|
SS.GW.EnsureValidActives();
|
2015-03-18 17:02:11 +00:00
|
|
|
SS.ScheduleShowTW();
|
2009-09-29 11:35:19 +00:00
|
|
|
InvalidateGraphics();
|
2008-04-18 07:06:37 +00:00
|
|
|
break;
|
2008-07-14 02:45:11 +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
|
|
|
case Command::TANGENT_ARC:
|
2008-07-14 02:45:11 +00:00
|
|
|
SS.GW.GroupSelection();
|
|
|
|
if(SS.GW.gs.n == 1 && SS.GW.gs.points == 1) {
|
2009-01-03 12:27:33 +00:00
|
|
|
SS.GW.MakeTangentArc();
|
2010-05-16 16:36:23 +00:00
|
|
|
} else if(SS.GW.gs.n != 0) {
|
|
|
|
Error("Bad selection for tangent arc at point. Select a "
|
|
|
|
"single point, or select nothing to set up arc "
|
|
|
|
"parameters.");
|
2008-07-14 02:45:11 +00:00
|
|
|
} else {
|
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.TW.GoToScreen(TextWindow::Screen::TANGENT_ARC);
|
2010-05-16 16:36:23 +00:00
|
|
|
SS.GW.ForceTextWindowShown();
|
2015-03-18 17:02:11 +00:00
|
|
|
SS.ScheduleShowTW();
|
2015-03-29 21:37:21 +00:00
|
|
|
InvalidateGraphics(); // repaint toolbar
|
2008-07-14 02:45:11 +00:00
|
|
|
}
|
|
|
|
break;
|
2010-05-16 16:36:23 +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
|
|
|
case Command::ARC: s = "click point on arc (draws anti-clockwise)"; goto c;
|
|
|
|
case Command::DATUM_POINT: s = "click to place datum point"; goto c;
|
|
|
|
case Command::LINE_SEGMENT: s = "click first point of line segment"; goto c;
|
|
|
|
case Command::CONSTR_SEGMENT: s = "click first point of construction line segment"; goto c;
|
|
|
|
case Command::CUBIC: s = "click first point of cubic segment"; goto c;
|
|
|
|
case Command::CIRCLE: s = "click center of circle"; goto c;
|
|
|
|
case Command::WORKPLANE: s = "click origin of workplane"; goto c;
|
|
|
|
case Command::RECTANGLE: s = "click one corner of rectangle"; goto c;
|
|
|
|
case Command::TTF_TEXT: s = "click top left of text"; goto c;
|
2008-04-13 10:57:41 +00:00
|
|
|
c:
|
2016-05-23 10:15:38 +00:00
|
|
|
SS.GW.pending.operation = GraphicsWindow::Pending::COMMAND;
|
|
|
|
SS.GW.pending.command = id;
|
2008-05-05 06:18:01 +00:00
|
|
|
SS.GW.pending.description = s;
|
2015-03-18 17:02:11 +00:00
|
|
|
SS.ScheduleShowTW();
|
2015-03-29 21:37:21 +00:00
|
|
|
InvalidateGraphics(); // repaint toolbar
|
2008-04-12 15:17:58 +00:00
|
|
|
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 Command::CONSTRUCTION: {
|
2009-11-04 07:59:23 +00:00
|
|
|
SS.UndoRemember();
|
2008-05-07 04:17:29 +00:00
|
|
|
SS.GW.GroupSelection();
|
2010-01-07 08:02:13 +00:00
|
|
|
if(SS.GW.gs.entities == 0) {
|
|
|
|
Error("No entities are selected. Select entities before "
|
|
|
|
"trying to toggle their construction state.");
|
|
|
|
}
|
2008-05-07 04:17:29 +00:00
|
|
|
int i;
|
|
|
|
for(i = 0; i < SS.GW.gs.entities; i++) {
|
|
|
|
hEntity he = SS.GW.gs.entity[i];
|
|
|
|
if(!he.isFromRequest()) continue;
|
2009-04-19 05:53:16 +00:00
|
|
|
Request *r = SK.GetRequest(he.request());
|
2008-05-07 04:17:29 +00:00
|
|
|
r->construction = !(r->construction);
|
2008-06-02 11:43:27 +00:00
|
|
|
SS.MarkGroupDirty(r->group);
|
2008-05-07 04:17:29 +00:00
|
|
|
}
|
|
|
|
SS.GW.ClearSelection();
|
2008-06-02 09:31:26 +00:00
|
|
|
SS.GenerateAll();
|
2008-05-07 04:17:29 +00:00
|
|
|
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 Command::SPLIT_CURVES:
|
2009-01-03 12:27:33 +00:00
|
|
|
SS.GW.SplitLinesOrCurves();
|
|
|
|
break;
|
|
|
|
|
2016-05-18 22:51:36 +00:00
|
|
|
default: ssassert(false, "Unexpected menu ID");
|
2008-04-12 15:17:58 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-05-05 05:54:05 +00:00
|
|
|
void GraphicsWindow::ClearSuper() {
|
2008-06-01 00:26:41 +00:00
|
|
|
HideGraphicsEditControl();
|
2008-05-17 11:15:14 +00:00
|
|
|
ClearPending();
|
|
|
|
ClearSelection();
|
|
|
|
hover.Clear();
|
|
|
|
EnsureValidActives();
|
|
|
|
}
|
|
|
|
|
2010-05-03 05:04:42 +00:00
|
|
|
void GraphicsWindow::ToggleBool(bool *v) {
|
|
|
|
*v = !*v;
|
2008-04-11 12:47:14 +00:00
|
|
|
|
2008-06-02 05:38:12 +00:00
|
|
|
// The faces are shown as special stippling on the shaded triangle mesh,
|
|
|
|
// so not meaningful to show them and hide the shaded.
|
2010-05-03 05:04:42 +00:00
|
|
|
if(!showShaded) showFaces = false;
|
2008-06-02 05:38:12 +00:00
|
|
|
|
2009-05-29 05:40:17 +00:00
|
|
|
// We might need to regenerate the mesh and edge list, since the edges
|
|
|
|
// wouldn't have been generated if they were previously hidden.
|
2010-05-03 05:04:42 +00:00
|
|
|
if(showEdges) (SK.GetGroup(activeGroup))->displayDirty = true;
|
2009-05-29 05:40:17 +00:00
|
|
|
|
2008-06-02 09:31:26 +00:00
|
|
|
SS.GenerateAll();
|
2008-04-11 12:47:14 +00:00
|
|
|
InvalidateGraphics();
|
2015-03-18 17:02:11 +00:00
|
|
|
SS.ScheduleShowTW();
|
2008-04-11 12:47:14 +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
|
|
|
Constraint::Type GraphicsWindow::SuggestLineConstraint(hRequest request) {
|
2015-03-29 22:26:07 +00:00
|
|
|
if(LockedInWorkplane()) {
|
|
|
|
Entity *ptA = SK.GetEntity(request.entity(1)),
|
|
|
|
*ptB = SK.GetEntity(request.entity(2));
|
|
|
|
|
|
|
|
Expr *au, *av, *bu, *bv;
|
|
|
|
|
|
|
|
ptA->PointGetExprsInWorkplane(ActiveWorkplane(), &au, &av);
|
|
|
|
ptB->PointGetExprsInWorkplane(ActiveWorkplane(), &bu, &bv);
|
|
|
|
|
2015-11-19 05:30:31 +00:00
|
|
|
double du = au->Minus(bu)->Eval();
|
|
|
|
double dv = av->Minus(bv)->Eval();
|
2015-03-29 22:26:07 +00:00
|
|
|
|
2015-11-19 05:30:31 +00:00
|
|
|
const double TOLERANCE_RATIO = 0.02;
|
|
|
|
if(fabs(dv) > LENGTH_EPS && fabs(du / dv) < TOLERANCE_RATIO)
|
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
|
|
|
return Constraint::Type::VERTICAL;
|
2015-11-19 05:30:31 +00:00
|
|
|
else if(fabs(du) > LENGTH_EPS && fabs(dv / du) < TOLERANCE_RATIO)
|
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
|
|
|
return Constraint::Type::HORIZONTAL;
|
2015-03-29 22:26:07 +00:00
|
|
|
else
|
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
|
|
|
return Constraint::Type::UNKNOWN;
|
2015-03-29 22:26:07 +00:00
|
|
|
} else {
|
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
|
|
|
return Constraint::Type::UNKNOWN;
|
2015-03-29 22:26:07 +00:00
|
|
|
}
|
|
|
|
}
|