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

+ Code cleanup:

Browse Source 
+ 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
This commit is contained in:
wmayer 2015-11-13 15:47:03 +01:00
parent bf0d8d68bb
commit 45af17e39c
27 changed files with 93 additions and 311 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Mod/Fem/Gui/ViewProviderAnalysis.cpp
View File

@ -77,13 +77,6 @@ std::vector<App::DocumentObject*> ViewProviderFemAnalysis::claimChildren(void)co
return temp;
}
//std::vector<App::DocumentObject*> ViewProviderFemAnalysis::claimChildren3D(void)const
//{
//
// //return static_cast<Assembly::ConstraintGroup*>(getObject())->Constraints.getValues();
// return std::vector<App::DocumentObject*> ();
//}
void ViewProviderFemAnalysis::setupContextMenu(QMenu* menu, QObject* receiver, const char* member)
{
Gui::ActionFunction* func = new Gui::ActionFunction(menu);

14
src/Mod/Fem/Gui/ViewProviderAnalysis.h
View File

@ -24,23 +24,13 @@
#ifndef FEM_ViewProviderAnalysis_H
#define FEM_ViewProviderAnalysis_H
#include <Gui/ViewProviderGeometryObject.h>
#include <Gui/ViewProviderBuilder.h>
#include <Gui/ViewProviderDocumentObject.h>
#include <Gui/ViewProviderPythonFeature.h>
#include <QCoreApplication>
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);

12
src/Mod/Fem/Gui/ViewProviderFemConstraint.cpp
View File

@ -416,21 +416,21 @@ void ViewProviderFemConstraint::checkForWizard()
wizardSubLayout = NULL;
Gui::MainWindow* mw = Gui::getMainWindow();
if (mw == NULL) return;
QDockWidget* dw = mw->findChild<QDockWidget*>(QObject::tr("Combo View"));
QDockWidget* dw = mw->findChild<QDockWidget*>(QString::fromLatin1("Combo View"));
if (dw == NULL) return;
QWidget* cw = dw->findChild<QWidget*>(QObject::tr("Combo View"));
QWidget* cw = dw->findChild<QWidget*>(QString::fromLatin1("Combo View"));
if (cw == NULL) return;
QTabWidget* tw = cw->findChild<QTabWidget*>(QObject::tr("combiTab"));
QTabWidget* tw = cw->findChild<QTabWidget*>(QString::fromLatin1("combiTab"));
if (tw == NULL) return;
QStackedWidget* sw = tw->findChild<QStackedWidget*>(QObject::tr("qt_tabwidget_stackedwidget"));
QStackedWidget* sw = tw->findChild<QStackedWidget*>(QString::fromLatin1("qt_tabwidget_stackedwidget"));
if (sw == NULL) return;
QScrollArea* sa = sw->findChild<QScrollArea*>();
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<QVBoxLayout*>(wiz);
wizardSubLayout = wiz->findChild<QVBoxLayout*>(QObject::tr("ShaftWizardLayout"));
wizardSubLayout = wiz->findChild<QVBoxLayout*>(QString::fromLatin1("ShaftWizardLayout"));
}
}

12
src/Mod/Fem/Gui/ViewProviderFemConstraint.h
View File

