From 45af17e39c05cdd8b19be5e90607907bda89fa53 Mon Sep 17 00:00:00 2001 From: wmayer Date: Fri, 13 Nov 2015 15:47:03 +0100 Subject: [PATCH] + Code cleanup: + do not include header of itself + do not include unneeded header files + removed unneeded forward declarations + do not translate C string to get a QString + break too long lines + replace tabs with spaces + use virtual keyword on destructors --- src/Mod/Fem/Gui/ViewProviderAnalysis.cpp | 7 -- src/Mod/Fem/Gui/ViewProviderAnalysis.h | 14 +-- src/Mod/Fem/Gui/ViewProviderFemConstraint.cpp | 12 +-- src/Mod/Fem/Gui/ViewProviderFemConstraint.h | 12 +-- .../Gui/ViewProviderFemConstraintBearing.cpp | 1 - .../Gui/ViewProviderFemConstraintBearing.h | 25 ----- .../Fem/Gui/ViewProviderFemConstraintFixed.h | 24 ----- .../Fem/Gui/ViewProviderFemConstraintForce.h | 24 ----- .../Fem/Gui/ViewProviderFemConstraintGear.h | 24 ----- .../Gui/ViewProviderFemConstraintPressure.h | 3 +- .../Fem/Gui/ViewProviderFemConstraintPulley.h | 24 ----- src/Mod/Fem/Gui/ViewProviderFemMesh.cpp | 97 ++++++++++--------- src/Mod/Fem/Gui/ViewProviderFemMesh.h | 36 ++++--- src/Mod/Fem/Gui/ViewProviderFemMeshShape.cpp | 4 - src/Mod/Fem/Gui/ViewProviderFemMeshShape.h | 15 +-- .../Gui/ViewProviderFemMeshShapeNetgen.cpp | 2 - .../Fem/Gui/ViewProviderFemMeshShapeNetgen.h | 11 +-- src/Mod/Fem/Gui/ViewProviderResult.cpp | 19 +--- src/Mod/Fem/Gui/ViewProviderResult.h | 19 +--- src/Mod/Fem/Gui/ViewProviderSetElements.cpp | 4 +- src/Mod/Fem/Gui/ViewProviderSetElements.h | 4 +- src/Mod/Fem/Gui/ViewProviderSetFaces.cpp | 4 +- src/Mod/Fem/Gui/ViewProviderSetFaces.h | 4 +- src/Mod/Fem/Gui/ViewProviderSetGeometry.cpp | 4 +- src/Mod/Fem/Gui/ViewProviderSetGeometry.h | 4 +- src/Mod/Fem/Gui/ViewProviderSetNodes.cpp | 3 +- src/Mod/Fem/Gui/ViewProviderSetNodes.h | 4 +- 27 files changed, 93 insertions(+), 311 deletions(-) diff --git a/src/Mod/Fem/Gui/ViewProviderAnalysis.cpp b/src/Mod/Fem/Gui/ViewProviderAnalysis.cpp index aa44cee48..6d4f3aa16 100644 --- a/src/Mod/Fem/Gui/ViewProviderAnalysis.cpp +++ b/src/Mod/Fem/Gui/ViewProviderAnalysis.cpp @@ -77,13 +77,6 @@ std::vector ViewProviderFemAnalysis::claimChildren(void)co return temp; } -//std::vector ViewProviderFemAnalysis::claimChildren3D(void)const -//{ -// -// //return static_cast(getObject())->Constraints.getValues(); -// return std::vector (); -//} - void ViewProviderFemAnalysis::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { Gui::ActionFunction* func = new Gui::ActionFunction(menu); diff --git a/src/Mod/Fem/Gui/ViewProviderAnalysis.h b/src/Mod/Fem/Gui/ViewProviderAnalysis.h index bb8ba4759..5b92fba7b 100644 --- a/src/Mod/Fem/Gui/ViewProviderAnalysis.h +++ b/src/Mod/Fem/Gui/ViewProviderAnalysis.h @@ -24,23 +24,13 @@ #ifndef FEM_ViewProviderAnalysis_H #define FEM_ViewProviderAnalysis_H -#include -#include +#include #include #include -class SoCoordinate3; -class SoDrawStyle; -class SoIndexedFaceSet; -class SoIndexedLineSet; -class SoShapeHints; -class SoMaterialBinding; - namespace FemGui { - - class FemGuiExport ViewProviderFemAnalysis : public Gui::ViewProviderDocumentObject { Q_DECLARE_TR_FUNCTIONS(FemGui::ViewProviderFemAnalysis) @@ -51,7 +41,7 @@ public: ViewProviderFemAnalysis(); /// destructor. - ~ViewProviderFemAnalysis(); + virtual ~ViewProviderFemAnalysis(); virtual bool doubleClicked(void); diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraint.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraint.cpp index 7d2cccba6..932f91d95 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraint.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraint.cpp @@ -416,21 +416,21 @@ void ViewProviderFemConstraint::checkForWizard() wizardSubLayout = NULL; Gui::MainWindow* mw = Gui::getMainWindow(); if (mw == NULL) return; - QDockWidget* dw = mw->findChild(QObject::tr("Combo View")); + QDockWidget* dw = mw->findChild(QString::fromLatin1("Combo View")); if (dw == NULL) return; - QWidget* cw = dw->findChild(QObject::tr("Combo View")); + QWidget* cw = dw->findChild(QString::fromLatin1("Combo View")); if (cw == NULL) return; - QTabWidget* tw = cw->findChild(QObject::tr("combiTab")); + QTabWidget* tw = cw->findChild(QString::fromLatin1("combiTab")); if (tw == NULL) return; - QStackedWidget* sw = tw->findChild(QObject::tr("qt_tabwidget_stackedwidget")); + QStackedWidget* sw = tw->findChild(QString::fromLatin1("qt_tabwidget_stackedwidget")); if (sw == NULL) return; QScrollArea* sa = sw->findChild(); if (sa== NULL) return; QWidget* wd = sa->widget(); // This is the reason why we cannot use findChildByName() right away!!! if (wd == NULL) return; - QObject* wiz = findChildByName(wd, QObject::tr("ShaftWizard")); // FIXME: Actually, we don't want to translate this... + QObject* wiz = findChildByName(wd, QString::fromLatin1("ShaftWizard")); if (wiz != NULL) { wizardWidget = static_cast(wiz); - wizardSubLayout = wiz->findChild(QObject::tr("ShaftWizardLayout")); + wizardSubLayout = wiz->findChild(QString::fromLatin1("ShaftWizardLayout")); } } diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraint.h b/src/Mod/Fem/Gui/ViewProviderFemConstraint.h index 7d370a70d..4c05edef2 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraint.h +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraint.h @@ -24,12 +24,9 @@ #ifndef GUI_VIEWPROVIDERFEMCONSTRAINT_H #define GUI_VIEWPROVIDERFEMCONSTRAINT_H -#include - -#include "Gui/ViewProviderGeometryObject.h" +#include #include #include -#include class SoFontStyle; class SoText2; @@ -38,13 +35,6 @@ class SoTranslation; class SbRotation; class SoMaterial; -namespace Gui { -class View3DInventorViewer; - namespace TaskView { - class TaskDialog; - } -} - namespace FemGui { diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintBearing.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintBearing.cpp index 5d4577f6c..f869a65b1 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintBearing.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintBearing.cpp @@ -48,7 +48,6 @@ PROPERTY_SOURCE(FemGui::ViewProviderFemConstraintBearing, FemGui::ViewProviderFe ViewProviderFemConstraintBearing::ViewProviderFemConstraintBearing() { sPixmap = "fem-constraint-bearing"; - wizardWidget = NULL; } ViewProviderFemConstraintBearing::~ViewProviderFemConstraintBearing() diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintBearing.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintBearing.h index 603a04313..675342d83 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintBearing.h +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintBearing.h @@ -24,31 +24,7 @@ #ifndef GUI_VIEWPROVIDERFEMCONSTRAINTBEARING_H #define GUI_VIEWPROVIDERFEMCONSTRAINTBEARING_H -#include - #include "ViewProviderFemConstraint.h" -#include -#include - -class SoFontStyle; -class SoText2; -class SoBaseColor; -class SoTranslation; -class SbRotation; -class SoMaterial; -class SoLightModel; -class SoCoordinate3; -class SoIndexedLineSet; -class SoIndexedFaceSet; -class SoEventCallback; -class SoMarkerSet; - -namespace Gui { -class View3DInventorViewer; - namespace TaskView { - class TaskDialog; - } -} namespace FemGui { @@ -66,7 +42,6 @@ public: protected: virtual bool setEdit(int ModNum); - }; } //namespace FemGui diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintFixed.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintFixed.h index ff9825e8a..f2f2863d3 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintFixed.h +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintFixed.h @@ -24,30 +24,7 @@ #ifndef GUI_VIEWPROVIDERFEMCONSTRAINTFIXED_H #define GUI_VIEWPROVIDERFEMCONSTRAINTFIXED_H -#include - #include "ViewProviderFemConstraint.h" -#include - -class SoFontStyle; -class SoText2; -class SoBaseColor; -class SoTranslation; -class SbRotation; -class SoMaterial; -class SoLightModel; -class SoCoordinate3; -class SoIndexedLineSet; -class SoIndexedFaceSet; -class SoEventCallback; -class SoMarkerSet; - -namespace Gui { -class View3DInventorViewer; - namespace TaskView { - class TaskDialog; - } -} namespace FemGui { @@ -65,7 +42,6 @@ public: protected: virtual bool setEdit(int ModNum); - }; } //namespace FemGui diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintForce.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintForce.h index ba6027fc6..e8b148748 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintForce.h +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintForce.h @@ -24,30 +24,7 @@ #ifndef GUI_VIEWPROVIDERFEMCONSTRAINTFORCE_H #define GUI_VIEWPROVIDERFEMCONSTRAINTFORCE_H -#include - #include "ViewProviderFemConstraint.h" -#include - -class SoFontStyle; -class SoText2; -class SoBaseColor; -class SoTranslation; -class SbRotation; -class SoMaterial; -class SoLightModel; -class SoCoordinate3; -class SoIndexedLineSet; -class SoIndexedFaceSet; -class SoEventCallback; -class SoMarkerSet; - -namespace Gui { -class View3DInventorViewer; - namespace TaskView { - class TaskDialog; - } -} namespace FemGui { @@ -69,7 +46,6 @@ protected: private: /// Direction of the force Base::Vector3f forceDirection; - }; } //namespace FemGui diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintGear.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintGear.h index 55f08a1ad..021c6026e 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintGear.h +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintGear.h @@ -24,30 +24,7 @@ #ifndef GUI_VIEWPROVIDERFEMCONSTRAINTGear_H #define GUI_VIEWPROVIDERFEMCONSTRAINTGear_H -#include - #include "ViewProviderFemConstraint.h" -#include - -class SoFontStyle; -class SoText2; -class SoBaseColor; -class SoTranslation; -class SbRotation; -class SoMaterial; -class SoLightModel; -class SoCoordinate3; -class SoIndexedLineSet; -class SoIndexedFaceSet; -class SoEventCallback; -class SoMarkerSet; - -namespace Gui { -class View3DInventorViewer; - namespace TaskView { - class TaskDialog; - } -} namespace FemGui { @@ -65,7 +42,6 @@ public: protected: virtual bool setEdit(int ModNum); - }; } //namespace FemGui diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintPressure.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintPressure.h index ea514a0c7..616aa00e4 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintPressure.h +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintPressure.h @@ -24,11 +24,10 @@ #ifndef GUI_VIEWPROVIDERFEMCONSTRAINTPRESSURE_H #define GUI_VIEWPROVIDERFEMCONSTRAINTPRESSURE_H -#include -#include #include "ViewProviderFemConstraint.h" namespace FemGui { + class FemGuiExport ViewProviderFemConstraintPressure : public FemGui::ViewProviderFemConstraint { PROPERTY_HEADER(FemGui::ViewProviderFemConstraintPressure); diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintPulley.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintPulley.h index 50d14d650..518da789b 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintPulley.h +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintPulley.h @@ -24,30 +24,7 @@ #ifndef GUI_VIEWPROVIDERFEMCONSTRAINTPulley_H #define GUI_VIEWPROVIDERFEMCONSTRAINTPulley_H -#include - #include "ViewProviderFemConstraint.h" -#include - -class SoFontStyle; -class SoText2; -class SoBaseColor; -class SoTranslation; -class SbRotation; -class SoMaterial; -class SoLightModel; -class SoCoordinate3; -class SoIndexedLineSet; -class SoIndexedFaceSet; -class SoEventCallback; -class SoMarkerSet; - -namespace Gui { -class View3DInventorViewer; - namespace TaskView { - class TaskDialog; - } -} namespace FemGui { @@ -65,7 +42,6 @@ public: protected: virtual bool setEdit(int ModNum); - }; } //namespace FemGui diff --git a/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp b/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp index 92f0a1583..a609fd1d9 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp @@ -74,33 +74,37 @@ using namespace FemGui; -struct FemFace +struct FemFace { - const SMDS_MeshNode *Nodes[8]; - unsigned long ElementNumber; + const SMDS_MeshNode *Nodes[8]; + unsigned long ElementNumber; const SMDS_MeshElement* Element; - unsigned short Size; - unsigned short FaceNo; + unsigned short Size; + unsigned short FaceNo; bool hide; Base::Vector3d getFirstNodePoint(void) { return Base::Vector3d(Nodes[0]->X(),Nodes[0]->Y(),Nodes[0]->Z()); } - - Base::Vector3d set(short size,const SMDS_MeshElement* element,unsigned short id, short faceNo, const SMDS_MeshNode* n1,const SMDS_MeshNode* n2,const SMDS_MeshNode* n3,const SMDS_MeshNode* n4=0,const SMDS_MeshNode* n5=0,const SMDS_MeshNode* n6=0,const SMDS_MeshNode* n7=0,const SMDS_MeshNode* n8=0); - - bool isSameFace (FemFace &face); + + Base::Vector3d set(short size,const SMDS_MeshElement* element,unsigned short id, short faceNo, + const SMDS_MeshNode* n1,const SMDS_MeshNode* n2,const SMDS_MeshNode* n3,const SMDS_MeshNode* n4=0, + const SMDS_MeshNode* n5=0,const SMDS_MeshNode* n6=0,const SMDS_MeshNode* n7=0,const SMDS_MeshNode* n8=0); + + bool isSameFace (FemFace &face); }; -Base::Vector3d FemFace::set(short size,const SMDS_MeshElement* element,unsigned short id,short faceNo, const SMDS_MeshNode* n1,const SMDS_MeshNode* n2,const SMDS_MeshNode* n3,const SMDS_MeshNode* n4,const SMDS_MeshNode* n5,const SMDS_MeshNode* n6,const SMDS_MeshNode* n7,const SMDS_MeshNode* n8) +Base::Vector3d FemFace::set(short size,const SMDS_MeshElement* element,unsigned short id,short faceNo, + const SMDS_MeshNode* n1,const SMDS_MeshNode* n2,const SMDS_MeshNode* n3,const SMDS_MeshNode* n4, + const SMDS_MeshNode* n5,const SMDS_MeshNode* n6,const SMDS_MeshNode* n7,const SMDS_MeshNode* n8) { - Nodes[0] = n1; - Nodes[1] = n2; - Nodes[2] = n3; - Nodes[3] = n4; - Nodes[4] = n5; - Nodes[5] = n6; - Nodes[6] = n7; - Nodes[7] = n8; + Nodes[0] = n1; + Nodes[1] = n2; + Nodes[2] = n3; + Nodes[3] = n4; + Nodes[4] = n5; + Nodes[5] = n6; + Nodes[6] = n7; + Nodes[7] = n8; Element = element; ElementNumber = id; @@ -108,29 +112,29 @@ Base::Vector3d FemFace::set(short size,const SMDS_MeshElement* element,unsigned FaceNo = faceNo; hide = false; - // sorting the nodes for later easier comparison (bubble sort) + // sorting the nodes for later easier comparison (bubble sort) int i, j, flag = 1; // set flag to 1 to start first pass - const SMDS_MeshNode* temp; // holding variable - - for(i = 1; (i <= size) && flag; i++) - { - flag = 0; - for (j=0; j < (size -1); j++) - { - if (Nodes[j+1] > Nodes[j]) // ascending order simply changes to < - { - temp = Nodes[j]; // swap elements - Nodes[j] = Nodes[j+1]; - Nodes[j+1] = temp; - flag = 1; // indicates that a swap occurred. - } - } - } + const SMDS_MeshNode* temp; // holding variable + + for(i = 1; (i <= size) && flag; i++) + { + flag = 0; + for (j=0; j < (size -1); j++) + { + if (Nodes[j+1] > Nodes[j]) // ascending order simply changes to < + { + temp = Nodes[j]; // swap elements + Nodes[j] = Nodes[j+1]; + Nodes[j+1] = temp; + flag = 1; // indicates that a swap occurred. + } + } + } return Base::Vector3d(Nodes[0]->X(),Nodes[0]->Y(),Nodes[0]->Z()); -}; +} -class FemFaceGridItem :public std::vector{ +class FemFaceGridItem : public std::vector{ public: //FemFaceGridItem(void){reserve(200);} }; @@ -140,16 +144,16 @@ bool FemFace::isSameFace (FemFace &face) // the same element can not have the same face if(face.ElementNumber == ElementNumber) return false; - if(face.Size != Size) + if(face.Size != Size) return false; - // if the same face size just compare if the sorted nodes are the same - if( Nodes[0] == face.Nodes[0] && - Nodes[1] == face.Nodes[1] && - Nodes[2] == face.Nodes[2] && - Nodes[3] == face.Nodes[3] && - Nodes[4] == face.Nodes[4] && - Nodes[5] == face.Nodes[5] && - Nodes[6] == face.Nodes[6] && + // if the same face size just compare if the sorted nodes are the same + if( Nodes[0] == face.Nodes[0] && + Nodes[1] == face.Nodes[1] && + Nodes[2] == face.Nodes[2] && + Nodes[3] == face.Nodes[3] && + Nodes[4] == face.Nodes[4] && + Nodes[5] == face.Nodes[5] && + Nodes[6] == face.Nodes[6] && Nodes[7] == face.Nodes[7] ){ hide = true; face.hide = true; @@ -228,7 +232,6 @@ ViewProviderFemMesh::~ViewProviderFemMesh() pcMatBinding->unref(); pcPointMaterial->unref(); pcPointStyle->unref(); - } void ViewProviderFemMesh::attach(App::DocumentObject *pcObj) diff --git a/src/Mod/Fem/Gui/ViewProviderFemMesh.h b/src/Mod/Fem/Gui/ViewProviderFemMesh.h index e928151b4..e57fba5dd 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemMesh.h +++ b/src/Mod/Fem/Gui/ViewProviderFemMesh.h @@ -43,7 +43,7 @@ class ViewProviderFEMMeshBuilder : public Gui::ViewProviderBuilder { public: ViewProviderFEMMeshBuilder(){} - ~ViewProviderFEMMeshBuilder(){} + virtual ~ViewProviderFEMMeshBuilder(){} virtual void buildNodes(const App::Property*, std::vector&) const; void createMesh(const App::Property*, SoCoordinate3*, @@ -65,7 +65,7 @@ public: ViewProviderFemMesh(); /// destructor. - ~ViewProviderFemMesh(); + virtual ~ViewProviderFemMesh(); // Display properties App::PropertyColor PointColor; @@ -98,36 +98,34 @@ public: void setHighlightNodes(const std::set&); void resetHighlightNodes(void); - /** @name Postprocessing + /** @name Postprocessing * this interfaces apply post processing stuff to the View- - * Provider. They can override the positioning and the color - * color or certain elements. + * Provider. They can override the positioning and the color + * color or certain elements. */ //@{ - /// set the color for each node - void setColorByNodeId(const std::map &NodeColorMap); + /// set the color for each node + void setColorByNodeId(const std::map &NodeColorMap); void setColorByNodeId(const std::vector &NodeIds,const std::vector &NodeColors); - /// reset the view of the node colors - void resetColorByNodeId(void); - /// set the displacement for each node + /// reset the view of the node colors + void resetColorByNodeId(void); + /// set the displacement for each node void setDisplacementByNodeId(const std::map &NodeDispMap); void setDisplacementByNodeId(const std::vector &NodeIds,const std::vector &NodeDisps); - /// reset the view of the node displacement - void resetDisplacementByNodeId(void); + /// reset the view of the node displacement + void resetDisplacementByNodeId(void); /// reaply the node displacement with a certain factor and do a redraw void applyDisplacementToNodes(double factor); - /// set the color for each element - void setColorByElementId(const std::map &ElementColorMap); - /// reset the view of the element colors - void resetColorByElementId(void); - - //@} + /// set the color for each element + void setColorByElementId(const std::map &ElementColorMap); + /// reset the view of the element colors + void resetColorByElementId(void); + //@} const std::vector &getVisibleElementFaces(void)const{return vFaceElementIdx;} - PyObject *getPyObject(); private: diff --git a/src/Mod/Fem/Gui/ViewProviderFemMeshShape.cpp b/src/Mod/Fem/Gui/ViewProviderFemMeshShape.cpp index b9015caae..4fee68d6b 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemMeshShape.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemMeshShape.cpp @@ -24,8 +24,6 @@ #include "PreCompiled.h" #ifndef _PreComp_ -# include - #endif #include "ViewProviderFemMeshShape.h" @@ -47,5 +45,3 @@ ViewProviderFemMeshShape::~ViewProviderFemMeshShape() { } - - diff --git a/src/Mod/Fem/Gui/ViewProviderFemMeshShape.h b/src/Mod/Fem/Gui/ViewProviderFemMeshShape.h index 9ba36d8c4..44219ba1c 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemMeshShape.h +++ b/src/Mod/Fem/Gui/ViewProviderFemMeshShape.h @@ -25,20 +25,11 @@ #define FEM_ViewProviderFemMeshShape_H #include "ViewProviderFemMesh.h" -#include - -class SoCoordinate3; -class SoDrawStyle; -class SoIndexedFaceSet; -class SoIndexedLineSet; -class SoShapeHints; -class SoMaterialBinding; namespace FemGui { - - class FemGuiExport ViewProviderFemMeshShape : public ViewProviderFemMesh +class FemGuiExport ViewProviderFemMeshShape : public ViewProviderFemMesh { PROPERTY_HEADER(FemGui::ViewProviderFemMeshShape); @@ -47,9 +38,7 @@ public: ViewProviderFemMeshShape(); /// destructor. - ~ViewProviderFemMeshShape(); - - + virtual ~ViewProviderFemMeshShape(); }; } //namespace FemGui diff --git a/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.cpp b/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.cpp index 8654c9c6c..801596594 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.cpp @@ -41,8 +41,6 @@ using namespace FemGui; - - /* TRANSLATOR FemGui::ViewProviderFemMeshShapeNetgen */ PROPERTY_SOURCE(FemGui::ViewProviderFemMeshShapeNetgen, FemGui::ViewProviderFemMeshShape) diff --git a/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.h b/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.h index 07763781e..b86601396 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.h +++ b/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.h @@ -27,17 +27,9 @@ #include "ViewProviderFemMeshShape.h" #include -class SoCoordinate3; -class SoDrawStyle; -class SoIndexedFaceSet; -class SoIndexedLineSet; -class SoShapeHints; -class SoMaterialBinding; - namespace FemGui { - class FemGuiExport ViewProviderFemMeshShapeNetgen : public ViewProviderFemMeshShape { PROPERTY_HEADER(FemGui::ViewProviderFemMeshShapeNetgen); @@ -47,14 +39,13 @@ public: ViewProviderFemMeshShapeNetgen(); /// destructor. - ~ViewProviderFemMeshShapeNetgen(); + virtual ~ViewProviderFemMeshShapeNetgen(); virtual void updateData(const App::Property*); protected: virtual void setupContextMenu(QMenu* menu, QObject* receiver, const char* member); virtual bool setEdit(int ModNum); - }; } //namespace FemGui diff --git a/src/Mod/Fem/Gui/ViewProviderResult.cpp b/src/Mod/Fem/Gui/ViewProviderResult.cpp index 93d56918e..64821ca12 100644 --- a/src/Mod/Fem/Gui/ViewProviderResult.cpp +++ b/src/Mod/Fem/Gui/ViewProviderResult.cpp @@ -24,34 +24,19 @@ #include "PreCompiled.h" #ifndef _PreComp_ -# include - #endif #include "ViewProviderResult.h" -#include -#include -#include - -#include - -#include "TaskDlgAnalysis.h" using namespace FemGui; - - - - PROPERTY_SOURCE(FemGui::ViewProviderResult, Gui::ViewProviderDocumentObject) - ViewProviderResult::ViewProviderResult() { - sPixmap = "fem-result"; - + sPixmap = "fem-result"; } ViewProviderResult::~ViewProviderResult() @@ -59,8 +44,6 @@ ViewProviderResult::~ViewProviderResult() } - - // Python feature ----------------------------------------------------------------------- namespace Gui { diff --git a/src/Mod/Fem/Gui/ViewProviderResult.h b/src/Mod/Fem/Gui/ViewProviderResult.h index d626981e7..66ead6dc2 100644 --- a/src/Mod/Fem/Gui/ViewProviderResult.h +++ b/src/Mod/Fem/Gui/ViewProviderResult.h @@ -24,22 +24,12 @@ #ifndef FEM_ViewProviderResult_H #define FEM_ViewProviderResult_H -#include -#include +#include #include -class SoCoordinate3; -class SoDrawStyle; -class SoIndexedFaceSet; -class SoIndexedLineSet; -class SoShapeHints; -class SoMaterialBinding; - namespace FemGui { - - class FemGuiExport ViewProviderResult : public Gui::ViewProviderDocumentObject { PROPERTY_HEADER(FemGui::ViewProviderResult); @@ -49,12 +39,11 @@ public: ViewProviderResult(); /// destructor - ~ViewProviderResult(); + virtual ~ViewProviderResult(); // shows solid in the tree - virtual bool isShow(void) const{return true;} -protected: - + virtual bool isShow(void) const + { return true; } }; typedef Gui::ViewProviderPythonFeatureT ViewProviderResultPython; diff --git a/src/Mod/Fem/Gui/ViewProviderSetElements.cpp b/src/Mod/Fem/Gui/ViewProviderSetElements.cpp index 0c169b1c6..cff850fd9 100644 --- a/src/Mod/Fem/Gui/ViewProviderSetElements.cpp +++ b/src/Mod/Fem/Gui/ViewProviderSetElements.cpp @@ -27,9 +27,8 @@ #endif #include "ViewProviderSetElements.h" -#include +//#include -using namespace Gui; using namespace FemGui; PROPERTY_SOURCE(FemGui::ViewProviderSetElements, Gui::ViewProviderGeometryObject) @@ -52,5 +51,4 @@ bool ViewProviderSetElements::setEdit(int ModNum) void ViewProviderSetElements::unsetEdit(int ModNum) { - } diff --git a/src/Mod/Fem/Gui/ViewProviderSetElements.h b/src/Mod/Fem/Gui/ViewProviderSetElements.h index ffc1c938e..4a97de8e8 100644 --- a/src/Mod/Fem/Gui/ViewProviderSetElements.h +++ b/src/Mod/Fem/Gui/ViewProviderSetElements.h @@ -24,9 +24,7 @@ #ifndef FEM_ViewProviderSetElements_H #define FEM_ViewProviderSetElements_H -#include "ViewProviderSetElements.h" #include -#include namespace FemGui { @@ -37,10 +35,10 @@ class ViewProviderSetElements : public Gui::ViewProviderGeometryObject public: virtual bool doubleClicked(void); + protected: virtual bool setEdit(int ModNum); virtual void unsetEdit(int ModNum); - }; } //namespace FemGui diff --git a/src/Mod/Fem/Gui/ViewProviderSetFaces.cpp b/src/Mod/Fem/Gui/ViewProviderSetFaces.cpp index 2e5733b07..d976c3938 100644 --- a/src/Mod/Fem/Gui/ViewProviderSetFaces.cpp +++ b/src/Mod/Fem/Gui/ViewProviderSetFaces.cpp @@ -27,9 +27,8 @@ #endif #include "ViewProviderSetFaces.h" -#include +//#include -using namespace Gui; using namespace FemGui; PROPERTY_SOURCE(FemGui::ViewProviderSetFaces, Gui::ViewProviderGeometryObject) @@ -52,5 +51,4 @@ bool ViewProviderSetFaces::setEdit(int ModNum) void ViewProviderSetFaces::unsetEdit(int ModNum) { - } diff --git a/src/Mod/Fem/Gui/ViewProviderSetFaces.h b/src/Mod/Fem/Gui/ViewProviderSetFaces.h index 45773598e..26938c79d 100644 --- a/src/Mod/Fem/Gui/ViewProviderSetFaces.h +++ b/src/Mod/Fem/Gui/ViewProviderSetFaces.h @@ -24,9 +24,7 @@ #ifndef FEM_ViewProviderSetFaces_H #define FEM_ViewProviderSetFaces_H -#include "ViewProviderSetFaces.h" #include -#include namespace FemGui { @@ -37,10 +35,10 @@ class ViewProviderSetFaces : public Gui::ViewProviderGeometryObject public: virtual bool doubleClicked(void); + protected: virtual bool setEdit(int ModNum); virtual void unsetEdit(int ModNum); - }; } //namespace FemGui diff --git a/src/Mod/Fem/Gui/ViewProviderSetGeometry.cpp b/src/Mod/Fem/Gui/ViewProviderSetGeometry.cpp index 3d5f00730..ae3abc1d6 100644 --- a/src/Mod/Fem/Gui/ViewProviderSetGeometry.cpp +++ b/src/Mod/Fem/Gui/ViewProviderSetGeometry.cpp @@ -27,9 +27,8 @@ #endif #include "ViewProviderSetGeometry.h" -#include +//#include -using namespace Gui; using namespace FemGui; PROPERTY_SOURCE(FemGui::ViewProviderSetGeometry, Gui::ViewProviderGeometryObject) @@ -52,5 +51,4 @@ bool ViewProviderSetGeometry::setEdit(int ModNum) void ViewProviderSetGeometry::unsetEdit(int ModNum) { - } diff --git a/src/Mod/Fem/Gui/ViewProviderSetGeometry.h b/src/Mod/Fem/Gui/ViewProviderSetGeometry.h index 66c067cde..c28e11b48 100644 --- a/src/Mod/Fem/Gui/ViewProviderSetGeometry.h +++ b/src/Mod/Fem/Gui/ViewProviderSetGeometry.h @@ -24,9 +24,7 @@ #ifndef FEM_ViewProviderSetGeometry_H #define FEM_ViewProviderSetGeometry_H -#include "ViewProviderSetGeometry.h" #include -#include namespace FemGui { @@ -37,10 +35,10 @@ class ViewProviderSetGeometry : public Gui::ViewProviderGeometryObject public: virtual bool doubleClicked(void); + protected: virtual bool setEdit(int ModNum); virtual void unsetEdit(int ModNum); - }; } //namespace FemGui diff --git a/src/Mod/Fem/Gui/ViewProviderSetNodes.cpp b/src/Mod/Fem/Gui/ViewProviderSetNodes.cpp index af22e3e1c..00f47e1fa 100644 --- a/src/Mod/Fem/Gui/ViewProviderSetNodes.cpp +++ b/src/Mod/Fem/Gui/ViewProviderSetNodes.cpp @@ -29,8 +29,8 @@ #include "ViewProviderSetNodes.h" #include #include +#include -using namespace Gui; using namespace FemGui; PROPERTY_SOURCE(FemGui::ViewProviderSetNodes, Gui::ViewProviderGeometryObject) @@ -53,5 +53,4 @@ bool ViewProviderSetNodes::setEdit(int ModNum) void ViewProviderSetNodes::unsetEdit(int ModNum) { - } diff --git a/src/Mod/Fem/Gui/ViewProviderSetNodes.h b/src/Mod/Fem/Gui/ViewProviderSetNodes.h index ccdb7f248..27758f60e 100644 --- a/src/Mod/Fem/Gui/ViewProviderSetNodes.h +++ b/src/Mod/Fem/Gui/ViewProviderSetNodes.h @@ -24,9 +24,7 @@ #ifndef FEM_ViewProviderSetNodes_H #define FEM_ViewProviderSetNodes_H -#include "ViewProviderSetNodes.h" #include -#include namespace FemGui { @@ -37,10 +35,10 @@ class ViewProviderSetNodes : public Gui::ViewProviderGeometryObject public: virtual bool doubleClicked(void); + protected: virtual bool setEdit(int ModNum); virtual void unsetEdit(int ModNum); - }; } //namespace FemGui