choose more comprehensive class and file names

src/Mod/Surface/App/AppSurface.cpp

@@ -31,9 +31,9 @@
 #include "FeatureFilling.h"
 #include "FeatureSewing.h"
 #include "FeatureCut.h"
-#include "FeatureBSurf.h"
-#include "FeatureBezSurf.h"
-#include "FeatureBSplineSurf.h"
+#include "FeatureSurface.h"
+#include "FeatureBezierSurface.h"
+#include "FeatureBSplineSurface.h"
 
 #include <Base/Interpreter.h>
 #include <Base/Parameter.h>
@@ -79,9 +79,9 @@ PyMOD_INIT_FUNC(Surface)
     Surface::Filling        ::init();
     Surface::Sewing         ::init();
     Surface::Cut            ::init();
-    Surface::BSurf          ::init();
-    Surface::BezSurf        ::init();
-    Surface::BSplineSurf    ::init();
+    Surface::SurfaceFeature ::init();
+    Surface::BezierSurface  ::init();
+    Surface::BSplineSurface ::init();
 
     PyMOD_Return(mod);
 }

src/Mod/Surface/App/CMakeLists.txt

@@ -21,18 +21,18 @@ SET(Surface_SRCS
     AppSurface.cpp
     PreCompiled.cpp
     PreCompiled.h
-    FeatureBSurf.h
-    FeatureBSurf.cpp
-    FeatureFilling.h
+    FeatureSurface.cpp
+    FeatureSurface.h
     FeatureFilling.cpp
-    FeatureSewing.h
+    FeatureFilling.h
     FeatureSewing.cpp
-    FeatureCut.h
+    FeatureSewing.h
     FeatureCut.cpp
-    FeatureBezSurf.h
-    FeatureBezSurf.cpp
-    FeatureBSplineSurf.h
-    FeatureBSplineSurf.cpp
+    FeatureCut.h
+    FeatureBezierSurface.cpp
+    FeatureBezierSurface.h
+    FeatureBSplineSurface.cpp
+    FeatureBSplineSurface.h
     FillType.h
 )
 

src/Mod/Surface/App/FeatureBSplineSurface.cpp

@@ -43,19 +43,19 @@
 #include <Base/Tools.h>
 #include <Base/Exception.h>
 
-#include "FeatureBSplineSurf.h"
+#include "FeatureBSplineSurface.h"
 
 
 using namespace Surface;
 
-PROPERTY_SOURCE(Surface::BSplineSurf, Surface::BSurf)
+PROPERTY_SOURCE(Surface::BSplineSurface, Surface::SurfaceFeature)
 
 
-BSplineSurf::BSplineSurf() : BSurf()
+BSplineSurface::BSplineSurface() : SurfaceFeature()
 {
 }
 
