zcy
/
solvespace
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a button to hide construction entities. 

Also, mark not just curves, but also points and normals derived from
construction requests as construction.

Also, don't always mark arc center point as construction just to
exclude it from chord tolerance bounding box calculation; instead,
special-case it there.
pull/434/head
whitequark 2019-05-23 16:06:24 +00:00
parent e67f967933
commit 50c004b679
19 changed files with 68 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -69,6 +69,7 @@ Other new features:
* New command-line interface, for batch exporting and more.
* The graphical interface now supports HiDPI screens on every OS.
* New option to lock Z axis to be always vertical, like in SketchUp.
* New button to hide all construction entities.
* New link to match the on-screen size of the sketch with its actual size,
"view → set to full scale".
* When zooming to fit, constraints are also considered.

1
res/CMakeLists.txt
View File

@ -208,6 +208,7 @@ add_resources(
icons/graphics-window/trim.png
icons/graphics-window/vert.png
icons/text-window/constraint.png
icons/text-window/construction.png
icons/text-window/edges.png
icons/text-window/faces.png
icons/text-window/occluded-visible.png

BIN
res/icons/text-window/construction.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 739 B

1
src/drawentity.cpp
View File

@ -158,6 +158,7 @@ bool Entity::IsVisible() const {
if(IsPoint() && !SS.GW.showPoints) return false;
if(IsNormal() && !SS.GW.showNormals) return false;
if(construction && !SS.GW.showConstruction) return false;
if(!SS.GW.showWorkplanes) {
if(IsWorkplane() && !h.isFromRequest()) {

1
src/graphicswin.cpp
View File

@ -380,6 +380,7 @@ void GraphicsWindow::Init() {
showWorkplanes = false;
showNormals = true;
showPoints = true;
showConstruction = true;
showConstraints = true;
showShaded = true;
showEdges = true;

8
src/request.cpp
View File

@ -145,12 +145,7 @@ void Request::Generate(IdList<Entity,hEntity> *entity,
p.h = h.entity(i+((et != (Entity::Type)0) ? 1 : 0));
p.group = group;
p.style = style;
if(type == Request::Type::ARC_OF_CIRCLE && i == 0) {
// mark arc center point as construction, since it shouldn't be included
// in bounding box calculation
p.construction = true;
}
p.construction = e.construction;
if(workplane.v == Entity::FREE_IN_3D.v) {
p.type = Entity::Type::POINT_IN_3D;
// params for x y z
@ -172,6 +167,7 @@ void Request::Generate(IdList<Entity,hEntity> *entity,
n.h = h.entity(32);
n.group = group;
n.style = style;
n.construction = e.construction;
if(workplane.v == Entity::FREE_IN_3D.v) {
n.type = Entity::Type::NORMAL_IN_3D;
n.param[0] = AddParam(param, h.param(32+0));

8
src/solvespace.cpp
View File

@ -996,6 +996,14 @@ BBox Sketch::CalculateEntityBBox(bool includingInvisible) {
if(e.construction) continue;
if(!(includingInvisible || e.IsVisible())) continue;
// arc center point shouldn't be included in bounding box calculation
if(e.IsPoint() && e.h.isFromRequest()) {
Request *r = SK.GetRequest(e.h.request());
if(r->type == Request::Type::ARC_OF_CIRCLE && e.h.v == r->h.entity(1).v) {
continue;
}
}
if(e.IsPoint()) {
includePoint(e.PointGetNum());
continue;

19
src/textwin.cpp
View File

@ -156,28 +156,31 @@ public:
static SpacerButton spacerButton;
static ShowHideButton workplanesButton =
{ &(SS.GW.showWorkplanes), "workplane", "workplanes from inactive groups" };
{ &(SS.GW.showWorkplanes), "workplane", "workplanes from inactive groups" };
static ShowHideButton normalsButton =
{ &(SS.GW.showNormals), "normal", "normals" };
{ &(SS.GW.showNormals), "normal", "normals" };
static ShowHideButton pointsButton =
{ &(SS.GW.showPoints), "point", "points" };
{ &(SS.GW.showPoints), "point", "points" };
static ShowHideButton constructionButton =
{ &(SS.GW.showConstruction), "construction", "construction entities" };
static ShowHideButton constraintsButton =
{ &(SS.GW.showConstraints), "constraint", "constraints and dimensions" };
{ &(SS.GW.showConstraints), "constraint", "constraints and dimensions" };
static FacesButton facesButton;
static ShowHideButton shadedButton =
{ &(SS.GW.showShaded), "shaded", "shaded view of solid model" };
{ &(SS.GW.showShaded), "shaded", "shaded view of solid model" };
static ShowHideButton edgesButton =
{ &(SS.GW.showEdges), "edges", "edges of solid model" };
{ &(SS.GW.showEdges), "edges", "edges of solid model" };
static ShowHideButton outlinesButton =
{ &(SS.GW.showOutlines), "outlines", "outline of solid model" };
{ &(SS.GW.showOutlines), "outlines", "outline of solid model" };
static ShowHideButton meshButton =
{ &(SS.GW.showMesh), "mesh", "triangle mesh of solid model" };
{ &(SS.GW.showMesh), "mesh", "triangle mesh of solid model" };
static OccludedLinesButton occludedLinesButton;
static Button *buttons[] = {
&workplanesButton,
&normalsButton,
&pointsButton,
&constructionButton,
&constraintsButton,
&facesButton,
&spacerButton,

1
src/ui.h
View File

@ -768,6 +768,7 @@ public:
bool showWorkplanes;
bool showNormals;
bool showPoints;
bool showConstruction;
bool showConstraints;
bool showTextWindow;
bool showShaded;

2
test/constraint/arc_line_tangent/normal.slvs
View File

@ -294,7 +294,7 @@ AddEntity
Entity.h.v=00040001
Entity.type=2001
Entity.construction=1
Entity.construction=0
Entity.workplane.v=80020000
Entity.actPoint.x=-5.00000000000000000000
Entity.actPoint.y=10.00000000000000000000

4
test/constraint/curve_curve_tangent/arc_arc.slvs
View File

@ -279,7 +279,7 @@ AddEntity
Entity.h.v=00040001
Entity.type=2001
Entity.construction=1
Entity.construction=0
Entity.workplane.v=80020000
Entity.actPoint.x=-5.00000000000000000000
Entity.actPoint.y=15.00000000000000000000
@ -326,7 +326,7 @@ AddEntity
Entity.h.v=00050001
Entity.type=2001
Entity.construction=1
Entity.construction=0
Entity.workplane.v=80020000
Entity.actPoint.x=-25.00000000000000000000
Entity.actPoint.y=15.00000000000000000000

4
test/constraint/curve_curve_tangent/arc_cubic.slvs
View File

@ -314,7 +314,7 @@ AddEntity
Entity.h.v=00040001
Entity.type=2001
Entity.construction=1
Entity.construction=0
Entity.workplane.v=80020000
Entity.actPoint.x=-5.00000000000000000000
Entity.actPoint.y=10.00000000000000000000
@ -405,7 +405,7 @@ AddEntity
Entity.h.v=00060001
Entity.type=2001
Entity.construction=1
Entity.construction=0
Entity.workplane.v=80020000
Entity.actPoint.x=10.00000000000000000000
Entity.actPoint.y=-5.00000000000000000000

2
test/constraint/equal_line_arc_len/normal.slvs
View File

@ -271,7 +271,7 @@ AddEntity
Entity.h.v=00040001
Entity.type=2001
Entity.construction=1
Entity.construction=0
Entity.workplane.v=80020000
Entity.actPoint.x=-4.99993226121819223096
Entity.actPoint.y=10.00006773878180865722

BIN
test/constraint/pt_face_distance/normal.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

18
test/constraint/pt_face_distance/normal.slvs
View File

@ -326,7 +326,7 @@ AddEntity
Entity.h.v=00050000
Entity.type=2001
Entity.construction=0
Entity.construction=1
Entity.workplane.v=00010000
Entity.actPoint.x=-10.00000000000000000000
Entity.actPoint.y=5.00000000000000000000
@ -580,11 +580,13 @@ CCtrl 0 0.00000000000000000000 5.00000000000000000000 0.00000000000000000000 Wei
CCtrl 1 0.00000000000000000000 5.00000000000000000000 5.00000000000000000000 Weight 0.70710678118654757274
CCtrl 2 0.00000000000000000000 0.00000000000000030616 5.00000000000000000000 Weight 1.00000000000000000000
CurvePt 1 0.00000000000000000000 5.00000000000000000000 0.00000000000000000000
CurvePt 0 0.00000000000000000000 4.91652684208287205081 0.90981526206072360630
CurvePt 0 0.00000000000000000000 4.64894150531215188948 1.84047354780936389673
CurvePt 0 0.00000000000000000000 4.18497755609325672310 2.73604876692571252761
CurvePt 0 0.00000000000000000000 3.53553390593273775266 3.53553390593273775266
CurvePt 0 0.00000000000000000000 2.73604876692571252761 4.18497755609325672310
CurvePt 0 0.00000000000000000000 1.84047354780936411878 4.64894150531215188948
CurvePt 0 0.00000000000000000000 0.90981526206072382834 4.91652684208287205081
CurvePt 1 0.00000000000000000000 0.00000000000000030616 5.00000000000000000000
AddCurve
Curve 00000002 1 2 00000002 00000003
@ -592,11 +594,13 @@ CCtrl 0 10.00000000000000000000 5.00000000000000000000 0.00000000000000000000 We
CCtrl 1 10.00000000000000000000 5.00000000000000000000 5.00000000000000000000 Weight 0.70710678118654757274
CCtrl 2 10.00000000000000000000 0.00000000000000030616 5.00000000000000000000 Weight 1.00000000000000000000
CurvePt 1 10.00000000000000000000 5.00000000000000000000 0.00000000000000000000
CurvePt 0 10.00000000000000000000 4.91652684208287205081 0.90981526206072360630
CurvePt 0 10.00000000000000000000 4.64894150531215188948 1.84047354780936389673
CurvePt 0 10.00000000000000000000 4.18497755609325672310 2.73604876692571252761
CurvePt 0 10.00000000000000000000 3.53553390593273775266 3.53553390593273775266
CurvePt 0 10.00000000000000000000 2.73604876692571252761 4.18497755609325672310
CurvePt 0 10.00000000000000000000 1.84047354780936411878 4.64894150531215188948
CurvePt 0 10.00000000000000000000 0.90981526206072382834 4.91652684208287205081
CurvePt 1 10.00000000000000000000 0.00000000000000030616 5.00000000000000000000
AddCurve
Curve 00000003 1 1 00000003 00000004
@ -610,11 +614,13 @@ CCtrl 0 0.00000000000000000000 0.00000000000000030616 5.00000000000000000000 Wei
CCtrl 1 0.00000000000000000000 -4.99999999999999911182 5.00000000000000000000 Weight 0.70710678118654757274
CCtrl 2 0.00000000000000000000 -5.00000000000000000000 0.00000000000000061232 Weight 1.00000000000000000000
CurvePt 1 0.00000000000000000000 0.00000000000000030616 5.00000000000000000000
CurvePt 0 0.00000000000000000000 -0.90981526206072327323 4.91652684208287205081
CurvePt 0 0.00000000000000000000 -1.84047354780936323060 4.64894150531215188948
CurvePt 0 0.00000000000000000000 -2.73604876692571208352 4.18497755609325672310
CurvePt 0 0.00000000000000000000 -3.53553390593273775266 3.53553390593273775266
CurvePt 0 0.00000000000000000000 -4.18497755609325672310 2.73604876692571297170
CurvePt 0 0.00000000000000000000 -4.64894150531215188948 1.84047354780936434082
CurvePt 0 0.00000000000000000000 -4.91652684208287205081 0.90981526206072405039
CurvePt 1 0.00000000000000000000 -5.00000000000000000000 0.00000000000000061232
AddCurve
Curve 00000005 1 2 00000002 00000004
@ -622,11 +628,13 @@ CCtrl 0 10.00000000000000000000 0.00000000000000030616 5.00000000000000000000 We
CCtrl 1 10.00000000000000000000 -4.99999999999999911182 5.00000000000000000000 Weight 0.70710678118654757274
CCtrl 2 10.00000000000000000000 -5.00000000000000000000 0.00000000000000061232 Weight 1.00000000000000000000
CurvePt 1 10.00000000000000000000 0.00000000000000030616 5.00000000000000000000
CurvePt 0 10.00000000000000000000 -0.90981526206072327323 4.91652684208287205081
CurvePt 0 10.00000000000000000000 -1.84047354780936323060 4.64894150531215188948
CurvePt 0 10.00000000000000000000 -2.73604876692571208352 4.18497755609325672310
CurvePt 0 10.00000000000000000000 -3.53553390593273775266 3.53553390593273775266
CurvePt 0 10.00000000000000000000 -4.18497755609325672310 2.73604876692571297170
CurvePt 0 10.00000000000000000000 -4.64894150531215188948 1.84047354780936434082
CurvePt 0 10.00000000000000000000 -4.91652684208287205081 0.90981526206072405039
CurvePt 1 10.00000000000000000000 -5.00000000000000000000 0.00000000000000061232
AddCurve
Curve 00000006 1 1 00000004 00000005
@ -640,11 +648,13 @@ CCtrl 0 0.00000000000000000000 -5.00000000000000000000 0.00000000000000061232 We
CCtrl 1 0.00000000000000000000 -5.00000000000000088818 -4.99999999999999911182 Weight 0.70710678118654757274
CCtrl 2 0.00000000000000000000 -0.00000000000000091849 -5.00000000000000000000 Weight 1.00000000000000000000
CurvePt 1 0.00000000000000000000 -5.00000000000000000000 0.00000000000000061232
CurvePt 0 0.00000000000000000000 -4.91652684208287205081 -0.90981526206072305119
CurvePt 0 0.00000000000000000000 -4.64894150531215188948 -1.84047354780936300855
CurvePt 0 0.00000000000000000000 -4.18497755609325672310 -2.73604876692571208352
CurvePt 0 0.00000000000000000000 -3.53553390593273864084 -3.53553390593273730858
CurvePt 0 0.00000000000000000000 -2.73604876692571297170 -4.18497755609325672310
CurvePt 0 0.00000000000000000000 -1.84047354780936478491 -4.64894150531215188948
CurvePt 0 0.00000000000000000000 -0.90981526206072438345 -4.91652684208287205081
CurvePt 1 0.00000000000000000000 -0.00000000000000091849 -5.00000000000000000000
AddCurve
Curve 00000008 1 2 00000002 00000005
@ -652,11 +662,13 @@ CCtrl 0 10.00000000000000000000 -5.00000000000000000000 0.00000000000000061232 W
CCtrl 1 10.00000000000000000000 -5.00000000000000088818 -4.99999999999999911182 Weight 0.70710678118654757274
CCtrl 2 10.00000000000000000000 -0.00000000000000091849 -5.00000000000000000000 Weight 1.00000000000000000000
CurvePt 1 10.00000000000000000000 -5.00000000000000000000 0.00000000000000061232
CurvePt 0 10.00000000000000000000 -4.91652684208287205081 -0.90981526206072305119
CurvePt 0 10.00000000000000000000 -4.64894150531215188948 -1.84047354780936300855
CurvePt 0 10.00000000000000000000 -4.18497755609325672310 -2.73604876692571208352
CurvePt 0 10.00000000000000000000 -3.53553390593273864084 -3.53553390593273730858
CurvePt 0 10.00000000000000000000 -2.73604876692571297170 -4.18497755609325672310
CurvePt 0 10.00000000000000000000 -1.84047354780936478491 -4.64894150531215188948
CurvePt 0 10.00000000000000000000 -0.90981526206072438345 -4.91652684208287205081
CurvePt 1 10.00000000000000000000 -0.00000000000000091849 -5.00000000000000000000
AddCurve
Curve 00000009 1 1 00000005 00000006
@ -670,11 +682,13 @@ CCtrl 0 0.00000000000000000000 -0.00000000000000091849 -5.00000000000000000000 W
CCtrl 1 0.00000000000000000000 4.99999999999999911182 -5.00000000000000088818 Weight 0.70710678118654757274
CCtrl 2 0.00000000000000000000 5.00000000000000000000 -0.00000000000000122465 Weight 1.00000000000000000000
CurvePt 1 0.00000000000000000000 -0.00000000000000091849 -5.00000000000000000000
CurvePt 0 0.00000000000000000000 0.90981526206072282914 -4.91652684208287205081
CurvePt 0 0.00000000000000000000 1.84047354780936300855 -4.64894150531215188948
CurvePt 0 0.00000000000000000000 2.73604876692571163943 -4.18497755609325672310
CurvePt 0 0.00000000000000000000 3.53553390593273730858 -3.53553390593273864084
CurvePt 0 0.00000000000000000000 4.18497755609325583492 -2.73604876692571297170
CurvePt 0 0.00000000000000000000 4.64894150531215188948 -1.84047354780936500696
CurvePt 0 0.00000000000000000000 4.91652684208287205081 -0.90981526206072471652
CurvePt 1 0.00000000000000000000 5.00000000000000000000 -0.00000000000000122465
AddCurve
Curve 0000000b 1 2 00000002 00000006
@ -682,11 +696,13 @@ CCtrl 0 10.00000000000000000000 -0.00000000000000091849 -5.00000000000000000000
CCtrl 1 10.00000000000000000000 4.99999999999999911182 -5.00000000000000088818 Weight 0.70710678118654757274
CCtrl 2 10.00000000000000000000 5.00000000000000000000 -0.00000000000000122465 Weight 1.00000000000000000000
CurvePt 1 10.00000000000000000000 -0.00000000000000091849 -5.00000000000000000000
CurvePt 0 10.00000000000000000000 0.90981526206072282914 -4.91652684208287205081
CurvePt 0 10.00000000000000000000 1.84047354780936300855 -4.64894150531215188948
CurvePt 0 10.00000000000000000000 2.73604876692571163943 -4.18497755609325672310
CurvePt 0 10.00000000000000000000 3.53553390593273730858 -3.53553390593273864084
CurvePt 0 10.00000000000000000000 4.18497755609325583492 -2.73604876692571297170
CurvePt 0 10.00000000000000000000 4.64894150531215188948 -1.84047354780936500696
CurvePt 0 10.00000000000000000000 4.91652684208287205081 -0.90981526206072471652
CurvePt 1 10.00000000000000000000 5.00000000000000000000 -0.00000000000000122465
AddCurve
Curve 0000000c 1 1 00000006 00000003

BIN
test/constraint/pt_face_distance/reference.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

18
test/constraint/pt_face_distance/reference.slvs
View File

@ -326,7 +326,7 @@ AddEntity
Entity.h.v=00050000
Entity.type=2001
Entity.construction=0
Entity.construction=1
Entity.workplane.v=00010000
Entity.actPoint.x=-10.00000000000000000000
Entity.actPoint.y=5.00000000000000000000
@ -580,11 +580,13 @@ CCtrl 0 0.00000000000000000000 5.00000000000000000000 0.00000000000000000000 Wei
CCtrl 1 0.00000000000000000000 5.00000000000000000000 5.00000000000000000000 Weight 0.70710678118654757274
CCtrl 2 0.00000000000000000000 0.00000000000000030616 5.00000000000000000000 Weight 1.00000000000000000000
CurvePt 1 0.00000000000000000000 5.00000000000000000000 0.00000000000000000000
CurvePt 0 0.00000000000000000000 4.91652684208287205081 0.90981526206072360630
CurvePt 0 0.00000000000000000000 4.64894150531215188948 1.84047354780936389673
CurvePt 0 0.00000000000000000000 4.18497755609325672310 2.73604876692571252761
CurvePt 0 0.00000000000000000000 3.53553390593273775266 3.53553390593273775266
CurvePt 0 0.00000000000000000000 2.73604876692571252761 4.18497755609325672310
CurvePt 0 0.00000000000000000000 1.84047354780936411878 4.64894150531215188948
CurvePt 0 0.00000000000000000000 0.90981526206072382834 4.91652684208287205081
CurvePt 1 0.00000000000000000000 0.00000000000000030616 5.00000000000000000000
AddCurve
Curve 00000002 1 2 00000002 00000003
@ -592,11 +594,13 @@ CCtrl 0 10.00000000000000000000 5.00000000000000000000 0.00000000000000000000 We
CCtrl 1 10.00000000000000000000 5.00000000000000000000 5.00000000000000000000 Weight 0.70710678118654757274
CCtrl 2 10.00000000000000000000 0.00000000000000030616 5.00000000000000000000 Weight 1.00000000000000000000
CurvePt 1 10.00000000000000000000 5.00000000000000000000 0.00000000000000000000
CurvePt 0 10.00000000000000000000 4.91652684208287205081 0.90981526206072360630
CurvePt 0 10.00000000000000000000 4.64894150531215188948 1.84047354780936389673
CurvePt 0 10.00000000000000000000 4.18497755609325672310 2.73604876692571252761
CurvePt 0 10.00000000000000000000 3.53553390593273775266 3.53553390593273775266
CurvePt 0 10.00000000000000000000 2.73604876692571252761 4.18497755609325672310
CurvePt 0 10.00000000000000000000 1.84047354780936411878 4.64894150531215188948
CurvePt 0 10.00000000000000000000 0.90981526206072382834 4.91652684208287205081
CurvePt 1 10.00000000000000000000 0.00000000000000030616 5.00000000000000000000
AddCurve
Curve 00000003 1 1 00000003 00000004
@ -610,11 +614,13 @@ CCtrl 0 0.00000000000000000000 0.00000000000000030616 5.00000000000000000000 Wei
CCtrl 1 0.00000000000000000000 -4.99999999999999911182 5.00000000000000000000 Weight 0.70710678118654757274
CCtrl 2 0.00000000000000000000 -5.00000000000000000000 0.00000000000000061232 Weight 1.00000000000000000000
CurvePt 1 0.00000000000000000000 0.00000000000000030616 5.00000000000000000000
CurvePt 0 0.00000000000000000000 -0.90981526206072327323 4.91652684208287205081
CurvePt 0 0.00000000000000000000 -1.84047354780936323060 4.64894150531215188948
CurvePt 0 0.00000000000000000000 -2.73604876692571208352 4.18497755609325672310
CurvePt 0 0.00000000000000000000 -3.53553390593273775266 3.53553390593273775266
CurvePt 0 0.00000000000000000000 -4.18497755609325672310 2.73604876692571297170
CurvePt 0 0.00000000000000000000 -4.64894150531215188948 1.84047354780936434082
CurvePt 0 0.00000000000000000000 -4.91652684208287205081 0.90981526206072405039
CurvePt 1 0.00000000000000000000 -5.00000000000000000000 0.00000000000000061232
AddCurve
Curve 00000005 1 2 00000002 00000004
@ -622,11 +628,13 @@ CCtrl 0 10.00000000000000000000 0.00000000000000030616 5.00000000000000000000 We
CCtrl 1 10.00000000000000000000 -4.99999999999999911182 5.00000000000000000000 Weight 0.70710678118654757274
CCtrl 2 10.00000000000000000000 -5.00000000000000000000 0.00000000000000061232 Weight 1.00000000000000000000
CurvePt 1 10.00000000000000000000 0.00000000000000030616 5.00000000000000000000
CurvePt 0 10.00000000000000000000 -0.90981526206072327323 4.91652684208287205081
CurvePt 0 10.00000000000000000000 -1.84047354780936323060 4.64894150531215188948
CurvePt 0 10.00000000000000000000 -2.73604876692571208352 4.18497755609325672310
CurvePt 0 10.00000000000000000000 -3.53553390593273775266 3.53553390593273775266
CurvePt 0 10.00000000000000000000 -4.18497755609325672310 2.73604876692571297170
CurvePt 0 10.00000000000000000000 -4.64894150531215188948 1.84047354780936434082
CurvePt 0 10.00000000000000000000 -4.91652684208287205081 0.90981526206072405039
CurvePt 1 10.00000000000000000000 -5.00000000000000000000 0.00000000000000061232
AddCurve
Curve 00000006 1 1 00000004 00000005
@ -640,11 +648,13 @@ CCtrl 0 0.00000000000000000000 -5.00000000000000000000 0.00000000000000061232 We
CCtrl 1 0.00000000000000000000 -5.00000000000000088818 -4.99999999999999911182 Weight 0.70710678118654757274
CCtrl 2 0.00000000000000000000 -0.00000000000000091849 -5.00000000000000000000 Weight 1.00000000000000000000
CurvePt 1 0.00000000000000000000 -5.00000000000000000000 0.00000000000000061232
CurvePt 0 0.00000000000000000000 -4.91652684208287205081 -0.90981526206072305119
CurvePt 0 0.00000000000000000000 -4.64894150531215188948 -1.84047354780936300855
CurvePt 0 0.00000000000000000000 -4.18497755609325672310 -2.73604876692571208352
CurvePt 0 0.00000000000000000000 -3.53553390593273864084 -3.53553390593273730858
CurvePt 0 0.00000000000000000000 -2.73604876692571297170 -4.18497755609325672310
CurvePt 0 0.00000000000000000000 -1.84047354780936478491 -4.64894150531215188948
CurvePt 0 0.00000000000000000000 -0.90981526206072438345 -4.91652684208287205081
CurvePt 1 0.00000000000000000000 -0.00000000000000091849 -5.00000000000000000000
AddCurve
Curve 00000008 1 2 00000002 00000005
@ -652,11 +662,13 @@ CCtrl 0 10.00000000000000000000 -5.00000000000000000000 0.00000000000000061232 W
CCtrl 1 10.00000000000000000000 -5.00000000000000088818 -4.99999999999999911182 Weight 0.70710678118654757274
CCtrl 2 10.00000000000000000000 -0.00000000000000091849 -5.00000000000000000000 Weight 1.00000000000000000000
CurvePt 1 10.00000000000000000000 -5.00000000000000000000 0.00000000000000061232
CurvePt 0 10.00000000000000000000 -4.91652684208287205081 -0.90981526206072305119
CurvePt 0 10.00000000000000000000 -4.64894150531215188948 -1.84047354780936300855
CurvePt 0 10.00000000000000000000 -4.18497755609325672310 -2.73604876692571208352
CurvePt 0 10.00000000000000000000 -3.53553390593273864084 -3.53553390593273730858
CurvePt 0 10.00000000000000000000 -2.73604876692571297170 -4.18497755609325672310
CurvePt 0 10.00000000000000000000 -1.84047354780936478491 -4.64894150531215188948
CurvePt 0 10.00000000000000000000 -0.90981526206072438345 -4.91652684208287205081
CurvePt 1 10.00000000000000000000 -0.00000000000000091849 -5.00000000000000000000
AddCurve
Curve 00000009 1 1 00000005 00000006
@ -670,11 +682,13 @@ CCtrl 0 0.00000000000000000000 -0.00000000000000091849 -5.00000000000000000000 W
CCtrl 1 0.00000000000000000000 4.99999999999999911182 -5.00000000000000088818 Weight 0.70710678118654757274
CCtrl 2 0.00000000000000000000 5.00000000000000000000 -0.00000000000000122465 Weight 1.00000000000000000000
CurvePt 1 0.00000000000000000000 -0.00000000000000091849 -5.00000000000000000000
CurvePt 0 0.00000000000000000000 0.90981526206072282914 -4.91652684208287205081
CurvePt 0 0.00000000000000000000 1.84047354780936300855 -4.64894150531215188948
CurvePt 0 0.00000000000000000000 2.73604876692571163943 -4.18497755609325672310
CurvePt 0 0.00000000000000000000 3.53553390593273730858 -3.53553390593273864084
CurvePt 0 0.00000000000000000000 4.18497755609325583492 -2.73604876692571297170
CurvePt 0 0.00000000000000000000 4.64894150531215188948 -1.84047354780936500696
CurvePt 0 0.00000000000000000000 4.91652684208287205081 -0.90981526206072471652
CurvePt 1 0.00000000000000000000 5.00000000000000000000 -0.00000000000000122465
AddCurve
Curve 0000000b 1 2 00000002 00000006
@ -682,11 +696,13 @@ CCtrl 0 10.00000000000000000000 -0.00000000000000091849 -5.00000000000000000000
CCtrl 1 10.00000000000000000000 4.99999999999999911182 -5.00000000000000088818 Weight 0.70710678118654757274
CCtrl 2 10.00000000000000000000 5.00000000000000000000 -0.00000000000000122465 Weight 1.00000000000000000000
CurvePt 1 10.00000000000000000000 -0.00000000000000091849 -5.00000000000000000000
CurvePt 0 10.00000000000000000000 0.90981526206072282914 -4.91652684208287205081
CurvePt 0 10.00000000000000000000 1.84047354780936300855 -4.64894150531215188948
CurvePt 0 10.00000000000000000000 2.73604876692571163943 -4.18497755609325672310
CurvePt 0 10.00000000000000000000 3.53553390593273730858 -3.53553390593273864084
CurvePt 0 10.00000000000000000000 4.18497755609325583492 -2.73604876692571297170
CurvePt 0 10.00000000000000000000 4.64894150531215188948 -1.84047354780936500696
CurvePt 0 10.00000000000000000000 4.91652684208287205081 -0.90981526206072471652
CurvePt 1 10.00000000000000000000 5.00000000000000000000 -0.00000000000000122465
AddCurve
Curve 0000000c 1 1 00000006 00000003

2
test/constraint/pt_on_face/normal.slvs
View File

@ -325,7 +325,7 @@ AddEntity
Entity.h.v=00050000
Entity.type=2000
Entity.construction=0
Entity.construction=1
Entity.actPoint.x=5.00000000000000000000
Entity.actPoint.y=5.00000000000000000000
Entity.actVisible=1

2
test/request/arc_of_circle/normal.slvs
View File

@ -248,7 +248,7 @@ AddEntity
Entity.h.v=00040001
Entity.type=2001
Entity.construction=1
Entity.construction=0
Entity.workplane.v=80020000
Entity.actPoint.x=-5.00000000000000000000
Entity.actPoint.y=5.00000000000000000000