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

rebase auto merge error fixes

Browse Source 
Signed-off-by: jmaustpc <jmaustpc@users.sourceforge.net>
This commit is contained in:
jmaustpc 2013-11-11 15:36:05 +11:00 committed by Yorik van Havre
parent 06567358db
commit ec4f2be7b1
2 changed files with 50 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
src/Mod/Part/Gui/AppPartGui.cpp
View File

@ -5,7 +5,7 @@
* published by the Free Software Foundation; either version 2 of the *
* License, or (at your option) any later version. *
* for detail see the LICENCE text file. *
* Jürgen Riegel 2002 *
* J<EFBFBD>rgen Riegel 2002 *
* *
***************************************************************************/
@ -24,8 +24,9 @@
#include <Mod/Part/App/PropertyTopoShape.h>
#include "SoBrepShape.h"
#include "SoBrepFaceSet.h"
#include "SoBrepEdgeSet.h"
#include "SoBrepPointSet.h"
#include "SoFCShapeObject.h"
#include "ViewProvider.h"
#include "ViewProviderExt.h"
@ -50,6 +51,7 @@
#include "ViewProviderTorusParametric.h"
#include "ViewProviderRuledSurface.h"
#include "ViewProviderPrism.h"
#include "ViewProviderSpline.h"
#include "ViewProviderRegularPolygon.h"
#include "DlgSettingsGeneral.h"
@ -58,7 +60,6 @@
#include "Workbench.h"
#include <Gui/Language/Translator.h>
#include "qrc_Part.cpp"
#include "Resources/icons/PartFeature.xpm"
#include "Resources/icons/PartFeatureImport.xpm"
@ -100,50 +101,52 @@ void PartGuiExport initPartGui()
(void) Py_InitModule("PartGui", PartGui_methods); /* mod name, table ptr */
Base::Console().Log("Loading GUI of Part module... done\n");
PartGui::SoBrepFaceSet ::initClass();
PartGui::SoBrepEdgeSet ::initClass();
PartGui::SoBrepPointSet ::initClass();
PartGui::SoFCControlPoints ::initClass();
PartGui::ViewProviderPartBase ::init();
PartGui::ViewProviderPartExt ::init();
PartGui::ViewProviderPart ::init();
PartGui::ViewProviderEllipsoid ::init();
PartGui::ViewProviderPython ::init();
PartGui::ViewProviderBox ::init();
PartGui::ViewProviderPrism ::init();
PartGui::ViewProviderRegularPolygon ::init();
PartGui::ViewProviderImport ::init();
PartGui::ViewProviderCurveNet ::init();
PartGui::ViewProviderExtrusion ::init();
PartGui::ViewProvider2DObject ::init();
PartGui::ViewProvider2DObjectPython ::init();
PartGui::ViewProviderMirror ::init();
PartGui::ViewProviderFillet ::init();
PartGui::ViewProviderChamfer ::init();
PartGui::ViewProviderRevolution ::init();
PartGui::ViewProviderLoft ::init();
PartGui::ViewProviderSweep ::init();
PartGui::ViewProviderOffset ::init();
PartGui::ViewProviderThickness ::init();
PartGui::ViewProviderCustom ::init();
PartGui::ViewProviderCustomPython ::init();
PartGui::ViewProviderBoolean ::init();
PartGui::ViewProviderMultiFuse ::init();
PartGui::ViewProviderMultiCommon ::init();
PartGui::ViewProviderCompound ::init();
PartGui::ViewProviderCircleParametric ::init();
PartGui::ViewProviderLineParametric ::init();
PartGui::ViewProviderPointParametric ::init();
PartGui::ViewProviderEllipseParametric ::init();
PartGui::ViewProviderHelixParametric ::init();
PartGui::ViewProviderPlaneParametric ::init();
PartGui::ViewProviderSphereParametric ::init();
PartGui::SoBrepFaceSet ::initClass();
PartGui::SoBrepEdgeSet ::initClass();
PartGui::SoBrepPointSet ::initClass();
PartGui::SoFCControlPoints ::initClass();
PartGui::ViewProviderPartBase ::init();
PartGui::ViewProviderPartExt ::init();
PartGui::ViewProviderPart ::init();
PartGui::ViewProviderEllipsoid ::init();
PartGui::ViewProviderPython ::init();
PartGui::ViewProviderBox ::init();
PartGui::ViewProviderPrism ::init();
PartGui::ViewProviderWedge ::init();
PartGui::ViewProviderImport ::init();
PartGui::ViewProviderCurveNet ::init();
PartGui::ViewProviderExtrusion ::init();
PartGui::ViewProvider2DObject ::init();
PartGui::ViewProvider2DObjectPython ::init();
PartGui::ViewProviderMirror ::init();
PartGui::ViewProviderFillet ::init();
PartGui::ViewProviderChamfer ::init();
PartGui::ViewProviderRevolution ::init();
PartGui::ViewProviderLoft ::init();
PartGui::ViewProviderSweep ::init();
PartGui::ViewProviderOffset ::init();
PartGui::ViewProviderThickness ::init();
PartGui::ViewProviderCustom ::init();
PartGui::ViewProviderCustomPython ::init();
PartGui::ViewProviderBoolean ::init();
PartGui::ViewProviderMultiFuse ::init();
PartGui::ViewProviderMultiCommon ::init();
PartGui::ViewProviderCompound ::init();
PartGui::ViewProviderSpline ::init();
PartGui::ViewProviderCircleParametric ::init();
PartGui::ViewProviderLineParametric ::init();
PartGui::ViewProviderPointParametric ::init();
PartGui::ViewProviderEllipseParametric ::init();
PartGui::ViewProviderHelixParametric ::init();
PartGui::ViewProviderSpiralParametric ::init();
PartGui::ViewProviderPlaneParametric ::init();
PartGui::ViewProviderSphereParametric ::init();
PartGui::ViewProviderCylinderParametric ::init();
PartGui::ViewProviderConeParametric ::init();
PartGui::ViewProviderTorusParametric ::init();
PartGui::ViewProviderRuledSurface ::init();
PartGui::ViewProviderConeParametric ::init();
PartGui::ViewProviderTorusParametric ::init();
PartGui::ViewProviderRuledSurface ::init();
PartGui::Workbench ::init();
PartGui::Workbench ::init();
// instantiating the commands
CreatePartCommands();

4
src/Mod/Part/Gui/DlgPrimitives.cpp
View File

@ -594,13 +594,13 @@ void DlgPrimitives::createPrimitive(const QString& placement)
.arg(ui.edgeZ2->value(),0,'f',2)
.arg(placement);
}
else if (ui.comboBox1->currentIndex() == 14) { // RegularPolygon
else if (ui.comboBox1->currentIndex() == 15) { // RegularPolygon
name = QString::fromAscii(doc->getUniqueObjectName("RegularPolygon").c_str());
cmd = QString::fromAscii(
"App.ActiveDocument.addObject(\"Part::RegularPolygon\",\"%1\")\n"
"App.ActiveDocument.%1.NumberOfSides=%2\n"
"App.ActiveDocument.%1.Radius=%3\n"
"App.ActiveDocument.%1.Placement=%5\n")
"App.ActiveDocument.%1.Placement=%4\n")
.arg(name)
.arg(ui.regularPolygonNumberOfSides->value())
.arg(ui.regularPolygonRadius->value(),0,'f',2)