Skip to content

Commit

Permalink
Part: implement Prism as extension
Browse files Browse the repository at this point in the history
  • Loading branch information
wwmayer committed Apr 5, 2021
1 parent e66ed26 commit 84c5d22
Show file tree
Hide file tree
Showing 4 changed files with 139 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/Mod/Part/App/AppPart.cpp
Expand Up @@ -147,6 +147,7 @@
#include "DatumFeature.h"
#include "Attacher.h"
#include "AttachExtension.h"
#include "PrismExtension.h"
#include "FaceMaker.h"
#include "FaceMakerCheese.h"
#include "FaceMakerBullseye.h"
Expand Down Expand Up @@ -346,6 +347,8 @@ PyMOD_INIT_FUNC(Part)
Part::AttachExtension ::init();
Part::AttachExtensionPython ::init();

Part::PrismExtension ::init();

Part::Feature ::init();
Part::FeatureExt ::init();
Part::BodyBase ::init();
Expand Down
2 changes: 2 additions & 0 deletions src/Mod/Part/App/CMakeLists.txt
Expand Up @@ -188,6 +188,8 @@ SET(Features_SRCS
DatumFeature.h
AttachExtension.h
AttachExtension.cpp
PrismExtension.cpp
PrismExtension.h
)
SOURCE_GROUP("Features" FILES ${Features_SRCS})

Expand Down
79 changes: 79 additions & 0 deletions src/Mod/Part/App/PrismExtension.cpp
@@ -0,0 +1,79 @@
/***************************************************************************
* Copyright (c) 2021 Werner Mayer <wmayer[at]users.sourceforge.net> *
* *
* This file is part of the FreeCAD CAx development system. *
* *
* This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Library General Public *
* License as published by the Free Software Foundation; either *
* version 2 of the License, or (at your option) any later version. *
* *
* This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Library General Public License for more details. *
* *
* You should have received a copy of the GNU Library General Public *
* License along with this library; see the file COPYING.LIB. If not, *
* write to the Free Software Foundation, Inc., 59 Temple Place, *
* Suite 330, Boston, MA 02111-1307, USA *
* *
***************************************************************************/

#include "PreCompiled.h"
#ifndef _PreComp_
# include <BRepPrimAPI_MakePrism.hxx>
#endif

#include "PrismExtension.h"
#include <Base/Tools.h>


using namespace Part;

EXTENSION_PROPERTY_SOURCE(Part::PrismExtension, App::DocumentObjectExtension)

PrismExtension::PrismExtension()
{
EXTENSION_ADD_PROPERTY_TYPE(FirstAngle, (0.0f), "Prism", App::Prop_None, "Angle in first direction");
EXTENSION_ADD_PROPERTY_TYPE(SecondAngle, (0.0f), "Prism", App::Prop_None, "Angle in second direction");

static const App::PropertyQuantityConstraint::Constraints angleConstraint = { -89.99999, 89.99999, 1.0 };
FirstAngle.setConstraints(&angleConstraint);
SecondAngle.setConstraints(&angleConstraint);

initExtensionType(PrismExtension::getExtensionClassTypeId());
}

PrismExtension::~PrismExtension()
{
}

short int PrismExtension::extensionMustExecute()
{
if (FirstAngle.isTouched())
return 1;
if (SecondAngle.isTouched())
return 1;
return DocumentObjectExtension::extensionMustExecute();
}

App::DocumentObjectExecReturn *PrismExtension::extensionExecute()
{
return App::DocumentObjectExtension::extensionExecute();
}

void PrismExtension::extensionOnChanged(const App::Property* prop)
{
App::DocumentObjectExtension::extensionOnChanged(prop);
}

TopoDS_Shape PrismExtension::makePrism(double height, const TopoDS_Face& face) const
{
// the direction vector for the prism is the height for z and the given angle
BRepPrimAPI_MakePrism mkPrism(face,
gp_Vec(height * tan(Base::toRadians<double>(FirstAngle.getValue())),
height * tan(Base::toRadians<double>(SecondAngle.getValue())),
height));
return mkPrism.Shape();
}
55 changes: 55 additions & 0 deletions src/Mod/Part/App/PrismExtension.h
@@ -0,0 +1,55 @@
/***************************************************************************
* Copyright (c) 2021 Werner Mayer <wmayer[at]users.sourceforge.net> *
* *
* This file is part of the FreeCAD CAx development system. *
* *
* This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Library General Public *
* License as published by the Free Software Foundation; either *
* version 2 of the License, or (at your option) any later version. *
* *
* This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Library General Public License for more details. *
* *
* You should have received a copy of the GNU Library General Public *
* License along with this library; see the file COPYING.LIB. If not, *
* write to the Free Software Foundation, Inc., 59 Temple Place, *
* Suite 330, Boston, MA 02111-1307, USA *
* *
***************************************************************************/

#ifndef PART_PRISM_EXTENSION_H
#define PART_PRISM_EXTENSION_H

#include <App/DocumentObjectExtension.h>
#include <App/PropertyUnits.h>
#include <TopoDS_Face.hxx>

namespace Part
{

class PartExport PrismExtension : public App::DocumentObjectExtension
{
EXTENSION_PROPERTY_HEADER(Part::PrismExtension);
public:
PrismExtension();
virtual ~PrismExtension();


App::PropertyAngle FirstAngle;
App::PropertyAngle SecondAngle;

TopoDS_Shape makePrism(double height, const TopoDS_Face& face) const;

virtual short int extensionMustExecute(void);
virtual App::DocumentObjectExecReturn *extensionExecute(void);

protected:
virtual void extensionOnChanged(const App::Property* /*prop*/);
};

} // namespace Part

#endif // PART_PRISM_EXTENSION_H

0 comments on commit 84c5d22

Please sign in to comment.