From 98c2c18c848554b47f898b373d11bc8571a36693 Mon Sep 17 00:00:00 2001 From: wmayer Date: Thu, 29 Nov 2012 11:52:42 +0100 Subject: [PATCH] Remove Svg prefix from enum type --- src/Mod/Drawing/App/FeatureViewPart.cpp | 6 +++--- src/Mod/Drawing/App/ProjectionAlgos.cpp | 4 ++-- src/Mod/Drawing/App/ProjectionAlgos.h | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Mod/Drawing/App/FeatureViewPart.cpp b/src/Mod/Drawing/App/FeatureViewPart.cpp index 93d201c62..db96dc852 100644 --- a/src/Mod/Drawing/App/FeatureViewPart.cpp +++ b/src/Mod/Drawing/App/FeatureViewPart.cpp @@ -199,9 +199,9 @@ App::DocumentObjectExecReturn *FeatureViewPart::execute(void) << " transform=\"rotate("<< Rotation.getValue() << ","<< X.getValue()<<","<" << endl; - ProjectionAlgos::SvgExtractionType type = ProjectionAlgos::Plain; - if (hidden) type = (ProjectionAlgos::SvgExtractionType)(type|ProjectionAlgos::WithHidden); - if (smooth) type = (ProjectionAlgos::SvgExtractionType)(type|ProjectionAlgos::WithSmooth); + ProjectionAlgos::ExtractionType type = ProjectionAlgos::Plain; + if (hidden) type = (ProjectionAlgos::ExtractionType)(type|ProjectionAlgos::WithHidden); + if (smooth) type = (ProjectionAlgos::ExtractionType)(type|ProjectionAlgos::WithSmooth); result << Alg.getSVG(type, this->LineWidth.getValue() / this->Scale.getValue(), this->Tolerance.getValue()); result << "" << endl; diff --git a/src/Mod/Drawing/App/ProjectionAlgos.cpp b/src/Mod/Drawing/App/ProjectionAlgos.cpp index d50706e68..38ca1f48d 100644 --- a/src/Mod/Drawing/App/ProjectionAlgos.cpp +++ b/src/Mod/Drawing/App/ProjectionAlgos.cpp @@ -149,7 +149,7 @@ void ProjectionAlgos::execute(void) } -std::string ProjectionAlgos::getSVG(SvgExtractionType type, float scale, float tolerance) +std::string ProjectionAlgos::getSVG(ExtractionType type, float scale, float tolerance) { std::stringstream result; SVGOutput output; @@ -251,7 +251,7 @@ std::string ProjectionAlgos::getSVG(SvgExtractionType type, float scale, float t /* dxf output section - Dan Falck 2011/09/25 */ -std::string ProjectionAlgos::getDXF(SvgExtractionType type, float scale, float tolerance) +std::string ProjectionAlgos::getDXF(ExtractionType type, float scale, float tolerance) { std::stringstream result; DXFOutput output; diff --git a/src/Mod/Drawing/App/ProjectionAlgos.h b/src/Mod/Drawing/App/ProjectionAlgos.h index 4e0e60748..f95d0fa1f 100644 --- a/src/Mod/Drawing/App/ProjectionAlgos.h +++ b/src/Mod/Drawing/App/ProjectionAlgos.h @@ -45,14 +45,14 @@ public: void execute(void); static TopoDS_Shape invertY(const TopoDS_Shape&); - enum SvgExtractionType { + enum ExtractionType { Plain = 0, WithHidden = 1, WithSmooth = 2 }; - std::string getSVG(SvgExtractionType type, float scale, float tolerance); - std::string getDXF(SvgExtractionType type, float scale, float tolerance);//added by Dan Falck 2011/09/25 + std::string getSVG(ExtractionType type, float scale, float tolerance); + std::string getDXF(ExtractionType type, float scale, float tolerance);//added by Dan Falck 2011/09/25 const TopoDS_Shape &Input;