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

Include file cleanup per cppclean analysis

Browse Source
This commit is contained in:
WandererFan 2016-07-13 11:34:09 -04:00 committed by wmayer
parent 161f418824
commit 19968205d2
91 changed files with 227 additions and 632 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Mod/TechDraw/App/DrawHatch.cpp
View File

@ -38,9 +38,10 @@
#include <Base/FileInfo.h>
#include <Base/Parameter.h>
#include "DrawViewPart.h"
#include "DrawHatch.h"
#include "DrawHatchPy.h" // generated from DrawHatchPy.xml
#include <Mod/TechDraw/App/DrawHatchPy.h> // generated from DrawHatchPy.xml
using namespace TechDraw;
using namespace std;

4
src/Mod/TechDraw/App/DrawHatch.h
View File

@ -28,11 +28,9 @@
# include <App/PropertyLinks.h>
#include <App/PropertyFile.h>
#include "DrawView.h"
#include "DrawViewPart.h"
namespace TechDraw
{
class DrawViewPart;
class TechDrawExport DrawHatch : public App::DocumentObject
{

6
src/Mod/TechDraw/App/DrawHatchPyImp.cpp
View File

@ -1,11 +1,11 @@
#include "PreCompiled.h"
#include "Mod/TechDraw/App/DrawHatch.h"
#include "DrawHatch.h"
// inclusion of the generated files (generated out of DrawHatchPy.xml)
#include "DrawHatchPy.h"
#include "DrawHatchPy.cpp"
#include <Mod/TechDraw/App/DrawHatchPy.h>
#include <Mod/TechDraw/App/DrawHatchPy.cpp>
using namespace TechDraw;

2
src/Mod/TechDraw/App/DrawPage.cpp
View File

@ -47,7 +47,7 @@
#include "DrawViewPart.h"
#include "DrawViewDimension.h"
#include "DrawPagePy.h" // generated from DrawPagePy.xml
#include <Mod/TechDraw/App/DrawPagePy.h> // generated from DrawPagePy.xml
using namespace TechDraw;
using namespace std;

14
src/Mod/TechDraw/App/DrawPage.h
View File

@ -24,11 +24,10 @@
#ifndef _DrawPage_h_
#define _DrawPage_h_
#include "App/DocumentObject.h"
#include "App/DocumentObjectGroup.h"
#include "App/PropertyStandard.h"
#include "App/PropertyFile.h"
//#include "App/FeaturePython.h"
#include <App/DocumentObject.h>
#include <App/DocumentObjectGroup.h>
#include <App/PropertyStandard.h>
#include <App/PropertyFile.h>
namespace TechDraw
{
@ -38,7 +37,6 @@ class TechDrawExport DrawPage: public App::DocumentObject
PROPERTY_HEADER(TechDraw::DrawPage);
public:
/// Constructor
DrawPage(void);
virtual ~DrawPage();
@ -47,13 +45,13 @@ public:
App::PropertyFloat Scale;
App::PropertyEnumeration ProjectionType; // First or Third Angle
/** @name methods overide Feature */
//@{
/// recalculate the Feature
virtual App::DocumentObjectExecReturn *execute(void);
//@}
int addView(App::DocumentObject *docObj);
int removeView(App::DocumentObject* docObj);
short mustExecute() const;

13
src/Mod/TechDraw/App/DrawPagePyImp.cpp
View File

@ -1,15 +1,16 @@
#include "PreCompiled.h"
#include <App/DocumentObject.h>
#include <Base/Console.h>
#include "Mod/TechDraw/App/DrawPage.h"
#include "Mod/TechDraw/App/DrawView.h"
#include "DrawViewPy.h"
#include "DrawPage.h"
#include "DrawView.h"
// inclusion of the generated files (generated out of DrawPagePy.xml)
#include "DrawPagePy.h"
#include "DrawPagePy.cpp"
// inclusion of the generated files
#include <Mod/TechDraw/App/DrawViewPy.h>
#include <Mod/TechDraw/App/DrawPagePy.h>
#include <Mod/TechDraw/App/DrawPagePy.cpp>
using namespace TechDraw;

2
src/Mod/TechDraw/App/DrawParametricTemplate.cpp
View File

@ -41,7 +41,7 @@
#include <iterator>
#include "DrawParametricTemplate.h"
#include "DrawParametricTemplatePy.h"
#include <Mod/TechDraw/App/DrawParametricTemplatePy.h>
using namespace TechDraw;
using namespace std;

6
src/Mod/TechDraw/App/DrawParametricTemplatePyImp.cpp
View File

@ -25,11 +25,11 @@
# include <sstream>
#endif
#include "Mod/TechDraw/App/DrawParametricTemplate.h"
#include "DrawParametricTemplate.h"
// inclusion of the generated files (generated out of DrawParametricTemplateSFPy.xml)
#include "DrawParametricTemplatePy.h"
#include "DrawParametricTemplatePy.cpp"
#include <Mod/TechDraw/App/DrawParametricTemplatePy.h>
#include <Mod/TechDraw/App/DrawParametricTemplatePy.cpp>
using namespace TechDraw;

7
src/Mod/TechDraw/App/DrawProjGroup.cpp
View File

@ -25,6 +25,7 @@
#ifndef _PreComp_
# include <sstream>
#include <QRectF>
#endif
#include <App/Document.h>
@ -34,13 +35,11 @@
#include <Base/Console.h>
#include <Base/Exception.h>
#include <QRectF>
#include <Mod/Part/App/PartFeature.h>
#include "DrawPage.h"
#include "DrawProjGroupItem.h"
#include "DrawProjGroup.h"
#include "DrawProjGroupPy.h" // generated from DrawProjGroupPy.xml
#include <Mod/TechDraw/App/DrawProjGroupPy.h> // generated from DrawProjGroupPy.xml
using namespace TechDraw;

5
src/Mod/TechDraw/App/DrawProjGroup.h
View File

@ -25,16 +25,17 @@
#include <App/DocumentObject.h>
#include <App/PropertyStandard.h>
#include <App/FeaturePython.h>
#include <Base/BoundBox.h>
#include <Base/Matrix.h>
#include "DrawViewCollection.h"
#include "DrawProjGroupItem.h"
namespace TechDraw
{
class DrawProjGroupItem;
/**
* Class super-container for managing a collection of DrawProjGroupItem
* Page Features

2
src/Mod/TechDraw/App/DrawProjGroupItem.cpp
View File

@ -32,7 +32,7 @@
#include "DrawProjGroupItem.h"
#include "DrawProjGroupItemPy.h" // generated from DrawProjGroupItemPy.xml
#include <Mod/TechDraw/App/DrawProjGroupItemPy.h> // generated from DrawProjGroupItemPy.xml
using namespace TechDraw;

16
src/Mod/TechDraw/App/DrawProjGroupItemPyImp.cpp
View File

@ -1,11 +1,11 @@
#include "PreCompiled.h"
#include "Mod/TechDraw/App/DrawProjGroupItem.h"
#include "DrawProjGroupItem.h"
// inclusion of the generated files (generated out of DrawProjGroupItemPy.xml)
#include "DrawProjGroupItemPy.h"
#include "DrawProjGroupItemPy.cpp"
#include <Mod/TechDraw/App/DrawProjGroupItemPy.h>
#include <Mod/TechDraw/App/DrawProjGroupItemPy.cpp>
using namespace TechDraw;
@ -15,12 +15,6 @@ std::string DrawProjGroupItemPy::representation(void) const
return std::string("<DrawProjGroupItem object>");
}
PyObject *DrawProjGroupItemPy::getCustomAttributes(const char* /*attr*/) const
{
return 0;
@ -28,7 +22,5 @@ PyObject *DrawProjGroupItemPy::getCustomAttributes(const char* /*attr*/) const
int DrawProjGroupItemPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/)
{
return 0;
return 0;
}

7
src/Mod/TechDraw/App/DrawProjGroupPyImp.cpp
View File

@ -7,10 +7,9 @@
#include "DrawProjGroupItem.h"
// inclusion of the generated files (generated out of DrawProjGroupPy.xml)
#include "DrawProjGroupPy.h"
#include "DrawProjGroupPy.cpp"
#include "DrawProjGroupItemPy.h"
#include <Mod/TechDraw/App/DrawProjGroupPy.h>
#include <Mod/TechDraw/App/DrawProjGroupPy.cpp>
#include <Mod/TechDraw/App/DrawProjGroupItemPy.h>
using namespace TechDraw;

2
src/Mod/TechDraw/App/DrawSVGTemplate.cpp
View File

@ -48,7 +48,7 @@
#include "DrawPage.h"
#include "DrawSVGTemplate.h"
#include "DrawSVGTemplatePy.h"
#include <Mod/TechDraw/App/DrawSVGTemplatePy.h>
using namespace TechDraw;
using namespace std;

6
src/Mod/TechDraw/App/DrawSVGTemplatePyImp.cpp
View File

@ -1,11 +1,11 @@
#include "PreCompiled.h"
#include "Mod/TechDraw/App/DrawSVGTemplate.h"
#include "DrawSVGTemplate.h"
// inclusion of the generated files (generated out of DrawSVGTemplatePy.xml)
#include "DrawSVGTemplatePy.h"
#include "DrawSVGTemplatePy.cpp"
#include <Mod/TechDraw/App/DrawSVGTemplatePy.h>
#include <Mod/TechDraw/App/DrawSVGTemplatePy.cpp>
using namespace TechDraw;

2
src/Mod/TechDraw/App/DrawTemplate.cpp
View File

@ -38,7 +38,7 @@
#include "DrawPage.h"
#include "DrawTemplate.h"
#include "DrawTemplatePy.h"
#include <Mod/TechDraw/App/DrawTemplatePy.h>
using namespace TechDraw;
using namespace std;

5
src/Mod/TechDraw/App/DrawTemplate.h
View File

@ -30,11 +30,6 @@
#include <App/PropertyUnits.h>
#include <App/FeaturePython.h>
namespace TechDrawGeometry
{
class BaseGeom;
}
namespace TechDraw
{

8
src/Mod/TechDraw/App/DrawTemplatePyImp.cpp
View File

@ -25,11 +25,11 @@
# include <sstream>
#endif
#include "Mod/TechDraw/App/DrawTemplate.h"
#include "DrawTemplate.h"
// inclusion of the generated files (generated out of DrawTemplateSFPy.xml)
#include "DrawTemplatePy.h"
#include "DrawTemplatePy.cpp"
#include <Mod/TechDraw/App/DrawTemplatePy.h>
#include <Mod/TechDraw/App/DrawTemplatePy.cpp>
using namespace TechDraw;
@ -62,4 +62,4 @@ int DrawTemplatePy::setCustomAttributes(const char* attr, PyObject* obj)
}
return 0;
}
}

2
src/Mod/TechDraw/App/DrawView.cpp
View File

@ -42,7 +42,7 @@
#include "DrawViewCollection.h"
#include "DrawViewClip.h"
#include "DrawViewPy.h" // generated from DrawViewPy.xml
#include <Mod/TechDraw/App/DrawViewPy.h> // generated from DrawViewPy.xml
using namespace TechDraw;

2
src/Mod/TechDraw/App/DrawViewAnnotation.h
View File

@ -30,7 +30,7 @@
#include <App/DocumentObject.h>
#include <App/PropertyLinks.h>
#include "App/PropertyStandard.h"
#include <App/PropertyStandard.h>
#include <App/FeaturePython.h>
#include "DrawView.h"

3
src/Mod/TechDraw/App/DrawViewClip.cpp
View File

@ -36,10 +36,9 @@
#include <iostream>
#include "DrawViewClip.h"
#include "DrawView.h"
#include "DrawPage.h"
#include "DrawViewClipPy.h" // generated from DrawViewClipPy.xml
#include <Mod/TechDraw/App/DrawViewClipPy.h> // generated from DrawViewClipPy.xml
using namespace TechDraw;
using namespace std;

3
src/Mod/TechDraw/App/DrawViewClip.h
View File

@ -30,9 +30,10 @@
#include <App/DocumentObjectGroup.h>
#include <App/PropertyLinks.h>
#include <App/PropertyStandard.h>
#include "DrawViewCollection.h"
#include <App/FeaturePython.h>
#include "DrawView.h"
namespace TechDraw
{

13
src/Mod/TechDraw/App/DrawViewClipPyImp.cpp
View File

@ -1,15 +1,16 @@
#include "PreCompiled.h"
#include <App/DocumentObject.h>
#include <Base/Console.h>
#include "Mod/TechDraw/App/DrawViewClip.h"
#include "Mod/TechDraw/App/DrawView.h"
#include "DrawViewPy.h"
#include "DrawViewClip.h"
#include "DrawView.h"
// inclusion of the generated files (generated out of DrawViewClipPy.xml)
#include "DrawViewClipPy.h"
#include "DrawViewClipPy.cpp"
// inclusion of the generated files
#include <Mod/TechDraw/App/DrawViewPy.h>
#include <Mod/TechDraw/App/DrawViewClipPy.h>
#include <Mod/TechDraw/App/DrawViewClipPy.cpp>
using namespace TechDraw;

15
src/Mod/TechDraw/App/DrawViewCollectionPyImp.cpp
View File

@ -1,11 +1,11 @@
#include "PreCompiled.h"
#include "Mod/TechDraw/App/DrawViewCollection.h"
#include "DrawViewCollection.h"
// inclusion of the generated files (generated out of DrawViewCollectionPy.xml)
#include "DrawViewCollectionPy.h"
#include "DrawViewCollectionPy.cpp"
#include <Mod/TechDraw/App/DrawViewCollectionPy.h>
#include <Mod/TechDraw/App/DrawViewCollectionPy.cpp>
using namespace TechDraw;
@ -16,11 +16,6 @@ std::string DrawViewCollectionPy::representation(void) const
}
PyObject *DrawViewCollectionPy::getCustomAttributes(const char* /*attr*/) const
{
return 0;
@ -28,7 +23,5 @@ PyObject *DrawViewCollectionPy::getCustomAttributes(const char* /*attr*/) const
int DrawViewCollectionPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/)
{
return 0;
return 0;
}

10
src/Mod/TechDraw/App/DrawViewDimension.cpp
View File

@ -34,6 +34,10 @@
#include <QLocale>
#include <BRepBuilderAPI_MakeVertex.hxx>
#include <BRepBuilderAPI_MakeEdge.hxx>
#include <BRepExtrema_DistShapeShape.hxx>
#include <App/Application.h>
#include <Base/Console.h>
#include <Base/Exception.h>
@ -43,15 +47,13 @@
#include <Mod/Measure/App/Measurement.h>
#include "Geometry.h"
#include "DrawViewPart.h"
#include "DrawViewDimension.h"
#include "DrawUtil.h"
#include <BRepBuilderAPI_MakeVertex.hxx>
#include <BRepBuilderAPI_MakeEdge.hxx>
#include <BRepExtrema_DistShapeShape.hxx>
#include "DrawViewDimensionPy.h" // generated from DrawViewDimensionPy.xml
#include <Mod/TechDraw/App/DrawViewDimensionPy.h> // generated from DrawViewDimensionPy.xml
using namespace TechDraw;

3
src/Mod/TechDraw/App/DrawViewDimension.h
View File

@ -28,7 +28,6 @@
# include <App/PropertyLinks.h>
#include "DrawView.h"
#include "DrawViewPart.h"
namespace Measure {
class Measurement;
@ -36,6 +35,8 @@ class Measurement;
namespace TechDraw
{
class DrawViewPart;
class TechDrawExport DrawViewDimension : public TechDraw::DrawView
{
PROPERTY_HEADER(TechDraw::DrawViewDimension);

11
src/Mod/TechDraw/App/DrawViewDimensionPyImp.cpp
View File

@ -1,11 +1,11 @@
#include "PreCompiled.h"
#include "Mod/TechDraw/App/DrawViewDimension.h"
#include "DrawViewDimension.h"
// inclusion of the generated files (generated out of DrawViewDimensionPy.xml)
#include "DrawViewDimensionPy.h"
#include "DrawViewDimensionPy.cpp"
#include <Mod/TechDraw/App/DrawViewDimensionPy.h>
#include <Mod/TechDraw/App/DrawViewDimensionPy.cpp>
using namespace TechDraw;
@ -16,11 +16,6 @@ std::string DrawViewDimensionPy::representation(void) const
}
PyObject *DrawViewDimensionPy::getCustomAttributes(const char* /*attr*/) const
{
return 0;

1
src/Mod/TechDraw/App/DrawViewDraft.h
View File

@ -28,7 +28,6 @@
#include <App/FeaturePython.h>
#include <App/PropertyLinks.h>
#include "DrawView.h"
#include "DrawViewSymbol.h"
namespace TechDraw

5
src/Mod/TechDraw/App/DrawViewPart.cpp
View File

@ -34,7 +34,6 @@
#include <HLRBRep_Algo.hxx>
#include <TopoDS_Shape.hxx>
#include <HLRTopoBRep_OutLiner.hxx>
//#include <BRepAPI_MakeOutLine.hxx>
#include <HLRAlgo_Projector.hxx>
#include <HLRBRep_ShapeBounds.hxx>
#include <HLRBRep_HLRToShape.hxx>
@ -68,7 +67,6 @@
#include <GeomLib_Tool.hxx>
#include <BRepLib.hxx>
#include <BRepExtrema_DistShapeShape.hxx>
#include <TopoDS_Shape.hxx>
#include <BRepBuilderAPI_MakeFace.hxx>
#include <ShapeFix_ShapeTolerance.hxx>
#include <ShapeExtend_WireData.hxx>
@ -82,12 +80,13 @@
#include <Mod/Part/App/PartFeature.h>
#include "Geometry.h"
#include "GeometryObject.h"
#include "DrawViewPart.h"
#include "DrawHatch.h"
#include "EdgeWalker.h"
#include "DrawViewPartPy.h" // generated from DrawViewPartPy.xml
#include <Mod/TechDraw/App/DrawViewPartPy.h> // generated from DrawViewPartPy.xml
using namespace TechDraw;
using namespace std;

12
src/Mod/TechDraw/App/DrawViewPart.h
View File

@ -26,6 +26,7 @@
#include <TopoDS_Edge.hxx>
#include <TopoDS_Vertex.hxx>
#include <TopoDS_Wire.hxx>
#include <App/DocumentObject.h>
#include <App/PropertyLinks.h>
@ -33,7 +34,16 @@
#include <App/FeaturePython.h>
#include <Base/BoundBox.h>
#include "GeometryObject.h"
class gp_Pnt;
namespace TechDrawGeometry
{
class GeometryObject;
class Vertex;
class BaseGeom;
class Face;
}
namespace TechDraw {
class DrawHatch;

15
src/Mod/TechDraw/App/DrawViewPartPyImp.cpp
View File

@ -1,11 +1,11 @@
#include "PreCompiled.h"
#include "Mod/TechDraw/App/DrawViewPart.h"
#include "DrawViewPart.h"
// inclusion of the generated files (generated out of DrawViewPartPy.xml)
#include "DrawViewPartPy.h"
#include "DrawViewPartPy.cpp"
#include <Mod/TechDraw/App/DrawViewPartPy.h>
#include <Mod/TechDraw/App/DrawViewPartPy.cpp>
using namespace TechDraw;
@ -16,11 +16,6 @@ std::string DrawViewPartPy::representation(void) const
}
PyObject *DrawViewPartPy::getCustomAttributes(const char* /*attr*/) const
{
return 0;
@ -28,7 +23,5 @@ PyObject *DrawViewPartPy::getCustomAttributes(const char* /*attr*/) const
int DrawViewPartPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/)
{
return 0;
return 0;
}

6
src/Mod/TechDraw/App/DrawViewPyImp.cpp
View File

@ -1,11 +1,11 @@
#include "PreCompiled.h"
#include "Mod/TechDraw/App/DrawView.h"
#include <Mod/TechDraw/App/DrawView.h>
// inclusion of the generated files (generated out of DrawViewPy.xml)
#include "DrawViewPy.h"
#include "DrawViewPy.cpp"
#include <Mod/TechDraw/App/DrawViewPy.h>
#include <Mod/TechDraw/App/DrawViewPy.cpp>
using namespace TechDraw;

5
src/Mod/TechDraw/App/DrawViewSection.cpp
View File

@ -81,15 +81,16 @@
#include <App/Material.h>
#include <Base/BoundBox.h>
#include <Base/Exception.h>
//#include <Base/FileInfo.h>
#include <Base/Console.h>
#include <Base/Parameter.h>
#include <Mod/Part/App/PartFeature.h>
#include <Mod/Part/App/Geometry.h>
#include "DrawViewSection.h"
#include "Geometry.h"
#include "GeometryObject.h"
#include "EdgeWalker.h"
#include "DrawViewSection.h"
using namespace TechDraw;
using namespace std;

7
src/Mod/TechDraw/App/DrawViewSection.h
View File

@ -30,12 +30,15 @@
#include <TopoDS_Compound.hxx>
#include "DrawViewPart.h"
#include "Geometry.h"
class gp_Pln;
class TopoDS_Compound;
class TopoDS_Face;
namespace TechDrawGeometry
{
class Face;
}
namespace TechDraw
{

2
src/Mod/TechDraw/App/DrawViewSpreadsheet.h
View File

@ -29,7 +29,7 @@
#include <App/DocumentObject.h>
#include <App/PropertyLinks.h>
#include "App/PropertyStandard.h"
#include <App/PropertyStandard.h>
#include <App/PropertyGeo.h>
#include <App/FeaturePython.h>

21
src/Mod/TechDraw/App/DrawViewSymbolPyImp.cpp
View File

@ -1,13 +1,13 @@
#include "PreCompiled.h"
#include "Mod/TechDraw/App/DrawViewSymbol.h"
#include "Mod/TechDraw/App/DrawView.h"
#include "Mod/TechDraw/App/DrawViewPy.h"
#include "DrawViewSymbol.h"
#include "DrawView.h"
// inclusion of the generated files (generated out of DrawViewSymbolPy.xml)
#include "DrawViewSymbolPy.h"
#include "DrawViewSymbolPy.cpp"
// inclusion of the generated files
#include <Mod/TechDraw/App/DrawViewPy.h>
#include <Mod/TechDraw/App/DrawViewSymbolPy.h>
#include <Mod/TechDraw/App/DrawViewSymbolPy.cpp>
using namespace TechDraw;
@ -18,11 +18,6 @@ std::string DrawViewSymbolPy::representation(void) const
}
PyObject *DrawViewSymbolPy::getCustomAttributes(const char* /*attr*/) const
{
return 0;
@ -30,7 +25,5 @@ PyObject *DrawViewSymbolPy::getCustomAttributes(const char* /*attr*/) const
int DrawViewSymbolPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/)
{
return 0;
return 0;
}

3
src/Mod/TechDraw/App/Geometry.cpp
View File

@ -63,8 +63,6 @@
#include <BRepAdaptor_HCompCurve.hxx>
#include <Approx_Curve3d.hxx>
#include <BRepAdaptor_HCurve.hxx>
#include <BRepAdaptor_HCurve.hxx>
#include <Geom_BSplineCurve.hxx>
#include <Geom_BSplineCurve.hxx>
#include <Geom_BezierCurve.hxx>
#include <GeomConvert_BSplineCurveToBezierCurve.hxx>
@ -476,4 +474,3 @@ BaseGeomPtrVector GeometryUtils::chainGeoms(BaseGeomPtrVector geoms)
}
return result;
}

2
src/Mod/TechDraw/App/Geometry.h
View File

@ -29,8 +29,6 @@
#include <TopoDS_Edge.hxx>
#include <TopoDS_Wire.hxx>
class BRepAdaptor_Curve;
namespace TechDrawGeometry {
enum ExtractionType { //obs sb vis/hid + hard/smooth/seam/out(edgeClass?)

4
src/Mod/TechDraw/App/GeometryObject.cpp
View File

@ -75,18 +75,14 @@
# include <BRepProj_Projection.hxx>
#include <BRepLib.hxx>
# include <BRepAdaptor_HCurve.hxx>
# include <BRepAdaptor_CompCurve.hxx>
#include <BRepLProp_CurveTool.hxx>
#include <BRepLProp_CLProps.hxx>
// # include <BRepAdaptor_HCompCurve.hxx>
# include <Approx_Curve3d.hxx>
# include <BRepAdaptor_HCurve.hxx>
#include <HLRBRep_Algo.hxx>
#include <HLRBRep_Data.hxx>
# include <Geom_BSplineCurve.hxx>
# include <Geom_BezierCurve.hxx>
# include <GeomConvert_BSplineCurveToBezierCurve.hxx>

7
src/Mod/TechDraw/App/GeometryObject.h
View File

@ -34,16 +34,9 @@
#include "Geometry.h"
class HLRBRep_Algo;
class HLRBRep_EdgeData;
class TopoDS_Wire;
class HLRBRep_HLRToShape;
namespace TechDrawGeometry
{
class BaseGeom;
//! scales & mirrors a shape about a center
TopoDS_Shape TechDrawExport mirrorShape(const TopoDS_Shape &input,
const gp_Pnt& inputCenter,

177
src/Mod/TechDraw/App/PreCompiled.h
View File

@ -56,182 +56,9 @@
// OpenCasCade =====================================================================================
// Base
#include <Standard_Version.hxx>
#include <Standard_Failure.hxx>
#include <Standard_GUID.hxx>
#include <Standard_AbortiveTransaction.hxx>
#include <Standard_Address.hxx>
#include <Standard_AncestorIterator.hxx>
#include <Standard_Boolean.hxx>
#include <Standard_Byte.hxx>
#include <Standard_Character.hxx>
#include <Standard_ConstructionError.hxx>
#include <Standard_CString.hxx>
#include <Standard_DefineHandle.hxx>
#include <Standard_DimensionError.hxx>
#include <Standard_DimensionMismatch.hxx>
#include <Standard_DivideByZero.hxx>
#include <Standard_DomainError.hxx>
#include <Standard_ErrorHandler.hxx>
#include <Standard_ExtCharacter.hxx>
#include <Standard_ExtString.hxx>
#include <Standard_Failure.hxx>
#include <Standard_GUID.hxx>
#include <Standard_ImmutableObject.hxx>
#include <Standard_Integer.hxx>
#include <Standard_InternalType.hxx>
#include <Standard_IStream.hxx>
#include <Standard_KindOfType.hxx>
#include <Standard_LicenseError.hxx>
#include <Standard_LicenseNotFound.hxx>
#include <Standard_Macro.hxx>
#include <Standard_math.hxx>
#include <Standard_MultiplyDefined.hxx>
#include <Standard_NegativeValue.hxx>
#include <Standard_NoMoreObject.hxx>
#include <Standard_NoSuchObject.hxx>
#include <Standard_NotImplemented.hxx>
#include <Standard_NullObject.hxx>
#include <Standard_NullValue.hxx>
#include <Standard_NumericError.hxx>
#include <Standard_OStream.hxx>
#include <Standard_OutOfMemory.hxx>
#include <Standard_OutOfRange.hxx>
#include <Standard_Overflow.hxx>
#include <Standard_Persistent.hxx>
#include <Standard_Persistent_proto.hxx>
#include <Standard_PrimitiveTypes.hxx>
#include <Standard_ProgramError.hxx>
#include <Standard_RangeError.hxx>
#include <Standard_Real.hxx>
#include <Standard_ShortReal.hxx>
#include <Standard_SStream.hxx>
#include <Standard_Storable.hxx>
#include <Standard_Stream.hxx>
#include <Standard_String.hxx>
#include <Standard_TooManyUsers.hxx>
#include <Standard_Transient.hxx>
#include <Standard_Transient_proto.hxx>
#include <Standard_Type.hxx>
#include <Standard_TypeDef.hxx>
#include <Standard_TypeMismatch.hxx>
#include <Standard_Underflow.hxx>
#include <Standard_UUID.hxx>
#include <Standard_WayOfLife.hxx>
#if OCC_VERSION_HEX < 0x060700
#include <Standard_ctype.hxx>
#include <Standard_OId.hxx>
#endif
#include <TCollection_ExtendedString.hxx>
#include <TCollection_AsciiString.hxx>
#include <TColStd_SequenceOfExtendedString.hxx>
#include <BRep_Builder.hxx>
#include <BRepAdaptor_Curve.hxx>
#include <BRepAdaptor_Surface.hxx>
#include <BRepBuilderAPI.hxx>
#include <BRepBuilderAPI_MakeEdge.hxx>
#include <BRepBuilderAPI_MakePolygon.hxx>
#include <BRepTools.hxx>
#include <BRepTools_ShapeSet.hxx>
#include <BRepBuilderAPI_Copy.hxx>
#include <BRepCheck_Analyzer.hxx>
#include <BRepCheck_Result.hxx>
#include <BRepCheck_ListIteratorOfListOfStatus.hxx>
#include <BRepTools.hxx>
#include <Standard_DefineHandle.hxx>
#include <GCE2d_MakeSegment.hxx>
#include <GCPnts_TangentialDeflection.hxx>
#include <Geom_Axis2Placement.hxx>
#include <Geom_CartesianPoint.hxx>
#include <Geom_Line.hxx>
#include <Geom_Surface.hxx>
#include <Geom2d_BezierCurve.hxx>
#include <Geom2d_BSplineCurve.hxx>
#include <Geom2d_Curve.hxx>
#include <Geom2d_TrimmedCurve.hxx>
#include <Geom2dAdaptor_Curve.hxx>
#include <GeomAbs_CurveType.hxx>
#include <GeomAdaptor_Curve.hxx>
#include <Geom_BezierCurve.hxx>
#include <Geom_BezierSurface.hxx>
#include <Geom_BSplineCurve.hxx>
#include <Geom_BSplineSurface.hxx>
#include <Geom_Circle.hxx>
#include <Geom_ConicalSurface.hxx>
#include <Geom_CylindricalSurface.hxx>
#include <Geom_Ellipse.hxx>
#include <Geom_Hyperbola.hxx>
#include <Geom_SphericalSurface.hxx>
#include <Geom_SurfaceOfLinearExtrusion.hxx>
#include <Geom_SurfaceOfRevolution.hxx>
#include <Geom_Parabola.hxx>
#include <Geom_Plane.hxx>
#include <Geom_ToroidalSurface.hxx>
#include <GeomTools_Curve2dSet.hxx>
#include <gp_Ax2d.hxx>
#include <gp_Circ.hxx>
#include <gp_Circ2d.hxx>
#include <gp_Cone.hxx>
#include <gp_Cylinder.hxx>
#include <gp_Dir2d.hxx>
#include <gp_Elips.hxx>
#include <gp_Hypr.hxx>
#include <gp_Lin2d.hxx>
#include <gp_Lin.hxx>
#include <gp_Parab.hxx>
#include <gp_Pnt2d.hxx>
#include <gp_Pnt.hxx>
#include <gp_Pln.hxx>
#include <gp_Sphere.hxx>
#include <gp_Torus.hxx>
#include <gp_Vec.hxx>
#include <gp_Vec2d.hxx>
#include <MMgt_TShared.hxx>
#include <Precision.hxx>
#include <Quantity_Factor.hxx>
#include <Quantity_Length.hxx>
#include <Quantity_NameOfColor.hxx>
#include <Quantity_PhysicalQuantity.hxx>
#include <Quantity_PlaneAngle.hxx>
#include <Quantity_TypeOfColor.hxx>
#include <Standard_Boolean.hxx>
#include <Standard_CString.hxx>
#include <Standard_ErrorHandler.hxx>
#include <Standard_Integer.hxx>
#include <Standard_IStream.hxx>
#include <Standard_Macro.hxx>
#include <Standard_NotImplemented.hxx>
#include <Standard_OStream.hxx>
#include <Standard_Real.hxx>
#include <TCollection_AsciiString.hxx>
#include <TColgp_Array1OfPnt2d.hxx>
#include <TColgp_HArray1OfPnt2d.hxx>
#include <TCollection_AsciiString.hxx>
#include <TColStd_HSequenceOfTransient.hxx>
#include <TColStd_MapIteratorOfMapOfTransient.hxx>
#include <TColStd_MapOfTransient.hxx>
#include <TopExp_Explorer.hxx>
#include <TopoDS.hxx>
#include <TopoDS_Compound.hxx>
#include <TopoDS_Edge.hxx>
#include <TopoDS_Iterator.hxx>
#include <TopoDS_ListIteratorOfListOfShape.hxx>
#include <TopoDS_Shape.hxx>
#include <TopoDS_Solid.hxx>
#include <TopoDS_Vertex.hxx>
#include <TopExp.hxx>
#include <TopTools_ListIteratorOfListOfShape.hxx>
#include <TopTools_HSequenceOfShape.hxx>
#include <TopTools_MapOfShape.hxx>
#include <UnitsAPI.hxx>
#include <BRepPrimAPI_MakeBox.hxx>
#include <BRepPrimAPI_MakeCylinder.hxx>
#include <Mod/Part/App/OpenCascadeAll.h>
// Python
#include <Python.h>

3
src/Mod/TechDraw/Gui/AppTechDrawGui.cpp
View File

@ -46,9 +46,8 @@
#include "ViewProviderAnnotation.h"
#include "ViewProviderSymbol.h"
#include "ViewProviderViewClip.h"
#include "ViewProviderHatch.h"
#include "ViewProviderHatch.h"
#include "ViewProviderSpreadsheet.h"
//#include "resources/qrc_TechDraw.cpp"
// use a different name to CreateCommand()
void CreateTechDrawCommands(void);

154
src/Mod/TechDraw/Gui/AppTechDrawGuiPy.cpp
View File

@ -49,7 +49,7 @@ using namespace TechDrawGui;
//
/* module functions */
static PyObject *
open(PyObject *self, PyObject *args)
tdGuiPlaceholder(PyObject *self, PyObject *args)
{
char* Name;
if (!PyArg_ParseTuple(args, "et","utf-8",&Name))
@ -58,154 +58,6 @@ open(PyObject *self, PyObject *args)
PyMem_Free(Name);
PY_TRY {
Base::FileInfo file(EncodedName.c_str());
if (file.hasExtension("svg") || file.hasExtension("svgz")) {
QString fileName = QString::fromUtf8(EncodedName.c_str());
#if 0
// Displaying the image in a view
MDIViewPage* view = new MDIViewPage(0, 0, Gui::getMainWindow()); //TODO: hack to get a compile
view->load(fileName);
view->setWindowIcon(Gui::BitmapFactory().pixmap("actions/techdraw-landscape"));
QFileInfo fi(fileName);
view->setWindowTitle(fi.fileName());
view->resize( 400, 300 );
Gui::getMainWindow()->addWindow(view);
#endif
}
else {
PyErr_SetString(Base::BaseExceptionFreeCADError, "unknown filetype");
return NULL;
}
} PY_CATCH;
Py_Return;
}
/* module functions */
static PyObject *
importer(PyObject *self, PyObject *args)
{
char* Name;
const char* dummy;
if (!PyArg_ParseTuple(args, "et|s","utf-8",&Name,&dummy))
return NULL;
std::string EncodedName = std::string(Name);
PyMem_Free(Name);
PY_TRY {
Base::FileInfo file(EncodedName.c_str());
if (file.hasExtension("svg") || file.hasExtension("svgz")) {
QString fileName = QString::fromUtf8(EncodedName.c_str());
#if 0
// Displaying the image in a view
MDIViewPage* view = new MDIViewPage(0, 0, Gui::getMainWindow()); //TODO: hack to get a compile
view->load(fileName);
view->setWindowIcon(Gui::BitmapFactory().pixmap("actions/techdraw-landscape"));
QFileInfo fi(fileName);
view->setWindowTitle(fi.fileName());
view->resize( 400, 300 );
Gui::getMainWindow()->addWindow(view);
#endif
} else {
PyErr_SetString(Base::BaseExceptionFreeCADError, "unknown filetype");
return NULL;
}
} PY_CATCH;
Py_Return;
}
static PyObject *
exporter(PyObject *self, PyObject *args)
{
PyObject* object;
char* Name;
if (!PyArg_ParseTuple(args, "Oet",&object,"utf-8",&Name))
return NULL;
std::string EncodedName = std::string(Name);
PyMem_Free(Name);
PY_TRY {
Py::Sequence list(object);
for (Py::Sequence::iterator it = list.begin(); it != list.end(); ++it) {
PyObject* item = (*it).ptr();
if (PyObject_TypeCheck(item, &(App::DocumentObjectPy::Type))) {
App::DocumentObject* obj = static_cast<App::DocumentObjectPy*>(item)->getDocumentObjectPtr();
if (obj->getTypeId().isDerivedFrom(TechDraw::DrawPage::getClassTypeId())) {
Base::FileInfo fi_out(EncodedName.c_str());
Base::ofstream str_out(fi_out, std::ios::out | std::ios::binary);
if (!str_out) {
std::stringstream str;
str << "Cannot open file '" << EncodedName << "' for writing";
PyErr_SetString(PyExc_IOError, str.str().c_str());
return NULL;
}
if (fi_out.hasExtension("svg")) {
// std::string fn = static_cast<TechDraw::DrawPage*>(obj)->PageResult.getValue();
std::string fn;
Base::FileInfo fi_in(fn);
Base::ifstream str_in(fi_in, std::ios::in | std::ios::binary);
if (!str_in) {
std::stringstream str;
str << "Cannot open file '" << fn << "' for reading";
PyErr_SetString(PyExc_IOError, str.str().c_str());
return NULL;
}
str_in >> str_out.rdbuf();
str_in.close();
str_out.close();
break;
}
else if (fi_out.hasExtension("dxf")) {
const std::vector<App::DocumentObject*>& views = static_cast<TechDraw::DrawPage*>(obj)->Views.getValues();
for (std::vector<App::DocumentObject*>::const_iterator it = views.begin(); it != views.end(); ++it) {
if ((*it)->getTypeId().isDerivedFrom(TechDraw::DrawViewPart::getClassTypeId())) {
TechDraw::DrawViewPart* view = static_cast<TechDraw::DrawViewPart*>(*it);
std::string viewName = view->Label.getValue();
App::DocumentObject* link = view->Source.getValue();
if (!link) {
PyErr_SetString(Base::BaseExceptionFreeCADError, "No object linked");
return 0;
}
if (!link->getTypeId().isDerivedFrom(Part::Feature::getClassTypeId())) {
PyErr_SetString(PyExc_TypeError, "Linked object is not a Part object");
return 0;
}
TopoDS_Shape shape = static_cast<Part::Feature*>(link)->Shape.getShape()._Shape;
if (!shape.IsNull()) {
#if 0
Base::Vector3d dir = view->Direction.getValue();
bool hidden = view->ShowHiddenLines.getValue();
bool smooth = view->ShowSmoothLines.getValue();
Drawing::ProjectionAlgos::ExtractionType type = Drawing::ProjectionAlgos::Plain;
if (hidden) type = (Drawing::ProjectionAlgos::ExtractionType)(type|Drawing::ProjectionAlgos::WithHidden);
if (smooth) type = (Drawing::ProjectionAlgos::ExtractionType)(type|Drawing::ProjectionAlgos::WithSmooth);
float scale = view->Scale.getValue();
float tol = view->Tolerance.getValue();
Drawing::ProjectionAlgos project(shape, dir);
str_out << project.getDXF(type, scale, tol);
#endif
break; // TODO: How to add several shapes?
}
}
}
str_out.close();
break;
}
else {
PyErr_SetString(PyExc_TypeError, "Export of page object as this file format is not supported by Drawing module");
return 0;
}
}
else {
PyErr_SetString(PyExc_TypeError, "Export of this object type is not supported by Drawing module");
return 0;
}
}
}
} PY_CATCH;
Py_Return;
@ -213,8 +65,6 @@ exporter(PyObject *self, PyObject *args)
/* registration table */
struct PyMethodDef TechDrawGui_Import_methods[] = {
{"open" ,open , METH_VARARGS}, /* method name, C func ptr, always-tuple */
{"insert" ,importer, METH_VARARGS},
{"export" ,exporter, METH_VARARGS},
{"tdGuiPlaceholder" ,tdGuiPlaceholder , METH_VARARGS}, /* method name, C func ptr, always-tuple */
{NULL, NULL} /* end of table marker */
};

2
src/Mod/TechDraw/Gui/CommandCreateDims.cpp
View File

@ -52,6 +52,8 @@
# include <Mod/TechDraw/App/DrawViewDimension.h>
# include <Mod/TechDraw/App/DrawPage.h>
# include <Mod/TechDraw/App/DrawUtil.h>
# include <Mod/TechDraw/App/Geometry.h>
#include <Mod/TechDraw/Gui/QGVPage.h>

2
src/Mod/TechDraw/Gui/DlgPrefsTechDrawImp.cpp
View File

@ -86,4 +86,4 @@ void DlgPrefsTechDrawImp::changeEvent(QEvent *e)
}
}
#include "moc_DlgPrefsTechDrawImp.cpp"
#include <Mod/TechDraw/Gui/moc_DlgPrefsTechDrawImp.cpp>

2
src/Mod/TechDraw/Gui/DlgPrefsTechDrawImp.h
View File

@ -26,7 +26,7 @@
#ifndef DRAWINGGUI_DLGPREFSTECHDRAWIMP_H
#define DRAWINGGUI_DLGPREFSTECHDRAWIMP_H
#include "ui_DlgPrefsTechDraw.h"
#include <Mod/TechDraw/Gui/ui_DlgPrefsTechDraw.h>
#include <Gui/PropertyPage.h>
namespace TechDrawGui {

2
src/Mod/TechDraw/Gui/DlgTemplateField.cpp
View File

@ -76,4 +76,4 @@ void DlgTemplateField::reject()
QDialog::reject();
}
#include "moc_DlgTemplateField.cpp"
#include <Mod/TechDraw/Gui/moc_DlgTemplateField.cpp>

2
src/Mod/TechDraw/Gui/DlgTemplateField.h
View File

@ -26,7 +26,7 @@
#include <QDialog>
#include "ui_DlgTemplateField.h"
#include <Mod/TechDraw/Gui/ui_DlgTemplateField.h>
namespace TechDrawGui {

62
src/Mod/TechDraw/Gui/MDIViewPage.cpp
View File

@ -42,44 +42,46 @@
#include "MDIViewPage.h"
#include "Base/Stream.h"
#include "Base/gzstream.h"
#include "Base/PyObjectBase.h"
#include "Base/Console.h"
#include <Base/Stream.h>
#include <Base/gzstream.h>
#include <Base/PyObjectBase.h>
#include <Base/Console.h>
#include "App/Document.h"
#include "App/DocumentObject.h"
#include <App/Document.h>
#include <App/DocumentObject.h>
#include "Gui/Document.h"
#include "Gui/ViewProvider.h"
#include "Gui/FileDialog.h"
#include "Gui/WaitCursor.h"
#include "Gui/Application.h"
#include "Gui/Command.h"
#include "Gui/Document.h"
#include "Gui/Window.h"
#include "Gui/MainWindow.h"
#include "Gui/Selection.h"
#include <Gui/Document.h>
#include <Gui/ViewProvider.h>
#include <Gui/FileDialog.h>
#include <Gui/WaitCursor.h>
#include <Gui/Application.h>
#include <Gui/Command.h>
#include <Gui/Window.h>
#include <Gui/MainWindow.h>
#include <Gui/Selection.h>
#include "../App/DrawHatch.h"
#include "../App/DrawPage.h"
#include "../App/DrawProjGroup.h"
#include "../App/DrawTemplate.h"
#include "../App/DrawView.h"
#include "../App/DrawViewAnnotation.h"
#include "../App/DrawViewClip.h"
#include "../App/DrawViewCollection.h"
#include "../App/DrawViewDimension.h"
#include "../App/DrawViewPart.h"
#include "../App/DrawViewSection.h"
#include "../App/DrawViewSpreadsheet.h"
#include "../App/DrawViewSymbol.h"
#include <Mod/TechDraw/App/DrawHatch.h>
#include <Mod/TechDraw/App/DrawPage.h>
#include <Mod/TechDraw/App/DrawProjGroup.h>
#include <Mod/TechDraw/App/DrawTemplate.h>
#include <Mod/TechDraw/App/DrawView.h>
#include <Mod/TechDraw/App/DrawViewAnnotation.h>
#include <Mod/TechDraw/App/DrawViewClip.h>
#include <Mod/TechDraw/App/DrawViewCollection.h>
#include <Mod/TechDraw/App/DrawViewDimension.h>
#include <Mod/TechDraw/App/DrawViewPart.h>
#include <Mod/TechDraw/App/DrawViewSection.h>
#include <Mod/TechDraw/App/DrawViewSpreadsheet.h>
#include <Mod/TechDraw/App/DrawViewSymbol.h>
#include "QGIDrawingTemplate.h"
#include "QGIView.h"
#include "QGIViewPart.h"
#include "QGIViewDimension.h"
#include "QGIViewClip.h"
#include "QGIVertex.h"
#include "QGIEdge.h"
#include "QGIFace.h"
#include "ViewProviderPage.h"
#include "QGVPage.h"
@ -1130,4 +1132,4 @@ void MDIViewPage::showStatusMsg(const char* s1, const char* s2, const char* s3)
}
}
#include "moc_MDIViewPage.cpp"
#include <Mod/TechDraw/Gui/moc_MDIViewPage.cpp>

4
src/Mod/TechDraw/Gui/MDIViewPage.h
View File

@ -24,8 +24,8 @@
#ifndef DRAWINGGUI_DRAWINGVIEW_H
#define DRAWINGGUI_DRAWINGVIEW_H
#include "Gui/MDIView.h"
#include "Gui/Selection.h"
#include <Gui/MDIView.h>
#include <Gui/Selection.h>
#include <QPrinter>
#include <QGraphicsScene>

4
src/Mod/TechDraw/Gui/QGIArrow.h
View File

@ -30,10 +30,6 @@ class QPainter;
class QStyleOptionGraphicsItem;
QT_END_NAMESPACE
namespace TechDrawGeometry {
class BaseGeom;
}
namespace TechDrawGui
{

2
src/Mod/TechDraw/Gui/QGIDrawingTemplate.cpp
View File

@ -132,4 +132,4 @@ void QGIDrawingTemplate::updateView(bool update)
draw();
}
#include "moc_QGIDrawingTemplate.cpp"
#include <Mod/TechDraw/Gui/moc_QGIDrawingTemplate.cpp>

1
src/Mod/TechDraw/Gui/QGIDrawingTemplate.h
View File

@ -27,7 +27,6 @@
QT_BEGIN_NAMESPACE
class QGraphicsScene;
class QGraphicsSceneMouseEvent;
class QGraphicsPathItem;
QT_END_NAMESPACE

4
src/Mod/TechDraw/Gui/QGIEdge.h
View File

@ -25,10 +25,6 @@
#include "QGIPrimPath.h"
namespace TechDrawGeometry {
class BaseGeom;
}
namespace TechDrawGui
{

2
src/Mod/TechDraw/Gui/QGIFace.cpp
View File

@ -45,6 +45,8 @@
#include <Base/Console.h>
#include <Base/Parameter.h>
#include "QGCustomSvg.h"
#include "QGCustomRect.h"
#include "QGIView.h"
#include "QGIFace.h"

8
src/Mod/TechDraw/Gui/QGIFace.h
View File

@ -29,15 +29,11 @@
#include <QByteArray>
#include "QGIPrimPath.h"
#include "QGCustomSvg.h"
#include "QGCustomRect.h"
namespace TechDrawGeometry {
class BaseGeom;
}
namespace TechDrawGui
{
class QGCustomSvg;
class QGCustomRect;
const double SVGSIZEW = 64.0; //width and height of standard FC SVG pattern
const double SVGSIZEH = 64.0;

4
src/Mod/TechDraw/Gui/QGIPrimPath.h
View File

@ -30,10 +30,6 @@ class QPainter;
class QStyleOptionGraphicsItem;
QT_END_NAMESPACE
namespace TechDrawGeometry {
class BaseGeom;
}
namespace TechDrawGui
{

4
src/Mod/TechDraw/Gui/QGIProjGroup.h
View File

@ -35,10 +35,6 @@ class QGraphicsSceneMouseEvent;
class QEvent;
QT_END_NAMESPACE
namespace TechDraw {
class DrawView;
}
namespace TechDrawGui
{

3
src/Mod/TechDraw/Gui/QGISVGTemplate.cpp
View File

@ -42,6 +42,7 @@
#include <Mod/TechDraw/App/DrawSVGTemplate.h>
#include "ZVALUE.h"
#include "TemplateTextField.h"
#include "QGISVGTemplate.h"
using namespace TechDrawGui;
@ -220,4 +221,4 @@ void QGISVGTemplate::updateView(bool update)
draw();
}
#include "moc_QGISVGTemplate.cpp"
#include <Mod/TechDraw/Gui/moc_QGISVGTemplate.cpp>

4
src/Mod/TechDraw/Gui/QGISVGTemplate.h
View File

@ -23,19 +23,19 @@
#ifndef DRAWINGGUI_QGRAPHICSITEMSVGTEMPLATE_H
#define DRAWINGGUI_QGRAPHICSITEMSVGTEMPLATE_H
#include "QGITemplate.h"
#include <QGraphicsSvgItem>
#include <QSvgRenderer>
QT_BEGIN_NAMESPACE
class QGraphicsScene;
class QGraphicsSceneMouseEvent;
QT_END_NAMESPACE
namespace TechDraw {
class DrawSVGTemplate;
}
#include "QGITemplate.h"
namespace TechDrawGui
{

3
src/Mod/TechDraw/Gui/QGITemplate.cpp
View File

@ -31,6 +31,7 @@
#include <Mod/TechDraw/App/DrawTemplate.h>
#include "ZVALUE.h"
#include "TemplateTextField.h"
#include "QGITemplate.h"
using namespace TechDrawGui;
@ -73,4 +74,4 @@ void QGITemplate::updateView(bool update)
draw();
}
#include "moc_QGITemplate.cpp"
#include <Mod/TechDraw/Gui/moc_QGITemplate.cpp>

3
src/Mod/TechDraw/Gui/QGITemplate.h
View File

@ -26,8 +26,6 @@
#include <QGraphicsItemGroup>
#include <QObject>
#include "TemplateTextField.h"
QT_BEGIN_NAMESPACE
class QGraphicsScene;
QT_END_NAMESPACE
@ -38,6 +36,7 @@ class DrawTemplate;
namespace TechDrawGui
{
class TemplateTextField;
class TechDrawGuiExport QGITemplate : public QObject, public QGraphicsItemGroup
{

4
src/Mod/TechDraw/Gui/QGIVertex.h
View File

@ -25,10 +25,6 @@
# include "QGIPrimPath.h"
namespace TechDrawGeometry {
class BaseGeom;
}
namespace TechDrawGui
{

2
src/Mod/TechDraw/Gui/QGIView.cpp
View File

@ -54,7 +54,7 @@
#include "QGCustomClip.h"
#include "QGIViewClip.h"
#include "../App/DrawViewClip.h"
#include <Mod/TechDraw/App/DrawViewClip.h>
using namespace TechDrawGui;

2
src/Mod/TechDraw/Gui/QGIView.h
View File

@ -29,7 +29,7 @@
#include <QFont>
#include <App/PropertyLinks.h>
#include "../App/DrawView.h"
#include <Mod/TechDraw/App/DrawView.h>
QT_BEGIN_NAMESPACE
class QGraphicsScene;

2
src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp
View File

@ -49,7 +49,7 @@
#include <Base/Console.h>
#include <Base/Parameter.h>
#include "../App/DrawViewAnnotation.h"
#include <Mod/TechDraw/App/DrawViewAnnotation.h>
#include "QGIViewAnnotation.h"
#include "QGCustomText.h"

2
src/Mod/TechDraw/Gui/QGIViewAnnotation.h
View File

@ -25,7 +25,6 @@
#define DRAWINGGUI_QGRAPHICSITEMVIEWANNOTATION_H
#include "QGIView.h"
#include "QGCustomText.h"
namespace TechDraw {
class DrawViewAnnotation;
@ -33,6 +32,7 @@ class DrawViewAnnotation;
namespace TechDrawGui
{
class QGCustomText;
class TechDrawGuiExport QGIViewAnnotation : public QGIView
{

6
src/Mod/TechDraw/Gui/QGIViewClip.cpp
View File

@ -45,7 +45,10 @@
#include <Base/Console.h>
#include <Base/Parameter.h>
#include "../App/DrawViewClip.h"
#include <Mod/TechDraw/App/DrawViewClip.h>
#include "QGCustomRect.h"
#include "QGCustomClip.h"
#include "QGIViewClip.h"
using namespace TechDrawGui;
@ -189,4 +192,3 @@ QRectF QGIViewClip::boundingRect() const
{
return childrenBoundingRect();
}

8
src/Mod/TechDraw/Gui/QGIViewClip.h
View File

@ -27,15 +27,11 @@
#include <QPainter>
#include "QGIView.h"
#include "QGCustomRect.h"
#include "QGCustomClip.h"
namespace TechDraw {
class DrawViewPart;
}
namespace TechDrawGui
{
class QGCustomRect;
class QGCustomClip;
class TechDrawGuiExport QGIViewClip : public QGIView
{

2
src/Mod/TechDraw/Gui/QGIViewCollection.cpp
View File

@ -38,7 +38,7 @@
#include <Gui/Selection.h>
#include <Gui/Command.h>
#include "../App/DrawViewCollection.h"
#include <Mod/TechDraw/App/DrawViewCollection.h>
#include "QGIViewCollection.h"
using namespace TechDrawGui;

5
src/Mod/TechDraw/Gui/QGIViewCollection.h
View File

@ -34,11 +34,6 @@ class QGraphicsScene;
class QGraphicsSceneMouseEvent;
QT_END_NAMESPACE
namespace TechDraw {
class DrawView;
class DrawViewCollection;
}
namespace TechDrawGui
{

3
src/Mod/TechDraw/Gui/QGIViewDimension.cpp
View File

@ -62,6 +62,7 @@
#include <Mod/TechDraw/App/DrawViewDimension.h>
#include <Mod/TechDraw/App/DrawViewPart.h>
#include <Mod/TechDraw/App/DrawUtil.h>
#include <Mod/TechDraw/App/Geometry.h>
#include "QGIViewDimension.h"
#include "QGIArrow.h"
@ -1290,4 +1291,4 @@ void QGIViewDimension::paint(QPainter *painter, const QStyleOptionGraphicsItem *
QGIView::paint(painter, &myOption, widget);
}
#include "moc_QGIViewDimension.cpp"
#include <Mod/TechDraw/Gui/moc_QGIViewDimension.cpp>

10
src/Mod/TechDraw/Gui/QGIViewPart.cpp
View File

@ -40,7 +40,6 @@
#include <QBitmap>
#include <QImage>
#include <QPainter>
#include <QString>
#include <QSvgRenderer>
@ -51,11 +50,14 @@
#include <Base/Console.h>
#include <Base/Parameter.h>
#include "../App/DrawUtil.h"
#include "../App/DrawViewPart.h"
#include "../App/DrawHatch.h"
#include <Mod/TechDraw/App/DrawUtil.h>
#include <Mod/TechDraw/App/DrawViewPart.h>
#include <Mod/TechDraw/App/DrawHatch.h>
#include "ZVALUE.h"
#include "QGIFace.h"
#include "QGIEdge.h"
#include "QGIVertex.h"
#include "QGIViewPart.h"
using namespace TechDrawGui;

6
src/Mod/TechDraw/Gui/QGIViewPart.h
View File

@ -27,10 +27,7 @@
#include <QPainter>
#include "QGIView.h"
#include "QGIFace.h"
#include "QGIEdge.h"
#include "QGIVertex.h"
#include "../App/Geometry.h"
#include <Mod/TechDraw/App/Geometry.h>
namespace TechDraw {
@ -40,6 +37,7 @@ class DrawHatch;
namespace TechDrawGui
{
class QGIFace;
class TechDrawGuiExport QGIViewPart : public QGIView
{

3
src/Mod/TechDraw/Gui/QGIViewSection.cpp
View File

@ -40,9 +40,10 @@
#include <Base/Console.h>
#include "../App/DrawViewSection.h"
#include <Mod/TechDraw/App/DrawViewSection.h>
#include "ZVALUE.h"
#include "QGIFace.h"
#include "QGIViewSection.h"
using namespace TechDrawGui;

2
src/Mod/TechDraw/Gui/QGIViewSpreadsheet.cpp
View File

@ -24,7 +24,7 @@
#ifndef _PreComp_
#endif
#include "../App/DrawViewSpreadsheet.h"
#include <Mod/TechDraw/App/DrawViewSpreadsheet.h>
#include "QGIViewSpreadsheet.h"
using namespace TechDrawGui;

4
src/Mod/TechDraw/Gui/QGIViewSymbol.cpp
View File

@ -40,7 +40,9 @@
#include <Base/Console.h>
#include <Base/Parameter.h>
#include "../App/DrawViewSymbol.h"
#include <Mod/TechDraw/App/DrawViewSymbol.h>
#include "QGCustomSvg.h"
#include "QGIViewSymbol.h"
using namespace TechDrawGui;

2
src/Mod/TechDraw/Gui/QGIViewSymbol.h
View File

@ -32,7 +32,6 @@
#include <QGraphicsSvgItem>
#include "QGIView.h"
#include "QGCustomSvg.h"
namespace TechDraw {
class DrawViewSymbol;
@ -40,6 +39,7 @@ class DrawViewSymbol;
namespace TechDrawGui
{
class QGCustomSvg;
class TechDrawGuiExport QGIViewSymbol : public QGIView
{

13
src/Mod/TechDraw/Gui/QGVPage.cpp
View File

@ -56,8 +56,8 @@
#include <Mod/TechDraw/App/DrawViewAnnotation.h>
#include <Mod/TechDraw/App/DrawViewSymbol.h>
#include <Mod/TechDraw/App/DrawViewClip.h>
#include "../App/DrawHatch.h"
#include "../App/DrawViewSpreadsheet.h"
#include <Mod/TechDraw/App/DrawHatch.h>
#include <Mod/TechDraw/App/DrawViewSpreadsheet.h>
#include "QGIDrawingTemplate.h"
@ -73,6 +73,7 @@
#include "QGIViewSpreadsheet.h"
#include "ZVALUE.h"
#include "ViewProviderPage.h"
#include "QGVPage.h"
using namespace TechDrawGui;
@ -612,4 +613,10 @@ void QGVPage::mouseReleaseEvent(QMouseEvent *event)
viewport()->setCursor(Qt::ArrowCursor);
}
#include "moc_QGVPage.cpp"
TechDraw::DrawPage* QGVPage::getDrawPage()
{
return pageGui->getPageObject();
}
#include <Mod/TechDraw/Gui/moc_QGVPage.cpp>

7
src/Mod/TechDraw/Gui/QGVPage.h
View File

@ -26,8 +26,6 @@
#include <QGraphicsView>
#include <QGraphicsScene>
#include "ViewProviderPage.h"
namespace TechDraw {
class DrawViewPart;
class DrawProjGroup;
@ -37,7 +35,6 @@ class DrawTemplate;
class DrawViewAnnotation;
class DrawViewSymbol;
class DrawViewClip;
class DrawHatch;
class DrawViewCollection;
class DrawViewSpreadsheet;
}
@ -47,6 +44,7 @@ namespace TechDrawGui
class QGIView;
class QGIViewDimension;
class QGITemplate;
class ViewProviderPage;
class TechDrawGuiExport QGVPage : public QGraphicsView
{
@ -85,8 +83,7 @@ public:
QGITemplate * getTemplate() const;
void removeTemplate();
/// Getter for DrawPage feature
TechDraw::DrawPage * getDrawPage() { return pageGui->getPageObject(); }
TechDraw::DrawPage * getDrawPage();
void toggleEdit(bool enable);

4
src/Mod/TechDraw/Gui/TaskLinkDim.cpp
View File

@ -46,7 +46,7 @@
#include <Mod/TechDraw/App/DrawViewDimension.h>
#include "TaskLinkDim.h"
#include "ui_TaskLinkDim.h"
#include <Mod/TechDraw/Gui/ui_TaskLinkDim.h>
using namespace Gui;
using namespace TechDrawGui;
@ -202,4 +202,4 @@ bool TaskDlgLinkDim::reject()
return true;
}
#include "moc_TaskLinkDim.cpp"
#include <Mod/TechDraw/Gui/moc_TaskLinkDim.cpp>

15
src/Mod/TechDraw/Gui/TaskLinkDim.h
View File

@ -26,24 +26,13 @@
#include <Gui/TaskView/TaskView.h>
#include <Gui/TaskView/TaskDialog.h>
#include "ui_TaskLinkDim.h"
#include <Mod/TechDraw/Gui/ui_TaskLinkDim.h>
#include "ViewProviderDimension.h"
#include "../App/DrawViewDimension.h"
#include <Mod/TechDraw/App/DrawViewDimension.h>
class Ui_TaskLinkDim;
namespace App {
class Document;
class DocumentObject;
}
namespace TechDraw {
class DrawViewPart;
class DrawViewDimension;
}
namespace TechDrawGui
{

5
src/Mod/TechDraw/Gui/TaskProjGroup.cpp
View File

@ -41,8 +41,9 @@
#include <Mod/TechDraw/App/DrawProjGroupItem.h>
#include <Mod/TechDraw/App/DrawProjGroup.h>
#include "ViewProviderProjGroup.h"
#include "TaskProjGroup.h"
#include "ui_TaskProjGroup.h"
#include <Mod/TechDraw/Gui/ui_TaskProjGroup.h>
using namespace Gui;
using namespace TechDrawGui;
@ -410,4 +411,4 @@ bool TaskDlgProjGroup::reject()
}
#include "moc_TaskProjGroup.cpp"
#include <Mod/TechDraw/Gui/moc_TaskProjGroup.cpp>

15
src/Mod/TechDraw/Gui/TaskProjGroup.h
View File

@ -28,26 +28,20 @@
#include <Gui/TaskView/TaskView.h>
#include <Gui/TaskView/TaskDialog.h>
#include "ui_TaskProjGroup.h"
#include <Mod/TechDraw/Gui/ui_TaskProjGroup.h>
#include "ViewProviderProjGroup.h"
#include "../App/DrawProjGroup.h"
#include <Mod/TechDraw/App/DrawProjGroup.h>
class Ui_TaskProjGroup;
namespace App {
class Document;
class DocumentObject;
}
namespace TechDraw {
class DrawViewPart;
class DrawProjGroup;
}
namespace TechDrawGui
{
class ViewProviderProjGroup;
class TaskProjGroup : public QWidget
{
@ -125,7 +119,7 @@ public:
protected:
const ViewProviderProjGroup *viewProvider;
TechDraw::DrawProjGroup *multiView;
private:
TaskProjGroup * widget;
Gui::TaskView::TaskBox* taskbox;
@ -134,4 +128,3 @@ private:
} //namespace TechDrawGui
#endif // #ifndef GUI_TASKVIEW_TASKVIEWGROUP_H

1
src/Mod/TechDraw/Gui/TemplateTextField.cpp
View File

@ -31,6 +31,7 @@
#include <Base/Console.h>
#include "DlgTemplateField.h"
#include "TemplateTextField.h"
//#include<QDebug>

5
src/Mod/TechDraw/Gui/TemplateTextField.h
View File

@ -27,11 +27,12 @@
#include <QGraphicsRectItem>
#include "DlgTemplateField.h"
#include "../App/DrawTemplate.h"
#include <Mod/TechDraw/App/DrawTemplate.h>
namespace TechDrawGui
{
class DlgTemplateField;
/// QGraphicsRectItem-derived class for the text fields in title blocks
/*!
* This essentially just a way for us to make a rectangular area which

4
src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp
View File

@ -46,10 +46,12 @@
#include <Mod/TechDraw/App/DrawView.h>
#include <Mod/TechDraw/App/DrawViewClip.h>
#include <Mod/TechDraw/App/DrawPage.h>
#include "ViewProviderPage.h"
#include "ViewProviderDrawingView.h"
#include "QGIView.h"
#include "QGVPage.h"
#include "MDIViewPage.h"
#include "ViewProviderDrawingView.h"
using namespace TechDrawGui;

2
src/Mod/TechDraw/Gui/ViewProviderDrawingView.h
View File

@ -27,13 +27,13 @@
#include <Gui/ViewProviderFeature.h>
#include <Gui/ViewProviderDocumentObjectGroup.h>
#include "QGIView.h"
namespace TechDraw{
class DrawView;
}
namespace TechDrawGui {
class QGIView;
class TechDrawGuiExport ViewProviderDrawingView : public Gui::ViewProviderDocumentObject
{

1
src/Mod/TechDraw/Gui/ViewProviderPage.cpp
View File

@ -48,7 +48,6 @@
#include <Gui/Document.h>
#include <Gui/MainWindow.h>
#include <Gui/Selection.h>
#include <Gui/BitmapFactory.h>
#include <Gui/ViewProvider.h>
#include <Gui/ViewProviderDocumentObject.h>
#include <Gui/ViewProviderDocumentObjectGroup.h>

6
src/Mod/TechDraw/Gui/ViewProviderPage.h
View File

@ -30,16 +30,10 @@
#include <Gui/ViewProviderDocumentObjectGroup.h>
#include <Gui/Selection.h>
#include "MDIViewPage.h"
namespace TechDraw{
class DrawPage;
}
namespace Gui { //TODO: Inventor here??
class SoFCSelection;
}
namespace TechDrawGui {
class MDIViewPage;

4
src/Mod/TechDraw/Gui/ViewProviderViewClip.cpp
View File

@ -38,13 +38,11 @@
#include <App/Application.h>
#include <App/Document.h>
#include <App/DocumentObject.h>
//#include <Gui/SoFCSelection.h>
#include <Gui/Selection.h>
#include <Mod/TechDraw/App/DrawViewClip.h>
#include "ViewProviderDrawingView.h"
#include "ViewProviderViewClip.h"
#include "ViewProviderViewClip.h"
using namespace TechDrawGui;