-App::DocumentObjectExecReturn *BSplineSurf::execute(void)
+App::DocumentObjectExecReturn *BSplineSurface::execute(void)
 {
     correcteInvalidFillType();
 

src/Mod/Surface/App/FeatureBSplineSurface.h

@@ -21,20 +21,20 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef SURFACE_FEATUREBSPLINESURF_H
-#define SURFACE_FEATUREBSPLINESURF_H
+#ifndef SURFACE_FEATUREBSPLINESURFACE_H
+#define SURFACE_FEATUREBSPLINESURFACE_H
 
-#include "FeatureBSurf.h"
+#include "FeatureSurface.h"
 
 namespace Surface
 {
 
-class SurfaceExport BSplineSurf :  public BSurf
+class SurfaceExport BSplineSurface :  public SurfaceFeature
 {
-    PROPERTY_HEADER(Surface::BSplineSurf);
+    PROPERTY_HEADER(Surface::BSplineSurface);
 
 public:
-    BSplineSurf();
+    BSplineSurface();
 
     // recalculate the feature
     virtual App::DocumentObjectExecReturn *execute(void);

src/Mod/Surface/App/FeatureBezierSurface.cpp

@@ -41,18 +41,18 @@
 #include <Base/Tools.h>
 #include <Base/Exception.h>
 
-#include "FeatureBezSurf.h"
+#include "FeatureBezierSurface.h"
 
 
 using namespace Surface;
 
-PROPERTY_SOURCE(Surface::BezSurf, Surface::BSurf)
+PROPERTY_SOURCE(Surface::BezierSurface, Surface::SurfaceFeature)
 
-BezSurf::BezSurf() : BSurf()
+BezierSurface::BezierSurface() : SurfaceFeature()
 {
 }
 
-App::DocumentObjectExecReturn *BezSurf::execute(void)
+App::DocumentObjectExecReturn *BezierSurface::execute(void)
 {
     correcteInvalidFillType();
 

src/Mod/Surface/App/FeatureBezierSurface.h

@@ -21,20 +21,20 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef SURFACE_FEATUREBEZSURF_H
-#define SURFACE_FEATUREBEZSURF_H
+#ifndef SURFACE_FEATUREBEZIERSURFACE_H
+#define SURFACE_FEATUREBEZIERSURFACE_H
 
-#include "FeatureBSurf.h"
+#include "FeatureSurface.h"
 
 namespace Surface
 {
 
-class SurfaceExport BezSurf :  public BSurf
+class SurfaceExport BezierSurface :  public SurfaceFeature
 {
-    PROPERTY_HEADER(Surface::BezSurf);
+    PROPERTY_HEADER(Surface::BezierSurface);
 
 public:
-    BezSurf();
+    BezierSurface();
 
     // recalculate the feature
     virtual App::DocumentObjectExecReturn *execute(void);

src/Mod/Surface/App/FeatureSurface.cpp

@@ -41,7 +41,7 @@
 #include <Base/Exception.h>
 #include <Base/Tools.h>
 
-#include "FeatureBSurf.h"
+#include "FeatureSurface.h"
 
 using namespace Surface;
 
@@ -148,11 +148,11 @@ void ShapeValidator::checkAndAdd(const Part::TopoShape &ts, const char *subName,
 }
 
 
-PROPERTY_SOURCE(Surface::BSurf, Part::Feature)
+PROPERTY_SOURCE(Surface::SurfaceFeature, Part::Feature)
 
-const char* BSurf::FillTypeEnums[]    = {"Invalid", "Stretched", "Coons", "Curved", NULL};
+const char* SurfaceFeature::FillTypeEnums[]    = {"Invalid", "Stretched", "Coons", "Curved", NULL};
 
-BSurf::BSurf(): Feature()
+SurfaceFeature::SurfaceFeature(): Feature()
 {
     ADD_PROPERTY(FillType, ((long)0));
     ADD_PROPERTY(BoundaryList, (0, "Dummy"));
@@ -162,7 +162,7 @@ BSurf::BSurf(): Feature()
 
 
 //Check if any components of the surface have been modified
-short BSurf::mustExecute() const
+short SurfaceFeature::mustExecute() const
 {
     if (BoundaryList.isTouched() ||
         FillType.isTouched())
@@ -172,7 +172,7 @@ short BSurf::mustExecute() const
     return 0;
 }
 
-GeomFill_FillingStyle BSurf::getFillingStyle()
+GeomFill_FillingStyle SurfaceFeature::getFillingStyle()
 {
     //Identify filling style
     int ftype = FillType.getValue();
@@ -188,7 +188,7 @@ GeomFill_FillingStyle BSurf::getFillingStyle()
 }
 
 
-void BSurf::getWire(TopoDS_Wire& aWire)
+void SurfaceFeature::getWire(TopoDS_Wire& aWire)
 {
     Handle(ShapeFix_Wire) aShFW = new ShapeFix_Wire;
     Handle(ShapeExtend_WireData) aWD = new ShapeExtend_WireData;
@@ -234,7 +234,7 @@ void BSurf::getWire(TopoDS_Wire& aWire)
     }
 }
 
-void BSurf::createFace(const Handle_Geom_BoundedSurface &aSurface)
+void SurfaceFeature::createFace(const Handle_Geom_BoundedSurface &aSurface)
 {
     BRepBuilderAPI_MakeFace aFaceBuilder;
     Standard_Real u1, u2, v1, v2;
@@ -253,7 +253,7 @@ void BSurf::createFace(const Handle_Geom_BoundedSurface &aSurface)
     this->Shape.setValue(aFace);
 }
 
-void BSurf::correcteInvalidFillType()
+void SurfaceFeature::correcteInvalidFillType()
 {
     int ftype = FillType.getValue();
     if(ftype == InvalidStyle)

src/Mod/Surface/App/FeatureSurface.h

@@ -21,8 +21,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef FEATUREBSURF_H
-#define FEATUREBSURF_H
+#ifndef FEATURESURFACE_H
+#define FEATURESURFACE_H
 
 #include <Geom_BoundedSurface.hxx>
 #include <GeomFill_FillingStyle.hxx>
@@ -62,12 +62,12 @@ public:
     }
 };
   
-class BSurf : public Part::Feature
+class SurfaceFeature : public Part::Feature
 {
-  PROPERTY_HEADER(Surface::BSurf);
+  PROPERTY_HEADER(Surface::SurfaceFeature);
 
 public:
-    BSurf();
+    SurfaceFeature();
     App::PropertyLinkSubList BoundaryList;  //curves to be turned into a face (2-4 curves allowed).
     App::PropertyEnumeration FillType;      //Fill method (1, 2, or 3 for Stretch, Coons, and Curved)
 
@@ -75,7 +75,7 @@ public:
 
     /// returns the type name of the view provider
     const char* getViewProviderName(void) const {
-        return "SurfaceGui::ViewProviderBSurf";
+        return "SurfaceGui::ViewProviderSurfaceFeature";
     }
 
 protected:
@@ -92,4 +92,4 @@ private:
 
 }
 
-#endif // FEATUREBSURF_H
+#endif // FEATURESURFACE_H