@ -24,12 +24,9 @@
#ifndef GUI_VIEWPROVIDERFEMCONSTRAINT_H
#define GUI_VIEWPROVIDERFEMCONSTRAINT_H
#include <TopoDS_Shape.hxx>
#include "Gui/ViewProviderGeometryObject.h"
#include <Gui/ViewProviderGeometryObject.h>
#include <QObject>
#include <QVBoxLayout>
#include <QTableWidget>
class SoFontStyle;
class SoText2;
@ -38,13 +35,6 @@ class SoTranslation;
class SbRotation;
class SoMaterial;
namespace Gui {
class View3DInventorViewer;
namespace TaskView {
class TaskDialog;
}
}
namespace FemGui
{

1
src/Mod/Fem/Gui/ViewProviderFemConstraintBearing.cpp
View File

@ -48,7 +48,6 @@ PROPERTY_SOURCE(FemGui::ViewProviderFemConstraintBearing, FemGui::ViewProviderFe
ViewProviderFemConstraintBearing::ViewProviderFemConstraintBearing()
{
sPixmap = "fem-constraint-bearing";
wizardWidget = NULL;
}
ViewProviderFemConstraintBearing::~ViewProviderFemConstraintBearing()

25
src/Mod/Fem/Gui/ViewProviderFemConstraintBearing.h
View File

@ -24,31 +24,7 @@
#ifndef GUI_VIEWPROVIDERFEMCONSTRAINTBEARING_H
#define GUI_VIEWPROVIDERFEMCONSTRAINTBEARING_H
#include <TopoDS_Shape.hxx>
#include "ViewProviderFemConstraint.h"
#include <QObject>
#include <QVBoxLayout>
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

24
src/Mod/Fem/Gui/ViewProviderFemConstraintFixed.h
View File

@ -24,30 +24,7 @@
#ifndef GUI_VIEWPROVIDERFEMCONSTRAINTFIXED_H
#define GUI_VIEWPROVIDERFEMCONSTRAINTFIXED_H
#include <TopoDS_Shape.hxx>
#include "ViewProviderFemConstraint.h"
#include <QObject>
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

24
src/Mod/Fem/Gui/ViewProviderFemConstraintForce.h
View File

@ -24,30 +24,7 @@
#ifndef GUI_VIEWPROVIDERFEMCONSTRAINTFORCE_H
#define GUI_VIEWPROVIDERFEMCONSTRAINTFORCE_H
#include <TopoDS_Shape.hxx>
#include "ViewProviderFemConstraint.h"
#include <QObject>
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

24
src/Mod/Fem/Gui/ViewProviderFemConstraintGear.h
View File

@ -24,30 +24,7 @@
#ifndef GUI_VIEWPROVIDERFEMCONSTRAINTGear_H
#define GUI_VIEWPROVIDERFEMCONSTRAINTGear_H
#include <TopoDS_Shape.hxx>
#include "ViewProviderFemConstraint.h"
#include <QObject>
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

3
src/Mod/Fem/Gui/ViewProviderFemConstraintPressure.h
View File

@ -24,11 +24,10 @@
#ifndef GUI_VIEWPROVIDERFEMCONSTRAINTPRESSURE_H
#define GUI_VIEWPROVIDERFEMCONSTRAINTPRESSURE_H
#include <QObject>
#include <TopoDS_Shape.hxx>
#include "ViewProviderFemConstraint.h"
namespace FemGui {
class FemGuiExport ViewProviderFemConstraintPressure : public FemGui::ViewProviderFemConstraint
{
PROPERTY_HEADER(FemGui::ViewProviderFemConstraintPressure);

24
src/Mod/Fem/Gui/ViewProviderFemConstraintPulley.h
View File

@ -24,30 +24,7 @@
#ifndef GUI_VIEWPROVIDERFEMCONSTRAINTPulley_H
#define GUI_VIEWPROVIDERFEMCONSTRAINTPulley_H
#include <TopoDS_Shape.hxx>
#include "ViewProviderFemConstraint.h"
#include <QObject>
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

97
src/Mod/Fem/Gui/ViewProviderFemMesh.cpp
View File

@ -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<FemFace*>{
class FemFaceGridItem : public std::vector<FemFace*>{
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)

36
src/Mod/Fem/Gui/ViewProviderFemMesh.h
View File

@ -43,7 +43,7 @@ class ViewProviderFEMMeshBuilder : public Gui::ViewProviderBuilder
{
public:
ViewProviderFEMMeshBuilder(){}
~ViewProviderFEMMeshBuilder(){}
virtual ~ViewProviderFEMMeshBuilder(){}
virtual void buildNodes(const App::Property*, std::vector<SoNode*>&) 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<long>&);
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<long,App::Color> &NodeColorMap);
/// set the color for each node
void setColorByNodeId(const std::map<long,App::Color> &NodeColorMap);
void setColorByNodeId(const std::vector<long> &NodeIds,const std::vector<App::Color> &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<long,Base::Vector3d> &NodeDispMap);
void setDisplacementByNodeId(const std::vector<long> &NodeIds,const std::vector<Base::Vector3d> &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<long,App::Color> &ElementColorMap);
/// reset the view of the element colors
void resetColorByElementId(void);
//@}
/// set the color for each element
void setColorByElementId(const std::map<long,App::Color> &ElementColorMap);
/// reset the view of the element colors
void resetColorByElementId(void);
//@}
const std::vector<unsigned long> &getVisibleElementFaces(void)const{return vFaceElementIdx;}
PyObject *getPyObject();
private:

4
src/Mod/Fem/Gui/ViewProviderFemMeshShape.cpp
View File

@ -24,8 +24,6 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <Standard_math.hxx>
#endif
#include "ViewProviderFemMeshShape.h"
@ -47,5 +45,3 @@ ViewProviderFemMeshShape::~ViewProviderFemMeshShape()
{
}

15
src/Mod/Fem/Gui/ViewProviderFemMeshShape.h
View File

@ -25,20 +25,11 @@
#define FEM_ViewProviderFemMeshShape_H
#include "ViewProviderFemMesh.h"
#include <Gui/ViewProviderBuilder.h>
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

2
src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.cpp
View File

@ -41,8 +41,6 @@
using namespace FemGui;
/* TRANSLATOR FemGui::ViewProviderFemMeshShapeNetgen */
PROPERTY_SOURCE(FemGui::ViewProviderFemMeshShapeNetgen, FemGui::ViewProviderFemMeshShape)

11
src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.h
View File

@ -27,17 +27,9 @@
#include "ViewProviderFemMeshShape.h"
#include <Gui/ViewProviderBuilder.h>
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

19
src/Mod/Fem/Gui/ViewProviderResult.cpp
View File

@ -24,34 +24,19 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <Standard_math.hxx>
#endif
#include "ViewProviderResult.h"
#include <Gui/Command.h>
#include <Gui/Document.h>
#include <Gui/Control.h>
#include <Mod/Fem/App/FemAnalysis.h>
#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 {

19
src/Mod/Fem/Gui/ViewProviderResult.h
View File

@ -24,22 +24,12 @@
#ifndef FEM_ViewProviderResult_H
#define FEM_ViewProviderResult_H
#include <Gui/ViewProviderGeometryObject.h>
#include <Gui/ViewProviderBuilder.h>
#include <Gui/ViewProviderDocumentObject.h>
#include <Gui/ViewProviderPythonFeature.h>
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<ViewProviderResult> ViewProviderResultPython;

4
src/Mod/Fem/Gui/ViewProviderSetElements.cpp
View File

@ -27,9 +27,8 @@
#endif
#include "ViewProviderSetElements.h"
#include <Gui/Control.h>
//#include <Gui/Control.h>
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)
{
}

4
src/Mod/Fem/Gui/ViewProviderSetElements.h
View File

@ -24,9 +24,7 @@
#ifndef FEM_ViewProviderSetElements_H
#define FEM_ViewProviderSetElements_H
#include "ViewProviderSetElements.h"
#include <Gui/ViewProviderGeometryObject.h>
#include <Mod/Fem/App/FemSetNodesObject.h>
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

4
src/Mod/Fem/Gui/ViewProviderSetFaces.cpp
View File

@ -27,9 +27,8 @@
#endif
#include "ViewProviderSetFaces.h"
#include <Gui/Control.h>
//#include <Gui/Control.h>
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)
{
}

4
src/Mod/Fem/Gui/ViewProviderSetFaces.h
View File

@ -24,9 +24,7 @@
#ifndef FEM_ViewProviderSetFaces_H
#define FEM_ViewProviderSetFaces_H
#include "ViewProviderSetFaces.h"
#include <Gui/ViewProviderGeometryObject.h>
#include <Mod/Fem/App/FemSetNodesObject.h>
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

4
src/Mod/Fem/Gui/ViewProviderSetGeometry.cpp
View File

@ -27,9 +27,8 @@
#endif
#include "ViewProviderSetGeometry.h"
#include <Gui/Control.h>
//#include <Gui/Control.h>
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)
{
}

4
src/Mod/Fem/Gui/ViewProviderSetGeometry.h
View File

@ -24,9 +24,7 @@
#ifndef FEM_ViewProviderSetGeometry_H
#define FEM_ViewProviderSetGeometry_H
#include "ViewProviderSetGeometry.h"
#include <Gui/ViewProviderGeometryObject.h>
#include <Mod/Fem/App/FemSetNodesObject.h>
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

3
src/Mod/Fem/Gui/ViewProviderSetNodes.cpp
View File

@ -29,8 +29,8 @@
#include "ViewProviderSetNodes.h"
#include <Gui/Control.h>
#include <Mod/Fem/Gui/TaskDlgCreateNodeSet.h>
#include <Mod/Fem/App/FemSetNodesObject.h>
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)
{
}

4
src/Mod/Fem/Gui/ViewProviderSetNodes.h
View File

@ -24,9 +24,7 @@
#ifndef FEM_ViewProviderSetNodes_H
#define FEM_ViewProviderSetNodes_H
#include "ViewProviderSetNodes.h"
#include <Gui/ViewProviderGeometryObject.h>
#include <Mod/Fem/App/FemSetNodesObject.h>
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