class hierarchy and macros

This commit is contained in:
blobfish
2015-01-21 16:56:23 -05:00
committed by wmayer
parent d5a999447e
commit 64bc5abe30
5 changed files with 17 additions and 9 deletions

View File

@@ -30,6 +30,7 @@
#include "FeatureFilling.h"
#include "FeatureSewing.h"
#include "FeatureCut.h"
#include "FeatureBSurf.h"
#include "FeatureBezSurf.h"
#include "FeatureBSplineSurf.h"
@@ -66,6 +67,7 @@ void SurfaceExport initSurface() {
Surface::Filling ::init();
Surface::Sewing ::init();
Surface::Cut ::init();
Surface::BSurf ::init();
Surface::BezSurf ::init();
Surface::BSplineSurf ::init();
}

View File

@@ -44,14 +44,12 @@
using namespace Surface;
PROPERTY_SOURCE(Surface::BSplineSurf, Part::Feature)
PROPERTY_SOURCE(Surface::BSplineSurf, Surface::BSurf)
//Initial values
BSplineSurf::BSplineSurf()
BSplineSurf::BSplineSurf() : BSurf()
{
ADD_PROPERTY(aBList,(0,"Geom_BSplineCurve"));
ADD_PROPERTY(filltype,(1));
}
//Functions

View File

@@ -39,6 +39,15 @@
using namespace Surface;
PROPERTY_SOURCE(Surface::BSurf, Part::Feature)
BSurf::BSurf(): Feature()
{
ADD_PROPERTY(filltype,(1));
ADD_PROPERTY(aBList,(0,"Dummy"));
}
//Check if any components of the surface have been modified
short BSurf::mustExecute() const
{

View File

@@ -39,12 +39,13 @@ namespace Surface
class BSurf : public Part::Feature
{
PROPERTY_HEADER(Surface::BSurf);
public:
BSurf();
App::PropertyLinkSubList aBList; //curves to be turned into a face (2-4 curves allowed).
App::PropertyInteger filltype; //Fill method (1, 2, or 3 for Stretch, Coons, and Curved)
short mustExecute() const;
virtual App::DocumentObjectExecReturn *execute(void) = 0;
/// returns the type name of the view provider
const char* getViewProviderName(void) const {

View File

@@ -44,14 +44,12 @@
using namespace Surface;
PROPERTY_SOURCE(Surface::BezSurf, Part::Feature)
PROPERTY_SOURCE(Surface::BezSurf, Surface::BSurf)
//Initial values
BezSurf::BezSurf()
BezSurf::BezSurf() : BSurf()
{
ADD_PROPERTY(aBList,(0,"Geom_BezierCurve"));
ADD_PROPERTY(filltype,(1));
}
//Functions