ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-04-25 00:42:04 +05:00
Code Issues Packages Projects Releases Wiki Activity

first executable version

Browse Source
This commit is contained in:
abd 2008-04-09 08:44:48 +00:00
parent e0d9c97d8a
commit 61d3ca66fe
25 changed files with 87 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/GEOMBase/GEOMBase_aWarningDlg.h
View File

@ -29,6 +29,8 @@
#ifndef GEOMBase_aWarningDLG_H
#define GEOMBase_aWarningDLG_H
#include "GEOM_GEOMBase.hxx"
#include <qdialog.h>
#include <qwidget.h>
@ -39,7 +41,7 @@ class QPushButton;
// class : GEOMBase_aWarningDlg
// purpose :
//=================================================================================
class GEOMBase_aWarningDlg : public QDialog
class GEOMBASE_EXPORT GEOMBase_aWarningDlg : public QDialog
{
Q_OBJECT

4
src/GEOMClient/GEOM_Client.cxx
View File

@ -53,11 +53,15 @@
#include <unistd.h>
#endif
#include <string>
#include CORBA_SERVER_HEADER(SALOMEDS)
#include CORBA_SERVER_HEADER(GEOM_Gen)
#define HST_CLIENT_LEN 256
using namespace std;
//=======================================================================

2
src/GEOMGUI/GEOM_Displayer.h
View File

@ -173,7 +173,7 @@ protected:
protected:
Handle(SALOME_InteractiveObject) myIO;
TopoDS_Shape myShape;
string myName;
std::string myName;
int myType;
SALOME_View* myViewFrame;

2
src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx
View File

@ -97,6 +97,8 @@
#include <Standard_Failure.hxx>
#include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
using namespace std;
//=============================================================================
/*!
* constructor:

8
src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx
View File

@ -112,17 +112,17 @@ class GEOMImpl_IBlocksOperations : public GEOM_IOperations {
struct BCError {
BCErrorType error;
list<int> incriminated;
std::list<int> incriminated;
};
Standard_EXPORT Standard_Boolean CheckCompoundOfBlocksOld (Handle(GEOM_Object) theCompound,
list<BCError>& theErrors);
std::list<BCError>& theErrors);
Standard_EXPORT Standard_Boolean CheckCompoundOfBlocks (Handle(GEOM_Object) theCompound,
list<BCError>& theErrors);
std::list<BCError>& theErrors);
Standard_EXPORT TCollection_AsciiString PrintBCErrors (Handle(GEOM_Object) theCompound,
const list<BCError>& theErrors);
const std::list<BCError>& theErrors);
Standard_EXPORT Handle(GEOM_Object) RemoveExtraEdges (Handle(GEOM_Object) theShape);

8
src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx
View File

@ -36,7 +36,7 @@ class GEOMImpl_ICurvesOperations : public GEOM_IOperations {
Standard_EXPORT GEOMImpl_ICurvesOperations(GEOM_Engine* theEngine, int theDocID);
Standard_EXPORT ~GEOMImpl_ICurvesOperations();
Standard_EXPORT Handle(GEOM_Object) MakePolyline (list<Handle(GEOM_Object)> thePoints);
Standard_EXPORT Handle(GEOM_Object) MakePolyline (std::list<Handle(GEOM_Object)> thePoints);
Standard_EXPORT Handle(GEOM_Object) MakeCircleThreePnt (Handle(GEOM_Object) thePnt1,
Handle(GEOM_Object) thePnt2,
@ -60,11 +60,11 @@ class GEOMImpl_ICurvesOperations : public GEOM_IOperations {
Handle(GEOM_Object) thePnt3,
bool theSense);
Standard_EXPORT Handle(GEOM_Object) MakeSplineBezier (list<Handle(GEOM_Object)> thePoints);
Standard_EXPORT Handle(GEOM_Object) MakeSplineInterpolation (list<Handle(GEOM_Object)> thePoints);
Standard_EXPORT Handle(GEOM_Object) MakeSplineBezier (std::list<Handle(GEOM_Object)> thePoints);
Standard_EXPORT Handle(GEOM_Object) MakeSplineInterpolation (std::list<Handle(GEOM_Object)> thePoints);
Standard_EXPORT Handle(GEOM_Object) MakeSketcher (const TCollection_AsciiString& theCommand,
list<double> theWorkingPlane);
std::list<double> theWorkingPlane);
Standard_EXPORT Handle(GEOM_Object) MakeSketcherOnPlane (const TCollection_AsciiString& theCommand,
Handle(GEOM_Object) theWorkingPlane);
};

2
src/GEOMImpl/GEOMImpl_IHealingOperations.cxx
View File

@ -52,6 +52,8 @@
#include <Standard_Failure.hxx>
#include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
using namespace std;
//=============================================================================
/*!

14
src/GEOMImpl/GEOMImpl_IHealingOperations.hxx
View File

@ -42,17 +42,17 @@ class GEOMImpl_IHealingOperations : public GEOM_IOperations {
const Handle(TColStd_HArray1OfExtendedString)& theValues );
// Retrieve default Shape Process parameters (from resource file)
Standard_EXPORT void GetShapeProcessParameters( list<string>& theOperations,
list<string>& theParams,
list<string>& theValues );
Standard_EXPORT void GetShapeProcessParameters( std::list<string>& theOperations,
std::list<std::string>& theParams,
std::list<std::string>& theValues );
// Retrieve default Shape Process parameters for given operator
Standard_EXPORT bool GetOperatorParameters( const string theOperation,
list<string>& theParams,
list<string>& theValues );
Standard_EXPORT bool GetOperatorParameters( const std::string theOperation,
std::list<std::string>& theParams,
std::list<std::string>& theValues );
// returns all parameters that are valid for the given operation (Shape Process operator)
Standard_EXPORT static bool GetParameters( const string theOperation, list<string>& theParams );
Standard_EXPORT static bool GetParameters( const string theOperation, std::list<std::string>& theParams );
Standard_EXPORT Handle(GEOM_Object) SuppressFaces( Handle(GEOM_Object) theObject,
const Handle(TColStd_HArray1OfInteger)& theFaces);

16
src/GEOMImpl/GEOMImpl_ILocalOperations.hxx
View File

@ -36,15 +36,15 @@ class GEOMImpl_ILocalOperations : public GEOM_IOperations {
Standard_EXPORT Handle(GEOM_Object) MakeFilletAll (Handle(GEOM_Object) theShape, double theR);
Standard_EXPORT Handle(GEOM_Object) MakeFilletEdges (Handle(GEOM_Object) theShape, double theR,
list<int> theEdges);
std::list<int> theEdges);
Standard_EXPORT Handle(GEOM_Object) MakeFilletEdgesR1R2 (Handle(GEOM_Object) theShape,
double theR1, double theR2,
list<int> theEdges);
std::list<int> theEdges);
Standard_EXPORT Handle(GEOM_Object) MakeFilletFaces (Handle(GEOM_Object) theShape, double theR,
list<int> theFaces);
std::list<int> theFaces);
Standard_EXPORT Handle(GEOM_Object) MakeFilletFacesR1R2 (Handle(GEOM_Object) theShape,
double theR1, double theR2,
list<int> theFaces);
std::list<int> theFaces);
Standard_EXPORT Handle(GEOM_Object) MakeChamferAll (Handle(GEOM_Object) theShape, double theD);
Standard_EXPORT Handle(GEOM_Object) MakeChamferEdge (Handle(GEOM_Object) theShape,
@ -55,16 +55,16 @@ class GEOMImpl_ILocalOperations : public GEOM_IOperations {
int theFace1, int theFace2);
Standard_EXPORT Handle(GEOM_Object) MakeChamferFaces (Handle(GEOM_Object) theShape,
double theD1, double theD2,
list<int> theFaces);
std::list<int> theFaces);
Standard_EXPORT Handle(GEOM_Object) MakeChamferFacesAD (Handle(GEOM_Object) theShape,
double theD, double theAngle,
list<int> theFaces);
std::list<int> theFaces);
Standard_EXPORT Handle(GEOM_Object) MakeChamferEdges (Handle(GEOM_Object) theShape,
double theD1, double theD2,
list<int> theEdges);
std::list<int> theEdges);
Standard_EXPORT Handle(GEOM_Object) MakeChamferEdgesAD (Handle(GEOM_Object) theShape,
double theD, double theAngle,
list<int> theEdges);
std::list<int> theEdges);
Standard_EXPORT Handle(GEOM_Object) MakeArchimede (Handle(GEOM_Object) theShape,
double theWeight, double theWaterDensity,
double theMeshingDeflection);

2
src/GEOMImpl/GEOMImpl_IShapesOperations.cxx
View File

@ -127,6 +127,8 @@
#include <BRepClass3d_SolidClassifier.hxx>
#include <Precision.hxx>
using namespace std;
//=============================================================================
/*!
* constructor:

14
src/GEOMImpl/GEOMImpl_IShapesOperations.hxx
View File

@ -54,20 +54,20 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
Standard_EXPORT Handle(GEOM_Object) MakeEdge (Handle(GEOM_Object) thePoint1,
Handle(GEOM_Object) thePoint2);
Standard_EXPORT Handle(GEOM_Object) MakeWire (list<Handle(GEOM_Object)> theEdgesAndWires);
Standard_EXPORT Handle(GEOM_Object) MakeWire (std::list<Handle(GEOM_Object)> theEdgesAndWires);
Standard_EXPORT Handle(GEOM_Object) MakeFace (Handle(GEOM_Object) theWire, const bool isPlanarWanted);
Standard_EXPORT Handle(GEOM_Object) MakeFaceWires (list<Handle(GEOM_Object)> theWires,
Standard_EXPORT Handle(GEOM_Object) MakeFaceWires (std::list<Handle(GEOM_Object)> theWires,
const bool isPlanarWanted);
Standard_EXPORT Handle(GEOM_Object) MakeShell (list<Handle(GEOM_Object)> theShapes);
Standard_EXPORT Handle(GEOM_Object) MakeShell (std::list<Handle(GEOM_Object)> theShapes);
Standard_EXPORT Handle(GEOM_Object) MakeSolidShell (Handle(GEOM_Object) theShell);
Standard_EXPORT Handle(GEOM_Object) MakeSolidShells (list<Handle(GEOM_Object)> theShells);
Standard_EXPORT Handle(GEOM_Object) MakeSolidShells (std::list<Handle(GEOM_Object)> theShells);
Standard_EXPORT Handle(GEOM_Object) MakeCompound (list<Handle(GEOM_Object)> theShapes);
Standard_EXPORT Handle(GEOM_Object) MakeCompound (std::list<Handle(GEOM_Object)> theShapes);
Standard_EXPORT Handle(GEOM_Object) MakeGlueFaces (Handle(GEOM_Object) theShape,
const Standard_Real theTolerance,
@ -78,7 +78,7 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
Standard_EXPORT Handle(GEOM_Object) MakeGlueFacesByList (Handle(GEOM_Object) theShape,
const Standard_Real theTolerance,
list<Handle(GEOM_Object)> theFaces,
std::list<Handle(GEOM_Object)> theFaces,
const Standard_Boolean doKeepNonSolids);
Standard_EXPORT Handle(TColStd_HSequenceOfTransient) MakeExplode (Handle(GEOM_Object) theShape,
@ -285,7 +285,7 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
Standard_EXPORT static bool CheckTriangulation (const TopoDS_Shape& theShape);
private:
Handle(GEOM_Object) MakeShape (list<Handle(GEOM_Object)> theShapes,
Handle(GEOM_Object) MakeShape (std::list<Handle(GEOM_Object)> theShapes,
const Standard_Integer theObjectType,
const Standard_Integer theFunctionType,
const TCollection_AsciiString& theMethodName);

5
src/GEOM_I/GEOM_IOperations_i.cc
View File

@ -18,14 +18,13 @@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include "GEOM_IOperations_i.hh"
#include "GEOM_Engine.hxx"
#include "GEOM_Object.hxx"
#include "GEOM_IOperations.hxx"
#include "utilities.h"
#include "OpUtil.hxx"
#include "Utils_ExceptHandlers.hxx"
#include <Standard_Stream.hxx>
#include <TCollection_AsciiString.hxx>
#include <TDF_Tool.hxx>

5
src/GEOM_I/GEOM_IOperations_i.hh
View File

@ -17,16 +17,17 @@
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#ifndef _GEOM_IOperations_i_HeaderFile
#define _GEOM_IOperations_i_HeaderFile
#include "GEOM_GEOM_I.hxx"
#include "GEOMImpl_Gen.hxx"
#include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(GEOM_Gen)
#include "SALOME_GenericObj_i.hh"
#include "GEOM_IOperations.hxx"
#include "GEOM_Object_i.hh"
#include "GEOM_Object.hxx"

12
src/GEOM_I/GEOM_IShapesOperations_i.cc
View File

@ -17,7 +17,8 @@
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include <Standard_Stream.hxx>
#include "GEOM_Object.hxx"
#include "GEOMImpl_IShapesOperations.hxx"
#include "GEOM_IShapesOperations_i.hh"
@ -25,12 +26,15 @@
#include "OpUtil.hxx"
#include "Utils_ExceptHandlers.hxx"
#include "GEOM_Engine.hxx"
#include "GEOM_Object.hxx"
#include <TColStd_HSequenceOfTransient.hxx>
#include <TColStd_HArray1OfInteger.hxx>
#include <list>
using namespace std;
//#define GetObjectA GetObject
//=============================================================================
/*!
* constructor:

5
src/GEOM_I/GEOM_IShapesOperations_i.hh
View File

@ -21,13 +21,12 @@
#ifndef _GEOM_IShapesOperations_i_HeaderFile
#define _GEOM_IShapesOperations_i_HeaderFile
#include "GEOMImpl_Gen.hxx"
#include "GEOM_GEOM_I.hxx"
#include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(GEOM_Gen)
#include "GEOM_IOperations_i.hh"
#include "GEOM_Object_i.hh"
#include "GEOMImpl_Gen.hxx"
#include "GEOMImpl_IShapesOperations.hxx"

4
src/GEOM_I/GEOM_Object_i.cc
View File

@ -17,10 +17,7 @@
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include <Standard_OStream.hxx>
#include <GEOM_Object_i.hh>
//#include <GEOM_Gen_i.hh>
#include <GEOM_ISubShape.hxx>
#include <GEOMImpl_Types.hxx>
@ -34,6 +31,7 @@
#include <TDF_Label.hxx>
#include <TCollection_AsciiString.hxx>
#include <Standard_OStream.hxx>
#include <BRepTools_ShapeSet.hxx>
#include <BRepTools.hxx>
#include <TopAbs.hxx>

7
src/GEOM_I/GEOM_Object_i.hh
View File

@ -23,18 +23,17 @@
#include "GEOM_GEOM_I.hxx"
#include "GEOMImpl_Gen.hxx"
#include <SALOMEconfig.h>
#include CORBA_CLIENT_HEADER(SALOMEDS)
#include CORBA_SERVER_HEADER(GEOM_Gen)
#include CORBA_CLIENT_HEADER(SALOMEDS)
#include "SALOME_GenericObj_i.hh"
#include "GEOMImpl_Gen.hxx"
#include "GEOM_Object.hxx"
#include <TopoDS_Shape.hxx>
class GEOM_I_EXPORT GEOM_Object_i : public virtual POA_GEOM::GEOM_Object, public virtual SALOME::GenericObj_i
{
public:

3
src/GroupGUI/GroupGUI_GroupDlg.cxx
View File

@ -46,6 +46,9 @@
#include <TColStd_IndexedMapOfInteger.hxx>
#include <TColStd_MapOfInteger.hxx>
#include <string>
using namespace std;
GroupGUI_GroupDlg::GroupGUI_GroupDlg(Mode mode, GeometryGUI* theGeometryGUI, QWidget* parent)
:GEOMBase_Skeleton( theGeometryGUI, parent, "GroupGUI_GroupDlg", false,

3
src/OBJECT/GEOM_DeviceActor.h
View File

@ -1,6 +1,7 @@
#ifndef GEOM_DEVICEACTOR_H
#define GEOM_DEVICEACTOR_H
#include "GEOM_OBJECT_defs.hxx"
#include "GEOM_SmartPtr.h"
class vtkPoints;
@ -24,7 +25,7 @@ class vtkRenderer;
#include <vtkObject.h>
class VTK_EXPORT GEOM_DeviceActor: public vtkObject
class GEOM_OBJECT_EXPORT GEOM_DeviceActor: public vtkObject
{
public:
vtkTypeMacro(GEOM_DeviceActor,vtkObject);

3
src/OBJECT/GEOM_EdgeSource.h
View File

@ -1,6 +1,7 @@
#ifndef GEOM_EDGESOURCE_H
#define GEOM_EDGESOURCE_H
#include "GEOM_OBJECT_defs.hxx"
#include "GEOM_DeviceActor.h"
#include <TopoDS_Edge.hxx>
@ -11,7 +12,7 @@ typedef NCollection_Set<TopoDS_Edge> TEdgeSet;
#include <vtkPolyDataSource.h>
class VTK_EXPORT GEOM_EdgeSource: public vtkPolyDataSource
class GEOM_OBJECT_EXPORT GEOM_EdgeSource: public vtkPolyDataSource
{
public:
vtkTypeMacro(GEOM_EdgeSource,vtkPolyDataSource);

3
src/OBJECT/GEOM_FaceSource.h
View File

@ -1,6 +1,7 @@
#ifndef GEOM_FACESOURCE_H
#define GEOM_FACESOURCE_H
#include "GEOM_OBJECT_defs.hxx"
#include "GEOM_DeviceActor.h"
#include <gp_Pnt.hxx>
@ -15,7 +16,7 @@ class GEOM_FaceSource;
typedef GEOM_SmartPtr<GEOM_FaceSource> PFaceSource;
class VTK_EXPORT GEOM_FaceSource: public vtkPolyDataSource
class GEOM_OBJECT_EXPORT GEOM_FaceSource: public vtkPolyDataSource
{
public:
vtkTypeMacro(GEOM_FaceSource,vtkPolyDataSource);

20
src/OBJECT/GEOM_OBJECT_defs.hxx
View File

@ -27,21 +27,13 @@
#define _GEOM_OBJECT_defs_HXX_
#ifdef WNT
#if defined OBJECT_EXPORTS
#if defined WIN32
#define GEOM_OBJECT_EXPORT __declspec( dllexport )
#else
#define GEOM_OBJECT_EXPORT
#endif
#else
#if defined WIN32
#define GEOM_OBJECT_EXPORT __declspec( dllimport )
#else
#define GEOM_OBJECT_EXPORT
#endif
#endif
# if defined GEOM_OBJECT_EXPORTS
# define GEOM_OBJECT_EXPORT __declspec( dllexport )
# else
# define GEOM_OBJECT_EXPORT __declspec( dllimport )
# endif
#else
#define GEOM_OBJECT_EXPORT
# define GEOM_OBJECT_EXPORT
#endif
#endif

3
src/OBJECT/GEOM_ShadingFace.h
View File

@ -1,10 +1,11 @@
#ifndef GEOM_SHADINGFACE_H
#define GEOM_SHADINGFACE_H
#include "GEOM_OBJECT_defs.hxx"
#include "GEOM_FaceSource.h"
class VTK_EXPORT GEOM_ShadingFace: public GEOM_FaceSource
class GEOM_OBJECT_EXPORT GEOM_ShadingFace: public GEOM_FaceSource
{
public:
vtkTypeMacro(GEOM_ShadingFace,GEOM_FaceSource);

3
src/OBJECT/GEOM_VertexSource.h
View File

@ -1,6 +1,7 @@
#ifndef GEOM_VERTEXSOURCE_H
#define GEOM_VERTEXSOURCE_H
#include "GEOM_OBJECT_defs.hxx"
#include "GEOM_DeviceActor.h"
#include <TopoDS_Vertex.hxx>
@ -11,7 +12,7 @@ typedef NCollection_Set<TopoDS_Vertex> TVertexSet;
#include <vtkPolyDataSource.h>
class VTK_EXPORT GEOM_VertexSource: public vtkPolyDataSource
class GEOM_OBJECT_EXPORT GEOM_VertexSource: public vtkPolyDataSource
{
public:
vtkTypeMacro(GEOM_VertexSource,vtkPolyDataSource);

3
src/OBJECT/GEOM_WireframeFace.h
View File

@ -1,6 +1,7 @@
#ifndef GEOM_WIREFRAME_FACE_H
#define GEOM_WIREFRAME_FACE_H
#include "GEOM_OBJECT_defs.hxx"
#include "GEOM_FaceSource.h"
#include <GeomAbs_IsoType.hxx>
@ -9,7 +10,7 @@
#include <vtkPolyDataSource.h>
class VTK_EXPORT GEOM_WireframeFace: public GEOM_FaceSource
class GEOM_OBJECT_EXPORT GEOM_WireframeFace: public GEOM_FaceSource
{
public:
vtkTypeMacro(GEOM_WireframeFace,GEOM_FaceSource);