kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Squashed commit of the following:

Browse Source 
commit 6e78052d325eadcb212a6d50c6cd09cc29ac7870
Author: Johan K <johankristensen@gmail.com>
Date:   Tue Jul 29 14:52:08 2014 +0200

    Adding missing file RegularPolygon.py

commit 416396283032a31a1ea307df23d33ecfccf37935
Author: Johan K <johankristensen@gmail.com>
Date:   Mon Jul 28 22:51:28 2014 +0200

    Replaced sketcher implementation of RegularPolygons with a Python script version.
This commit is contained in:
wmayer
2014-07-29 17:26:28 +02:00
parent b48d1776d4
commit 313a33b19a
4 changed files with 95 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
View File

@@ -3219,49 +3219,19 @@ public:
virtual bool releaseButton(Base::Vector2D onSketchPos)
{
static const char* AddLineCommand =
"App.ActiveDocument.%s.addGeometry(Part.Line(App.Vector(%f,%f,0),App.Vector(%f,%f,0)))";
static const char* AddConstraintCoincideCommand =
"App.ActiveDocument.%s.addConstraint(Sketcher.Constraint('Coincident',%i,2,%i,1))";
static const char* AddConstraintEqualCommand =
"App.ActiveDocument.%s.addConstraint(Sketcher.Constraint('Equal',%i,%i)) ";
static const char* AddConstraintAngleCommand =
"App.ActiveDocument.%s.addConstraint(Sketcher.Constraint('Angle',%i,1,%i,2,%f))";
if (Mode==STATUS_End){
unsetCursor();
resetPositionText();
Gui::Command::openCommand("Add hexagon");
int firstCurve = getHighestCurveIndex() + 1;
// add the geometry to the sketch
try {
for( int i = 0; i < static_cast<int>(Corners); i++ ){
Gui::Command::doCommand(Gui::Command::Doc, AddLineCommand,
sketchgui->getObject()->getNameInDocument(),
EditCurve[i].fX,EditCurve[i].fY,EditCurve[i+1].fX,EditCurve[i+1].fY);
}
// make line ends coincide and all lines equal length
Gui::Command::doCommand(Gui::Command::Doc, AddConstraintCoincideCommand,
sketchgui->getObject()->getNameInDocument(),
firstCurve+(Corners-1),firstCurve);
for( int i = 1; i < static_cast<int>(Corners); i++ ){
Gui::Command::doCommand(Gui::Command::Doc, AddConstraintCoincideCommand,
sketchgui->getObject()->getNameInDocument(),
firstCurve+(i-1),firstCurve+i);
Gui::Command::doCommand(Gui::Command::Doc,AddConstraintEqualCommand,
sketchgui->getObject()->getNameInDocument(),
firstCurve,firstCurve+i);
}
double angle_constraint_diff = (1. * Corners)/( 1. * Corners - 3.0 );
for( int i = 0; i < (Corners-3); i++ ){
int angle_constraint_index = angle_constraint_diff * i;
Gui::Command::doCommand(Gui::Command::Doc,AddConstraintAngleCommand,
sketchgui->getObject()->getNameInDocument(),
firstCurve + ( angle_constraint_index + 1 ),
firstCurve + ( angle_constraint_index ),
( M_PI - AngleOfSeparation ) );
}
Gui::Command::doCommand(Gui::Command::Doc,
"import ProfileLib.RegularPolygon\n"
"ProfileLib.RegularPolygon.makeRegularPolygon('%s',%i,App.Vector(%f,%f,0),App.Vector(%f,%f,0))",
sketchgui->getObject()->getNameInDocument(),
Corners,
StartPos.fX,StartPos.fY,EditCurve[0].fX,EditCurve[0].fY);
Gui::Command::commitCommand();
Gui::Command::updateActive();