From: rnv Date: Thu, 31 Oct 2013 11:41:08 +0000 (+0000) Subject: Porting HEXABLOCK module on WIN32 platform. X-Git-Tag: V7_3_0a1~13 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=624082b6806f6695a1e2f31ba595534e464f0f91;p=modules%2Fhexablock.git Porting HEXABLOCK module on WIN32 platform. --- diff --git a/src/HEXABLOCK/CMakeLists.txt b/src/HEXABLOCK/CMakeLists.txt index 8340a91..a39a1f9 100644 --- a/src/HEXABLOCK/CMakeLists.txt +++ b/src/HEXABLOCK/CMakeLists.txt @@ -152,6 +152,7 @@ SET(HEXABLOCKEngine_SOURCES test_unit.hxx test_hexa6.cxx HexKas_functions.cxx + Hex_defines.hxx ) # --- rules --- diff --git a/src/HEXABLOCK/Hex.hxx b/src/HEXABLOCK/Hex.hxx index 3d5b7c7..7cdbc2a 100755 --- a/src/HEXABLOCK/Hex.hxx +++ b/src/HEXABLOCK/Hex.hxx @@ -24,14 +24,20 @@ #ifndef __HEX_H #define __HEX_H +#include "Hex_defines.hxx" + #include "hexa_base.hxx" +#if defined WIN32 +#pragma warning ( disable: 4251 ) +#endif + BEGIN_NAMESPACE_HEXA class Hex; -Hex* hex_instance (); +HEXABLOCKENGINE_EXPORT Hex* hex_instance (); -class Hex +class HEXABLOCKENGINE_EXPORT Hex { public: static Hex* getInstance (); @@ -69,7 +75,7 @@ private: #endif // not SWIG }; -void what (); +HEXABLOCKENGINE_EXPORT void what (); END_NAMESPACE_HEXA #endif diff --git a/src/HEXABLOCK/HexAnaQuads.hxx b/src/HEXABLOCK/HexAnaQuads.hxx index 54eac0a..854afd7 100755 --- a/src/HEXABLOCK/HexAnaQuads.hxx +++ b/src/HEXABLOCK/HexAnaQuads.hxx @@ -22,12 +22,13 @@ #ifndef __ANA_QUADS_H #define __ANA_QUADS_H +#include "Hex_defines.hxx" #include "HexQuad.hxx" // #include "HexEdge.hxx" BEGIN_NAMESPACE_HEXA -class AnaQuads +class HEXABLOCKENGINE_EXPORT AnaQuads { public: AnaQuads (Quad* q1, Quad* q2, Quad* q3=NULL, Quad* q4=NULL, Quad* q5=NULL); diff --git a/src/HEXABLOCK/HexAssoEdge.hxx b/src/HEXABLOCK/HexAssoEdge.hxx index 445eefa..e6813fd 100644 --- a/src/HEXABLOCK/HexAssoEdge.hxx +++ b/src/HEXABLOCK/HexAssoEdge.hxx @@ -4,6 +4,7 @@ #ifndef __ASSO_EDGE_H_ #define __ASSO_EDGE_H_ +#include "Hex_defines.hxx" #include "HexEdgeShape.hxx" #include @@ -11,7 +12,7 @@ BEGIN_NAMESPACE_HEXA -class AssoEdge +class HEXABLOCKENGINE_EXPORT AssoEdge { public : AssoEdge (EdgeShape* shape, double deb, double fin); diff --git a/src/HEXABLOCK/HexBiCylinder.hxx b/src/HEXABLOCK/HexBiCylinder.hxx index 6da6a4e..3033bf7 100755 --- a/src/HEXABLOCK/HexBiCylinder.hxx +++ b/src/HEXABLOCK/HexBiCylinder.hxx @@ -23,12 +23,14 @@ #ifndef __BI_CYLINDER_H_ #define __BI_CYLINDER_H_ +#include "Hex_defines.hxx" + #include "HexElements.hxx" #include BEGIN_NAMESPACE_HEXA -class BiCylinder : public Elements +class HEXABLOCKENGINE_EXPORT BiCylinder : public Elements { public: BiCylinder (Document* doc); diff --git a/src/HEXABLOCK/HexBiCylinderShape.hxx b/src/HEXABLOCK/HexBiCylinderShape.hxx index 3325973..f8dcb4e 100755 --- a/src/HEXABLOCK/HexBiCylinderShape.hxx +++ b/src/HEXABLOCK/HexBiCylinderShape.hxx @@ -23,11 +23,12 @@ #ifndef __BI_CYLINDER_SHAPE_HXX_ #define __BI_CYLINDER_SHAPE_HXX_ +#include "Hex_defines.hxx" #include "HexGlobale.hxx" BEGIN_NAMESPACE_HEXA -class BiCylinderShape +class HEXABLOCKENGINE_EXPORT BiCylinderShape { public : BiCylinderShape (Document* doc); diff --git a/src/HEXABLOCK/HexCloner.hxx b/src/HEXABLOCK/HexCloner.hxx index 7370bd8..1d32a42 100755 --- a/src/HEXABLOCK/HexCloner.hxx +++ b/src/HEXABLOCK/HexCloner.hxx @@ -22,13 +22,14 @@ #ifndef __CLONER_H #define __CLONER_H +#include "Hex_defines.hxx" #include "hexa_base.hxx" #include BEGIN_NAMESPACE_HEXA -class Cloner +class HEXABLOCKENGINE_EXPORT Cloner { public: Cloner (Matrix* mat); diff --git a/src/HEXABLOCK/HexCramer.hxx b/src/HEXABLOCK/HexCramer.hxx index 6546b7c..84d8cac 100755 --- a/src/HEXABLOCK/HexCramer.hxx +++ b/src/HEXABLOCK/HexCramer.hxx @@ -22,12 +22,13 @@ #ifndef __CRAMER_H_ #define __CRAMER_H_ +#include "Hex_defines.hxx" #include "hexa_base.hxx" // #include BEGIN_NAMESPACE_HEXA -class Cramer +class HEXABLOCKENGINE_EXPORT Cramer { public: Cramer (int size); diff --git a/src/HEXABLOCK/HexCrossElements.hxx b/src/HEXABLOCK/HexCrossElements.hxx index 5160cad..df152e4 100755 --- a/src/HEXABLOCK/HexCrossElements.hxx +++ b/src/HEXABLOCK/HexCrossElements.hxx @@ -22,6 +22,7 @@ #ifndef __CROSS_ELEMENTS_H #define __CROSS_ELEMENTS_H +#include "Hex_defines.hxx" #include "HexElements.hxx" BEGIN_NAMESPACE_HEXA @@ -33,7 +34,7 @@ enum { MiddleSlice1=NbrSlices1/2}; enum { Cyl1=CylSmall, Cyl2=CylBig }; enum { NO_CYL=-1, NO_PIPE=0, IS_HERE=1 }; -class CrossElements : public Elements +class HEXABLOCKENGINE_EXPORT CrossElements : public Elements { public: CrossElements (Document* doc, EnumGrid type); diff --git a/src/HEXABLOCK/HexCrossElements_build.cxx b/src/HEXABLOCK/HexCrossElements_build.cxx index 741034e..6b4fda5 100755 --- a/src/HEXABLOCK/HexCrossElements_build.cxx +++ b/src/HEXABLOCK/HexCrossElements_build.cxx @@ -286,7 +286,7 @@ int CrossElements::crossCylinders (Cylinder* lun, Cylinder* lautre, bool fill) return HERR; } - cross_center = cross_cyl2->interCylinder (cross_cyl1, at_left, at_right); + cross_center = cross_cyl2->interCylinder(cross_cyl1, at_left, at_right); if (cross_center==NULL) { setError (HERR); diff --git a/src/HEXABLOCK/HexCylinder.cxx b/src/HEXABLOCK/HexCylinder.cxx index df76cb2..0211f7a 100644 --- a/src/HEXABLOCK/HexCylinder.cxx +++ b/src/HEXABLOCK/HexCylinder.cxx @@ -100,7 +100,7 @@ double norme (double px, double py, double pz) /// dxy = xv1*yv2 - yv1*xv2 /// // ======================================================== interCylinder -Vertex* Cylinder::interCylinder (Cylinder* small, bool& left, bool& right) +Vertex* Cylinder::interCylinder(Cylinder* small, bool& left, bool& right) { Real3 orig; int ier = interCylinder (small, left, right, orig); diff --git a/src/HEXABLOCK/HexCylinder.hxx b/src/HEXABLOCK/HexCylinder.hxx index 0d1894f..6ed0ac7 100755 --- a/src/HEXABLOCK/HexCylinder.hxx +++ b/src/HEXABLOCK/HexCylinder.hxx @@ -22,11 +22,12 @@ #ifndef __CYLINDER_H_ #define __CYLINDER_H_ +#include "Hex_defines.hxx" #include "HexEltBase.hxx" BEGIN_NAMESPACE_HEXA -class Cylinder : public EltBase +class HEXABLOCKENGINE_EXPORT Cylinder : public EltBase { public : Vertex* getBase () { return c_base; } @@ -34,12 +35,11 @@ public : double getRadius () { return c_radius; } double getHeight () { return c_height; } -public : Cylinder (Vertex* b, Vector* v, double r, double h); virtual ~Cylinder () {} - int interCylinder (Cylinder* small, bool& left, bool& right, double* sol); - Vertex* interCylinder (Cylinder* other, bool& left, bool& right); + int interCylinder(Cylinder* s, bool& left, bool& right, double* sol); + Vertex* interCylinder(Cylinder* other, bool& left, bool& right); void saveXml (XmlWriter* xml); virtual double getInternalRadius () { return 0; } diff --git a/src/HEXABLOCK/HexDocument.hxx b/src/HEXABLOCK/HexDocument.hxx index eed53b4..a6c1a8e 100755 --- a/src/HEXABLOCK/HexDocument.hxx +++ b/src/HEXABLOCK/HexDocument.hxx @@ -23,6 +23,7 @@ #ifndef __DOCUMENT_H_ #define __DOCUMENT_H_ +#include "Hex_defines.hxx" #include "HexEltBase.hxx" @@ -30,7 +31,7 @@ BEGIN_NAMESPACE_HEXA class NewShape; -class Document : public EltBase +class HEXABLOCKENGINE_EXPORT Document : public EltBase { // Fonctions utilisateur public : diff --git a/src/HEXABLOCK/HexDocument_Xml.cxx b/src/HEXABLOCK/HexDocument_Xml.cxx index 82e3dc7..39cfb4b 100755 --- a/src/HEXABLOCK/HexDocument_Xml.cxx +++ b/src/HEXABLOCK/HexDocument_Xml.cxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "HexDocument.hxx" -#include // Pour basename +#include #include // Pour atoi et atof #include "Hex.hxx" @@ -121,7 +121,7 @@ int Document::loadXml (cpchar ficname) { XmlTree xml(""); string filename = ficname; - el_name = basename ((pchar)ficname); + el_name = Kernel_Utils::GetBaseName ((pchar)ficname); static const int NbExt = 3; static cpchar t_ext [NbExt] = { ".xml", ".XML", ".Xml" }; diff --git a/src/HEXABLOCK/HexDumpStudy.cxx b/src/HEXABLOCK/HexDumpStudy.cxx index d0093d5..21445b6 100755 --- a/src/HEXABLOCK/HexDumpStudy.cxx +++ b/src/HEXABLOCK/HexDumpStudy.cxx @@ -90,7 +90,7 @@ bool DumpStudy::start (cpchar obj, cpchar method, bool raz) // =================================================== operator << (int) DumpStudy& DumpStudy::operator << (int val) { - if (not is_open) + if (! is_open) return *this; char valeur [20]; @@ -102,7 +102,7 @@ DumpStudy& DumpStudy::operator << (int val) // =================================================== operator << (double) DumpStudy& DumpStudy::operator << (double val) { - if (not is_open) + if (! is_open) return *this; char valeur [20]; @@ -114,7 +114,7 @@ DumpStudy& DumpStudy::operator << (double val) // =================================================== operator << (cpchar) DumpStudy& DumpStudy::operator << (cpchar val) { - if (not is_open) + if (! is_open) return *this; string valeur ("'"); @@ -127,7 +127,7 @@ DumpStudy& DumpStudy::operator << (cpchar val) // =================================================== operator << (elt) DumpStudy& DumpStudy::operator << (EltBase* elt) { - if (not is_open) + if (! is_open) return *this; cpchar name = findName (elt); @@ -137,7 +137,7 @@ DumpStudy& DumpStudy::operator << (EltBase* elt) // =================================================== operator << (Quads) DumpStudy& DumpStudy::operator << (Quads& tab) { - if (not is_open) + if (! is_open) return *this; TabElts& tabelt = (TabElts&) tab; @@ -147,7 +147,7 @@ DumpStudy& DumpStudy::operator << (Quads& tab) // =================================================== operator << (Edges) DumpStudy& DumpStudy::operator << (Edges& tab) { - if (not is_open) + if (! is_open) return *this; TabElts& tabelt = (TabElts&) tab; @@ -157,7 +157,7 @@ DumpStudy& DumpStudy::operator << (Edges& tab) // =================================================== operator << (Hexas) DumpStudy& DumpStudy::operator << (Hexas& tab) { - if (not is_open) + if (!is_open) return *this; TabElts& tabelt = (TabElts&) tab; @@ -167,7 +167,7 @@ DumpStudy& DumpStudy::operator << (Hexas& tab) // =================================================== operator << (Reals) DumpStudy& DumpStudy::operator << (RealVector& tab) { - if (not is_open) + if (! is_open) return *this; char name [20], valeur [30]; diff --git a/src/HEXABLOCK/HexDumpStudy.hxx b/src/HEXABLOCK/HexDumpStudy.hxx index bd58813..f0e6a54 100755 --- a/src/HEXABLOCK/HexDumpStudy.hxx +++ b/src/HEXABLOCK/HexDumpStudy.hxx @@ -23,9 +23,15 @@ #ifndef __DUMP_STUDY_H_ #define __DUMP_STUDY_H_ +#include "Hex_defines.hxx" #include "hexa_base.hxx" #include +#if defined WIN32 +#pragma warning ( disable: 4251 ) +#endif + + BEGIN_NAMESPACE_HEXA @@ -38,7 +44,7 @@ BEGIN_NAMESPACE_HEXA #define DumpRestore el_root->glob->dump.restore (actif) class Witness; -class DumpStudy +class HEXABLOCKENGINE_EXPORT DumpStudy { public : DumpStudy (); diff --git a/src/HEXABLOCK/HexEdge.hxx b/src/HEXABLOCK/HexEdge.hxx index 57dd04b..3e41f9d 100755 --- a/src/HEXABLOCK/HexEdge.hxx +++ b/src/HEXABLOCK/HexEdge.hxx @@ -22,11 +22,12 @@ #ifndef __EDGE_H #define __EDGE_H +#include "Hex_defines.hxx" #include "HexVertex.hxx" BEGIN_NAMESPACE_HEXA -class Edge : public EltBase +class HEXABLOCKENGINE_EXPORT Edge : public EltBase { public: virtual Vertex* getVertex (int nro); diff --git a/src/HEXABLOCK/HexEdgeShape.hxx b/src/HEXABLOCK/HexEdgeShape.hxx index 7face9f..673d544 100644 --- a/src/HEXABLOCK/HexEdgeShape.hxx +++ b/src/HEXABLOCK/HexEdgeShape.hxx @@ -4,11 +4,12 @@ #ifndef __LIBE_SHAPE_H_ #define __LIBE_SHAPE_H_ +#include "Hex_defines.hxx" #include "HexSubShape.hxx" BEGIN_NAMESPACE_HEXA -class EdgeShape : public SubShape +class HEXABLOCKENGINE_EXPORT EdgeShape : public SubShape { public : EdgeShape (NewShape* dad, int id); diff --git a/src/HEXABLOCK/HexElements.hxx b/src/HEXABLOCK/HexElements.hxx index df75ba8..518a71b 100755 --- a/src/HEXABLOCK/HexElements.hxx +++ b/src/HEXABLOCK/HexElements.hxx @@ -23,6 +23,7 @@ #ifndef __ELEMENTS_H #define __ELEMENTS_H +#include "Hex_defines.hxx" #include "HexEltBase.hxx" #include "HexMatrix.hxx" @@ -30,7 +31,7 @@ BEGIN_NAMESPACE_HEXA -class Elements : public EltBase +class HEXABLOCKENGINE_EXPORT Elements : public EltBase { public: virtual Hexa* getHexa (int nro); diff --git a/src/HEXABLOCK/HexElements_ter.cxx b/src/HEXABLOCK/HexElements_ter.cxx index 4cb09df..570b12f 100755 --- a/src/HEXABLOCK/HexElements_ter.cxx +++ b/src/HEXABLOCK/HexElements_ter.cxx @@ -356,7 +356,7 @@ void Elements::assoCircle (double* center, Edge* ed1, Edge* ed2, NewShape* geom) double rayon = calc_norme (oa); int subid = geom->addCircle (center, rayon, normal, oa); - const double alpha = atan (sqrt(2)/2)/M_PI; // angle proche de 70.528 degres + const double alpha = atan (sqrt(2.)/2)/M_PI; // angle proche de 70.528 degres // asso1->setBounds (0, alpha); // asso2->setBounds (0.5, alpha + 0.5); diff --git a/src/HEXABLOCK/HexEltBase.hxx b/src/HEXABLOCK/HexEltBase.hxx index 1e185f4..81658d4 100755 --- a/src/HEXABLOCK/HexEltBase.hxx +++ b/src/HEXABLOCK/HexEltBase.hxx @@ -23,6 +23,7 @@ #ifndef __ELT_BASE_H #define __ELT_BASE_H +#include "Hex_defines.hxx" #include "hexa_base.hxx" #include @@ -34,9 +35,13 @@ #define BadElement(elt) (elt)==NULL || (elt)->isBad() #define EltIsValid(elt) (elt)!=NULL && (elt)->isValid() +#if defined WIN32 +#pragma warning ( disable: 4251 ) +#endif + BEGIN_NAMESPACE_HEXA -class EltBase +class HEXABLOCKENGINE_EXPORT EltBase { public : virtual int countHexa () { return 0; } diff --git a/src/HEXABLOCK/HexFaceShape.hxx b/src/HEXABLOCK/HexFaceShape.hxx index 5489e74..ca9c17c 100644 --- a/src/HEXABLOCK/HexFaceShape.hxx +++ b/src/HEXABLOCK/HexFaceShape.hxx @@ -4,11 +4,12 @@ #ifndef __FACE_SHAPE_H_ #define __FACE_SHAPE_H_ +#include "Hex_defines.hxx" #include "HexSubShape.hxx" BEGIN_NAMESPACE_HEXA -class FaceShape : public SubShape +class HEXABLOCKENGINE_EXPORT FaceShape : public SubShape { public : FaceShape (NewShape* dad, int id); diff --git a/src/HEXABLOCK/HexGlobale.hxx b/src/HEXABLOCK/HexGlobale.hxx index ac6d696..1a3016c 100755 --- a/src/HEXABLOCK/HexGlobale.hxx +++ b/src/HEXABLOCK/HexGlobale.hxx @@ -24,6 +24,7 @@ #ifndef _HEX_GLOBALE_H #define _HEX_GLOBALE_H +#include "Hex_defines.hxx" #include "hexa_base.hxx" #include "HexDumpStudy.hxx" #include "HexWitness.hxx" @@ -51,7 +52,7 @@ BEGIN_NAMESPACE_HEXA -class Globale +class HEXABLOCKENGINE_EXPORT Globale { public : static Globale* getInstance (); diff --git a/src/HEXABLOCK/HexGroup.hxx b/src/HEXABLOCK/HexGroup.hxx index a9946f3..5f7b756 100755 --- a/src/HEXABLOCK/HexGroup.hxx +++ b/src/HEXABLOCK/HexGroup.hxx @@ -23,11 +23,12 @@ #ifndef __GROUP_H #define __GROUP_H +#include "Hex_defines.hxx" #include "HexEltBase.hxx" BEGIN_NAMESPACE_HEXA -class Group : public EltBase +class HEXABLOCKENGINE_EXPORT Group : public EltBase { public : int addElement (EltBase* elt); diff --git a/src/HEXABLOCK/HexHexa.hxx b/src/HEXABLOCK/HexHexa.hxx index 5b3895f..0d7a0a0 100755 --- a/src/HEXABLOCK/HexHexa.hxx +++ b/src/HEXABLOCK/HexHexa.hxx @@ -42,6 +42,7 @@ #ifndef __HEX_HEXA_H_ #define __HEX_HEXA_H_ +#include "Hex_defines.hxx" #include "HexEltBase.hxx" #include "HexQuad.hxx" @@ -50,7 +51,7 @@ BEGIN_NAMESPACE_HEXA -class Hexa : public EltBase +class HEXABLOCKENGINE_EXPORT Hexa : public EltBase { public: virtual Quad* getQuad (int nro); diff --git a/src/HEXABLOCK/HexKas_functions.hxx b/src/HEXABLOCK/HexKas_functions.hxx index a5c4859..def53f0 100755 --- a/src/HEXABLOCK/HexKas_functions.hxx +++ b/src/HEXABLOCK/HexKas_functions.hxx @@ -25,25 +25,26 @@ class gp_Pnt; +#include "Hex_defines.hxx" #include "HexGlobale.hxx" BEGIN_NAMESPACE_HEXA -int geom_create_cylcyl (double* borig, double* bnorm, double* bbase, - double bray, double bhaut, - double* sorig, double* snorm, double* sbase, - double sray, double shaut); -int geom_asso_cylcyl (Edge* edge); +int HEXABLOCKENGINE_EXPORT geom_create_cylcyl (double* borig, double* bnorm, double* bbase, + double bray, double bhaut, + double* sorig, double* snorm, double* sbase, + double sray, double shaut); +int HEXABLOCKENGINE_EXPORT geom_asso_cylcyl (Edge* edge); -bool same_coords (gp_Pnt& pa, gp_Pnt& pb, double epsil2=1e-6); -void save_brep (cpchar nom, string brep, int& nro); -void clean_brep (string& brep); +bool HEXABLOCKENGINE_EXPORT same_coords (gp_Pnt& pa, gp_Pnt& pb, double epsil2=1e-6); +void HEXABLOCKENGINE_EXPORT save_brep (cpchar nom, string brep, int& nro); +void HEXABLOCKENGINE_EXPORT clean_brep (string& brep); -void geom_make_brep (TopoDS_Shape& shape, string& brep); -int geom_brep2point (rcstring brep, double& px, double& py, double& pz); -int geom_brep2shape (rcstring brep, TopoDS_Shape& shape); +void HEXABLOCKENGINE_EXPORT geom_make_brep (TopoDS_Shape& shape, string& brep); +int HEXABLOCKENGINE_EXPORT geom_brep2point (rcstring brep, double& px, double& py, double& pz); +int HEXABLOCKENGINE_EXPORT geom_brep2shape (rcstring brep, TopoDS_Shape& shape); -TopoDS_Shape geom_brep2shape (rcstring brep); +TopoDS_Shape HEXABLOCKENGINE_EXPORT geom_brep2shape (rcstring brep); END_NAMESPACE_HEXA #endif diff --git a/src/HEXABLOCK/HexLaw.hxx b/src/HEXABLOCK/HexLaw.hxx index ceb9852..86a9ed4 100755 --- a/src/HEXABLOCK/HexLaw.hxx +++ b/src/HEXABLOCK/HexLaw.hxx @@ -22,12 +22,13 @@ #ifndef __LAW_H_ #define __LAW_H_ +#include "Hex_defines.hxx" #include "HexEltBase.hxx" #include "HexXmlWriter.hxx" BEGIN_NAMESPACE_HEXA -class Law : public EltBase +class HEXABLOCKENGINE_EXPORT Law : public EltBase { public: const char* getName () { return law_name.c_str() ; } diff --git a/src/HEXABLOCK/HexMatrix.hxx b/src/HEXABLOCK/HexMatrix.hxx index 255d008..5832873 100755 --- a/src/HEXABLOCK/HexMatrix.hxx +++ b/src/HEXABLOCK/HexMatrix.hxx @@ -23,6 +23,7 @@ #ifndef __MATRIX_H #define __MATRIX_H +#include "Hex_defines.hxx" #include "HexVertex.hxx" #include "HexVector.hxx" @@ -30,7 +31,7 @@ BEGIN_NAMESPACE_HEXA -class Matrix +class HEXABLOCKENGINE_EXPORT Matrix { public: Matrix (); diff --git a/src/HEXABLOCK/HexNewShape.hxx b/src/HEXABLOCK/HexNewShape.hxx index a791ca1..3c1a17e 100644 --- a/src/HEXABLOCK/HexNewShape.hxx +++ b/src/HEXABLOCK/HexNewShape.hxx @@ -4,6 +4,7 @@ #ifndef __NEW_SHAPE_H_ #define __NEW_SHAPE_H_ +#include "Hex_defines.hxx" #include "HexEltBase.hxx" #ifndef SWIG @@ -15,7 +16,7 @@ BEGIN_NAMESPACE_HEXA -class NewShape : public EltBase +class HEXABLOCKENGINE_EXPORT NewShape : public EltBase { public : // for TUI virtual int countVertex () { return tab_vertex.size (); } diff --git a/src/HEXABLOCK/HexPipe.hxx b/src/HEXABLOCK/HexPipe.hxx index 6c15ae2..c6e8922 100755 --- a/src/HEXABLOCK/HexPipe.hxx +++ b/src/HEXABLOCK/HexPipe.hxx @@ -22,11 +22,12 @@ #ifndef __PIPE_H #define __PIPE_H +#include "Hex_defines.hxx" #include "HexCylinder.hxx" BEGIN_NAMESPACE_HEXA -class Pipe : public Cylinder +class HEXABLOCKENGINE_EXPORT Pipe : public Cylinder { public : virtual double getInternalRadius () { return c_int_radius; } diff --git a/src/HEXABLOCK/HexPropagation.hxx b/src/HEXABLOCK/HexPropagation.hxx index eb816a7..2b8838f 100755 --- a/src/HEXABLOCK/HexPropagation.hxx +++ b/src/HEXABLOCK/HexPropagation.hxx @@ -22,6 +22,7 @@ #ifndef __PROPAGATION_H #define __PROPAGATION_H +#include "Hex_defines.hxx" #include "HexEltBase.hxx" #include "HexDocument.hxx" @@ -32,7 +33,7 @@ BEGIN_NAMESPACE_HEXA -class Propagation : public EltBase +class HEXABLOCKENGINE_EXPORT Propagation : public EltBase { public: const Edges& getEdges () { return prop_edges; } diff --git a/src/HEXABLOCK/HexQuad.hxx b/src/HEXABLOCK/HexQuad.hxx index 65d045a..6ebc426 100755 --- a/src/HEXABLOCK/HexQuad.hxx +++ b/src/HEXABLOCK/HexQuad.hxx @@ -22,12 +22,13 @@ #ifndef __QUAD_H #define __QUAD_H +#include "Hex_defines.hxx" #include "HexEdge.hxx" BEGIN_NAMESPACE_HEXA #ifndef SWIG -struct StrOrient +struct HEXABLOCKENGINE_EXPORT StrOrient { Vertex* v11; // 1er sommet 1er quad Vertex* v12; // 2eme @@ -44,7 +45,7 @@ StrOrient ( StrOrient* s) }; #endif -class Quad : public EltBase +class HEXABLOCKENGINE_EXPORT Quad : public EltBase { public: virtual Edge* getEdge (int nro); diff --git a/src/HEXABLOCK/HexShape.hxx b/src/HEXABLOCK/HexShape.hxx index 76928dc..94d3070 100755 --- a/src/HEXABLOCK/HexShape.hxx +++ b/src/HEXABLOCK/HexShape.hxx @@ -23,11 +23,12 @@ #ifndef __SHAPE_H_ #define __SHAPE_H_ +#include "Hex_defines.hxx" #include "hexa_base.hxx" BEGIN_NAMESPACE_HEXA -class Shape +class HEXABLOCKENGINE_EXPORT Shape { public : Shape (string brep); diff --git a/src/HEXABLOCK/HexSubShape.hxx b/src/HEXABLOCK/HexSubShape.hxx index 676b72d..7d1bf39 100644 --- a/src/HEXABLOCK/HexSubShape.hxx +++ b/src/HEXABLOCK/HexSubShape.hxx @@ -4,13 +4,14 @@ #ifndef __SUB_SHAPE_H_ #define __SUB_SHAPE_H_ +#include "Hex_defines.hxx" #include "HexEltBase.hxx" #include BEGIN_NAMESPACE_HEXA -class SubShape : public EltBase +class HEXABLOCKENGINE_EXPORT SubShape : public EltBase { public : SubShape (NewShape* dad, int id, int dim); diff --git a/src/HEXABLOCK/HexVector.hxx b/src/HEXABLOCK/HexVector.hxx index 4b788e3..7f12dfe 100755 --- a/src/HEXABLOCK/HexVector.hxx +++ b/src/HEXABLOCK/HexVector.hxx @@ -22,13 +22,14 @@ #ifndef __VECTOR_H #define __VECTOR_H +#include "Hex_defines.hxx" #include "HexEltBase.hxx" #include BEGIN_NAMESPACE_HEXA -class Vector : public EltBase +class HEXABLOCKENGINE_EXPORT Vector : public EltBase { public: double getDx () { return v_dx ; } diff --git a/src/HEXABLOCK/HexVertex.hxx b/src/HEXABLOCK/HexVertex.hxx index 7e3bbf3..4cfc41b 100755 --- a/src/HEXABLOCK/HexVertex.hxx +++ b/src/HEXABLOCK/HexVertex.hxx @@ -23,11 +23,12 @@ #ifndef __VERTEX_H_ #define __VERTEX_H_ +#include "Hex_defines.hxx" #include "HexEltBase.hxx" BEGIN_NAMESPACE_HEXA -class Vertex : public EltBase +class HEXABLOCKENGINE_EXPORT Vertex : public EltBase { public : double getX() { return v_x; } diff --git a/src/HEXABLOCK/HexVertexShape.hxx b/src/HEXABLOCK/HexVertexShape.hxx index e31e587..a2bd45b 100644 --- a/src/HEXABLOCK/HexVertexShape.hxx +++ b/src/HEXABLOCK/HexVertexShape.hxx @@ -4,11 +4,12 @@ #ifndef __NODE_SHAPE_H_ #define __NODE_SHAPE_H_ +#include "Hex_defines.hxx" #include "HexSubShape.hxx" BEGIN_NAMESPACE_HEXA -class VertexShape : public SubShape +class HEXABLOCKENGINE_EXPORT VertexShape : public SubShape { public : VertexShape (NewShape* dad, int id); diff --git a/src/HEXABLOCK/HexWitness.hxx b/src/HEXABLOCK/HexWitness.hxx index c94c54b..087a4bc 100644 --- a/src/HEXABLOCK/HexWitness.hxx +++ b/src/HEXABLOCK/HexWitness.hxx @@ -23,17 +23,23 @@ #ifndef __WITNESS_H_ #define __WITNESS_H_ +#include "Hex_defines.hxx" + #define Mess el_root->glob->mess << Begin #define Follow el_root->glob->mess #include "hexa_base.hxx" +#if defined WIN32 +#pragma warning ( disable: 4251 ) +#endif + BEGIN_NAMESPACE_HEXA const std::string Begin (" **** "); class DumpStudy; -class Witness +class HEXABLOCKENGINE_EXPORT Witness { public : Witness (); diff --git a/src/HEXABLOCK/HexXmlTree.hxx b/src/HEXABLOCK/HexXmlTree.hxx index c723598..ad919df 100755 --- a/src/HEXABLOCK/HexXmlTree.hxx +++ b/src/HEXABLOCK/HexXmlTree.hxx @@ -22,6 +22,7 @@ #ifndef __XML_TREE_H_ #define __XML_TREE_H_ +#include "Hex_defines.hxx" #include "hexa_base.hxx" #include @@ -32,7 +33,7 @@ BEGIN_NAMESPACE_HEXA M_IDENT, M_EQUALS, M_STRING, M_COMMENT, M_END_COMMENT, M_PROLOG, M_END_PROLOG, M_ERROR}; -class XmlTree +class HEXABLOCKENGINE_EXPORT XmlTree { public : XmlTree (const string& name, XmlTree* dad=NULL); diff --git a/src/HEXABLOCK/HexXmlWriter.hxx b/src/HEXABLOCK/HexXmlWriter.hxx index c577eae..a83ce06 100755 --- a/src/HEXABLOCK/HexXmlWriter.hxx +++ b/src/HEXABLOCK/HexXmlWriter.hxx @@ -22,13 +22,14 @@ #ifndef __XML_WRITER_H #define __XML_WRITER_H +#include "Hex_defines.hxx" #include "hexa_base.hxx" #include #include BEGIN_NAMESPACE_HEXA -class XmlWriter +class HEXABLOCKENGINE_EXPORT XmlWriter { public : XmlWriter (); diff --git a/src/HEXABLOCK/Hex_defines.hxx b/src/HEXABLOCK/Hex_defines.hxx new file mode 100755 index 0000000..89652e0 --- /dev/null +++ b/src/HEXABLOCK/Hex_defines.hxx @@ -0,0 +1,33 @@ +// Copyright (C) 2009-2013 CEA/DEN, EDF R&D +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ +// or email : webmaster.salome@opencascade.com + +#ifndef _HEX_DEFINES_HXX_ +#define _HEX_DEFINES_HXX_ + +#ifdef WIN32 + #if defined HEXABLOCKENGINE_EXPORTS || defined HEXABLOCKEngine_EXPORTS + #define HEXABLOCKENGINE_EXPORT __declspec( dllexport ) + #else + #define HEXABLOCKENGINE_EXPORT __declspec( dllimport ) + #endif +#else + #define HEXABLOCKENGINE_EXPORT +#endif + +#endif //_HEX_DEFINES_HXX_ \ No newline at end of file diff --git a/src/HEXABLOCK/hexa_base.hxx b/src/HEXABLOCK/hexa_base.hxx index c5d09b6..3ef8cfd 100755 --- a/src/HEXABLOCK/hexa_base.hxx +++ b/src/HEXABLOCK/hexa_base.hxx @@ -26,6 +26,8 @@ #ifndef _HEXA_BASE_H_ #define _HEXA_BASE_H_ +#include "Hex_defines.hxx" + #include #include @@ -239,41 +241,41 @@ typedef double Real3 [DIM3]; // Quelques fonctions : -pchar get_temp_name (cpchar format, pchar nomfic); -void fatal_error (cpchar format, cpchar info1=NULL, cpchar info2=NULL); +HEXABLOCKENGINE_EXPORT pchar get_temp_name (cpchar format, pchar nomfic); +HEXABLOCKENGINE_EXPORT void fatal_error (cpchar format, cpchar info1=NULL, cpchar info2=NULL); -double prod_scalaire (double v1[], double v2[]); -double* prod_vectoriel (double v1[], double v2[], double v3[]); -double prod_mixte (double vi[], double vj[], double vk[]); +HEXABLOCKENGINE_EXPORT double prod_scalaire (double v1[], double v2[]); +HEXABLOCKENGINE_EXPORT double* prod_vectoriel (double v1[], double v2[], double v3[]); +HEXABLOCKENGINE_EXPORT double prod_mixte (double vi[], double vj[], double vk[]); -inline double deg2radians (double angle) { return (angle*M_PI/180.0); } -inline double rad2degres (double angle) { return (angle*180.0/M_PI); } +HEXABLOCKENGINE_EXPORT inline double deg2radians (double angle) { return (angle*M_PI/180.0); } +HEXABLOCKENGINE_EXPORT inline double rad2degres (double angle) { return (angle*180.0/M_PI); } -double calc_norme (double v1[]); -double calc_distance (double v1[], double v2[]); -void calc_vecteur (double pta[], double ptb[], double vab[]); -void copy_vecteur (double va [], double vb []); -void calc_milieu (double pta[], double ptb[], double milieu[]); -int normer_vecteur (double v1[]); +HEXABLOCKENGINE_EXPORT double calc_norme (double v1[]); +HEXABLOCKENGINE_EXPORT double calc_distance (double v1[], double v2[]); +HEXABLOCKENGINE_EXPORT void calc_vecteur (double pta[], double ptb[], double vab[]); +HEXABLOCKENGINE_EXPORT void copy_vecteur (double va [], double vb []); +HEXABLOCKENGINE_EXPORT void calc_milieu (double pta[], double ptb[], double milieu[]); +HEXABLOCKENGINE_EXPORT int normer_vecteur (double v1[]); -double carre (double val); -bool same_coords (double* pa, double* pb, double epsilon=1e-6); +HEXABLOCKENGINE_EXPORT double carre (double val); +HEXABLOCKENGINE_EXPORT bool same_coords (double* pa, double* pb, double epsilon=1e-6); -bool requals (const double v1, const double v2); -bool requals (const double* v1, const double* v2); +HEXABLOCKENGINE_EXPORT bool requals (const double v1, const double v2); +HEXABLOCKENGINE_EXPORT bool requals (const double* v1, const double* v2); -bool on_debug(); // == getenv ("HEXA_DB") > 0 -bool in_test (); // == getenv ("HEXA_TEST") > 0 -int niv_debug(); // Implemente prochainement +HEXABLOCKENGINE_EXPORT bool on_debug(); // == getenv ("HEXA_DB") > 0 +HEXABLOCKENGINE_EXPORT bool in_test (); // == getenv ("HEXA_TEST") > 0 +HEXABLOCKENGINE_EXPORT int niv_debug(); // Implemente prochainement -void set_minus (string& chaine); +HEXABLOCKENGINE_EXPORT void set_minus (string& chaine); -bool special_option (); -void set_special_option (bool opt); +HEXABLOCKENGINE_EXPORT bool special_option (); +HEXABLOCKENGINE_EXPORT void set_special_option (bool opt); -int sizeof_file (cpchar filename); -char* read_file (cpchar filename, int& size); -cpchar get_time (string& buffer); +HEXABLOCKENGINE_EXPORT int sizeof_file (cpchar filename); +HEXABLOCKENGINE_EXPORT char* read_file (cpchar filename, int& size); +HEXABLOCKENGINE_EXPORT cpchar get_time (string& buffer); const double Epsil = 1e-6; const double UnEpsil = 0.999999; diff --git a/src/HEXABLOCKGUI/CMakeLists.txt b/src/HEXABLOCKGUI/CMakeLists.txt index 36b3c13..941d45f 100644 --- a/src/HEXABLOCKGUI/CMakeLists.txt +++ b/src/HEXABLOCKGUI/CMakeLists.txt @@ -51,6 +51,10 @@ ADD_DEFINITIONS( ${KERNEL_DEFINITIONS} ) +IF(WIN32) + ADD_DEFINITIONS(-DNOGDI -DNOMINMAX) +ENDIF(WIN32) + # libraries to link to SET(_link_LIBRARIES ${CORBA_LIBS} diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx b/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx index 83575d9..62a4ae8 100755 --- a/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx +++ b/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx @@ -2804,12 +2804,12 @@ QStringList HEXABLOCKGUI::getQuickDirList() extern "C" { - HEXABLOCKGUI_EXPORT CAM_Module* createModule() + HEXABLOCK_EXPORT CAM_Module* createModule() { return new HEXABLOCKGUI(); } - HEXABLOCKGUI_EXPORT char* getModuleVersion() + HEXABLOCK_EXPORT char* getModuleVersion() { return (char*)HEXABLOCK_VERSION_STR; } diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI.hxx index d9ea3fc..fbc8652 100755 --- a/src/HEXABLOCKGUI/HEXABLOCKGUI.hxx +++ b/src/HEXABLOCKGUI/HEXABLOCKGUI.hxx @@ -20,6 +20,8 @@ #ifndef _HEXABLOCKGUI_HXX_ #define _HEXABLOCKGUI_HXX_ +#include "HEXABLOCKGUI_Export.hxx" + #include #include #include @@ -113,7 +115,7 @@ class OCCViewer_ViewWindow; class LightApp_VTKSelector; -class HEXABLOCKGUI : public SalomeApp_Module +class HEXABLOCK_EXPORT HEXABLOCKGUI : public SalomeApp_Module { Q_OBJECT diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentDelegate.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentDelegate.hxx index 3bc1cfc..0022196 100755 --- a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentDelegate.hxx +++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentDelegate.hxx @@ -19,7 +19,7 @@ #ifndef __HEXABLOCKGUI_DOCUMENTDELEGATE_HXX_ #define __HEXABLOCKGUI_DOCUMENTDELEGATE_HXX_ - +#include "HEXABLOCKGUI_Export.hxx" // QEvent * event, QAbstractItemModel #include @@ -41,7 +41,7 @@ namespace HEXABLOCK { namespace GUI { - class DocumentDelegate : public QItemDelegate + class HEXABLOCK_EXPORT DocumentDelegate : public QItemDelegate { Q_OBJECT diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentItem.cxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentItem.cxx index dfa87b7..04a0bc5 100755 --- a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentItem.cxx +++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentItem.cxx @@ -24,8 +24,9 @@ #include "HEXABLOCKGUI_DocumentModel.hxx" #include "HexAssoEdge.hxx" +#ifndef WIN32 #include - +#endif using namespace std; using namespace HEXABLOCK::GUI; diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentItem.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentItem.hxx index 04efacb..dc1a3c3 100755 --- a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentItem.hxx +++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentItem.hxx @@ -20,6 +20,7 @@ #ifndef _HEXABLOCKGUI_DOCUMENTITEM_HXX_ #define _HEXABLOCKGUI_DOCUMENTITEM_HXX_ +#include "HEXABLOCKGUI_Export.hxx" #include @@ -156,7 +157,7 @@ namespace HEXABLOCK // QVariant::UserType //=================================================================================== - class ElementItem : public QStandardItem + class HEXABLOCK_EXPORT ElementItem : public QStandardItem { public: ElementItem( HEXA_NS::EltBase* docElement, QString entry, HexaType ttype, HexaTreeRole treeRole); @@ -174,7 +175,7 @@ namespace HEXABLOCK }; //=================================================================================== - class GraphicElementItem : public ElementItem + class HEXABLOCK_EXPORT GraphicElementItem : public ElementItem { public: GraphicElementItem( HEXA_NS::EltBase* docElement, QString entry, HexaType ttype, HexaTreeRole treeRole): @@ -187,7 +188,7 @@ namespace HEXABLOCK int IDinActor; }; - class StandardElementItem : public ElementItem + class HEXABLOCK_EXPORT StandardElementItem : public ElementItem { public: StandardElementItem( HEXA_NS::EltBase* docElement, QString entry, HexaType ttype, HexaTreeRole treeRole): @@ -196,40 +197,40 @@ namespace HEXABLOCK } }; - class VertexItem : public GraphicElementItem + class HEXABLOCK_EXPORT VertexItem : public GraphicElementItem { public: VertexItem( HEXA_NS::Vertex* hexaVertex, QString entry = ""); }; - class EdgeItem : public GraphicElementItem + class HEXABLOCK_EXPORT EdgeItem : public GraphicElementItem { public: EdgeItem( HEXA_NS::Edge* hexaEdge, QString entry = ""); }; //----------------------------------------- - class QuadItem : public GraphicElementItem + class HEXABLOCK_EXPORT QuadItem : public GraphicElementItem { public: QuadItem( HEXA_NS::Quad* hexaQuad, QString entry = ""); }; //----------------------------------------- - class HexaItem : public GraphicElementItem + class HEXABLOCK_EXPORT HexaItem : public GraphicElementItem { public: HexaItem( HEXA_NS::Hexa* hexaHexa, QString entry = ""); }; //----------------------------------------- - class VectorItem : public StandardElementItem + class HEXABLOCK_EXPORT VectorItem : public StandardElementItem { public: VectorItem( HEXA_NS::Vector* hexaVector, QString entry = ""); }; //----------------------------------------- -// class CylinderItem : public StandardElementItem +// class HEXABLOCK_EXPORT CylinderItem : public StandardElementItem // { // public: // CylinderItem( HEXA_NS::Cylinder* hexaCyl, QString entry = ""); @@ -243,7 +244,7 @@ namespace HEXABLOCK // }; //----------------------------------------- - class ElementsItem : public StandardElementItem + class HEXABLOCK_EXPORT ElementsItem : public StandardElementItem { public: ElementsItem( HEXA_NS::Elements* hexaElements, QString entry = "" ); @@ -256,7 +257,7 @@ namespace HEXABLOCK // }; //------------------------------------------------ - class GeomItem: public StandardElementItem + class HEXABLOCK_EXPORT GeomItem: public StandardElementItem { public: GeomItem( HEXA_NS::EltBase* geomShape, QString entry, HexaType ttype, HexaTreeRole treeRole, HEXA_NS::EltBase* assoc = NULL ); @@ -268,35 +269,35 @@ namespace HEXABLOCK }; //------------------------------------------------ - class GeomShapeItem: public GeomItem + class HEXABLOCK_EXPORT GeomShapeItem: public GeomItem { public: GeomShapeItem( HEXA_NS::NewShape* shape, HEXA_NS::EltBase* assoc = NULL); }; //------------------------------------------------ - class GeomPointItem: public GeomItem + class HEXABLOCK_EXPORT GeomPointItem: public GeomItem { public: GeomPointItem( HEXA_NS::VertexShape* geomPoint, HEXA_NS::Vertex* associatedVertex = NULL); }; //------------------------------------------------ - class GeomEdgeItem: public GeomItem + class HEXABLOCK_EXPORT GeomEdgeItem: public GeomItem { public: GeomEdgeItem( HEXA_NS::EdgeShape* geomEdge, HEXA_NS::Edge* associatedEdge = NULL); }; //------------------------------------------------ - class GeomFaceItem: public GeomItem + class HEXABLOCK_EXPORT GeomFaceItem: public GeomItem { public: GeomFaceItem( HEXA_NS::FaceShape* geomFace, HEXA_NS::Quad* associatedQuad = NULL); }; //----------------------------------------- - class GroupItem : public QStandardItem + class HEXABLOCK_EXPORT GroupItem : public QStandardItem { public: GroupItem( HEXA_NS::Group* hexaGroup ); @@ -308,7 +309,7 @@ namespace HEXABLOCK }; - class LawItem : public QStandardItem + class HEXABLOCK_EXPORT LawItem : public QStandardItem { public: LawItem( HEXA_NS::Law* hexaLaw ); @@ -320,7 +321,7 @@ namespace HEXABLOCK }; - class PropagationItem : public QStandardItem + class HEXABLOCK_EXPORT PropagationItem : public QStandardItem { public: PropagationItem( HEXA_NS::Propagation* hexaPropagation ); diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentModel.cxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentModel.cxx index 7082854..317dd5a 100755 --- a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentModel.cxx +++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentModel.cxx @@ -1015,7 +1015,7 @@ QModelIndex DocumentModel::addQuadVertices( const QModelIndex &i_v0, const QMode HEXA_NS::Vertex* hv2 = getHexaPtr(i_v2); HEXA_NS::Vertex* hv3 = getHexaPtr(i_v3); - if ( hv0 and hv1 and hv2 and hv3 ){ + if ( hv0 && hv1 && hv2 && hv3 ){ HEXA_NS::Quad* hq = _hexaDocument->addQuadVertices( hv0, hv1, hv2, hv3 ); if ( BadElement(hq) ) return quadIndex; @@ -1038,7 +1038,7 @@ QModelIndex DocumentModel::addQuadEdges( const QModelIndex &e0, const QModelInde HEXA_NS::Edge* he2 = getHexaPtr(e2); HEXA_NS::Edge* he3 = getHexaPtr(e3); - if ( he0 and he1 and he2 and he3 ){ + if ( he0 && he1 && he2 && he3 ){ HEXA_NS::Quad* hq = _hexaDocument->addQuad( he0, he1, he2, he3 ); if ( BadElement(hq) ) return quadIndex; @@ -2188,7 +2188,7 @@ Qt::ItemFlags PatternDataModel::flags(const QModelIndex &index) const QVariant PatternDataModel::headerData ( int section, Qt::Orientation orientation, int role ) const { - if ( section == 0 and orientation == Qt::Horizontal and role == Qt::DisplayRole ){ + if ( section == 0 && orientation == Qt::Horizontal && role == Qt::DisplayRole ){ return QVariant( "Data" ); } else { return QSortFilterProxyModel::headerData ( section, orientation, role ); @@ -2234,7 +2234,7 @@ Qt::ItemFlags PatternBuilderModel::flags(const QModelIndex &index) const QVariant PatternBuilderModel::headerData ( int section, Qt::Orientation orientation, int role ) const { - if ( section == 0 and orientation == Qt::Horizontal and role == Qt::DisplayRole ){ + if ( section == 0 && orientation == Qt::Horizontal && role == Qt::DisplayRole ){ return QVariant( "Builder" ); } else { return QSortFilterProxyModel::headerData ( section, orientation, role ); @@ -2284,7 +2284,7 @@ Qt::ItemFlags PatternGeomModel::flags(const QModelIndex &index) const QVariant PatternGeomModel::headerData ( int section, Qt::Orientation orientation, int role ) const { - if ( section == 0 and orientation == Qt::Horizontal and role == Qt::DisplayRole ){ + if ( section == 0 && orientation == Qt::Horizontal && role == Qt::DisplayRole ){ return QVariant( "Geometry" ); } else { return QSortFilterProxyModel::headerData ( section, orientation, role ); @@ -2329,7 +2329,7 @@ Qt::ItemFlags AssociationsModel::flags(const QModelIndex &index) const QVariant AssociationsModel::headerData ( int section, Qt::Orientation orientation, int role ) const { - if ( section == 0 and orientation == Qt::Horizontal and role == Qt::DisplayRole ){ + if ( section == 0 && orientation == Qt::Horizontal && role == Qt::DisplayRole ){ return QVariant( "Associations" ); } else { return QSortFilterProxyModel::headerData ( section, orientation, role ); @@ -2372,7 +2372,7 @@ Qt::ItemFlags GroupsModel::flags(const QModelIndex &index) const QVariant GroupsModel::headerData ( int section, Qt::Orientation orientation, int role ) const { - if ( section == 0 and orientation == Qt::Horizontal and role == Qt::DisplayRole ){ + if ( section == 0 && orientation == Qt::Horizontal && role == Qt::DisplayRole ){ return QVariant( "Groups" ); } else { return QSortFilterProxyModel::headerData ( section, orientation, role ); @@ -2425,7 +2425,7 @@ Qt::ItemFlags MeshModel::flags(const QModelIndex &index) const QVariant MeshModel::headerData ( int section, Qt::Orientation orientation, int role ) const { - if ( section == 0 and orientation == Qt::Horizontal and role == Qt::DisplayRole ){ + if ( section == 0 && orientation == Qt::Horizontal && role == Qt::DisplayRole ){ return QVariant( "Mesh" ); } else { return QSortFilterProxyModel::headerData ( section, orientation, role ); diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentModel.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentModel.hxx index add5d19..317f201 100755 --- a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentModel.hxx +++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentModel.hxx @@ -21,6 +21,8 @@ #define _HEXABLOCKGUI_DOCUMENTMODEL_HXX_ +#include "HEXABLOCKGUI_Export.hxx" + #include #include #include @@ -35,7 +37,7 @@ namespace HEXABLOCK { namespace GUI { - class DocumentModel : public QStandardItemModel + class HEXABLOCK_EXPORT DocumentModel : public QStandardItemModel { Q_OBJECT public: @@ -496,7 +498,7 @@ namespace HEXABLOCK }; - class PatternDataModel : public QSortFilterProxyModel + class HEXABLOCK_EXPORT PatternDataModel : public QSortFilterProxyModel { public: PatternDataModel( QObject * parent = 0 ); diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.cxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.cxx index 2bf2f29..42106e0 100755 --- a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.cxx +++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.cxx @@ -1728,9 +1728,9 @@ bool HexaDialog::apply(QModelIndex& result) } nbItems = iElts.count(); - if ( quads_rb->isChecked() and (nbItems>=2 and nbItems<=6) ){ // build from quads iElts.count() should be between [2,6] + if ( quads_rb->isChecked() && (nbItems>=2 && nbItems<=6) ){ // build from quads iElts.count() should be between [2,6] iHexa = getDocumentModel()->addHexaQuads( iElts ); - } else if ( vertices_rb->isChecked() and nbItems== 8 ){ // build from vertices + } else if ( vertices_rb->isChecked() && nbItems== 8 ){ // build from vertices iHexa = getDocumentModel()->addHexaVertices( iElts[0], iElts[1], iElts[2], iElts[3], iElts[4], iElts[5], iElts[6], iElts[7] ); } diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.hxx index 004946c..96f9010 100755 --- a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.hxx +++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.hxx @@ -19,17 +19,7 @@ #ifndef __HEXABLOCKGUI_DOCUMENTPANEL_HXX_ #define __HEXABLOCKGUI_DOCUMENTPANEL_HXX_ - -#if defined WIN32 -# if defined HEXABLOCKGUI_DOCUMENTPANEL_EXPORT || defined HexablockGui_DocumentPanel_EXPORTS -# define HEXABLOCKGUI_DOCUMENTPANEL_EXPORT __declspec( dllexport ) -# else -# define HEXABLOCKGUI_DOCUMENTPANEL_EXPORT __declspec( dllimport ) -# endif -#else -# define HEXABLOCKGUI_DOCUMENTPANEL_EXPORT -#endif - +#include "HEXABLOCKGUI_Export.hxx " #define MAX_WIDTH 16777215 #define MAX_HEIGHT 16777215 @@ -94,7 +84,7 @@ namespace HEXABLOCK { namespace GUI { - class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT HexaBaseDialog : public QDialog + class HEXABLOCK_EXPORT HexaBaseDialog : public QDialog { Q_OBJECT @@ -264,7 +254,7 @@ namespace HEXABLOCK - class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT VertexDialog : public HexaBaseDialog, + class HEXABLOCK_EXPORT VertexDialog : public HexaBaseDialog, public Ui::VertexDialog { Q_OBJECT @@ -292,7 +282,7 @@ namespace HEXABLOCK }; - class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT EdgeDialog : public HexaBaseDialog, + class HEXABLOCK_EXPORT EdgeDialog : public HexaBaseDialog, public Ui::EdgeDialog { Q_OBJECT @@ -318,7 +308,7 @@ namespace HEXABLOCK }; - class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT QuadDialog : public HexaBaseDialog, + class HEXABLOCK_EXPORT QuadDialog : public HexaBaseDialog, public Ui::QuadDialog { Q_OBJECT @@ -345,7 +335,7 @@ namespace HEXABLOCK - class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT HexaDialog : public HexaBaseDialog, + class HEXABLOCK_EXPORT HexaDialog : public HexaBaseDialog, public Ui::HexaDialog { Q_OBJECT @@ -380,7 +370,7 @@ namespace HEXABLOCK }; - class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT VectorDialog : public HexaBaseDialog, + class HEXABLOCK_EXPORT VectorDialog : public HexaBaseDialog, public Ui::VectorDialog { Q_OBJECT @@ -405,7 +395,7 @@ namespace HEXABLOCK QModelIndex _ivalue; }; - class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT MakeGridDialog : public HexaBaseDialog, + class HEXABLOCK_EXPORT MakeGridDialog : public HexaBaseDialog, public Ui::MakeGridDialog { Q_OBJECT @@ -434,7 +424,7 @@ namespace HEXABLOCK }; - class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT MakeCylinderDialog : public HexaBaseDialog, + class HEXABLOCK_EXPORT MakeCylinderDialog : public HexaBaseDialog, public Ui::MakeCylinderDialog { Q_OBJECT @@ -462,7 +452,7 @@ namespace HEXABLOCK }; - class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT MakePipeDialog : public HexaBaseDialog, + class HEXABLOCK_EXPORT MakePipeDialog : public HexaBaseDialog, public Ui::MakePipeDialog { Q_OBJECT @@ -490,7 +480,7 @@ namespace HEXABLOCK }; - class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT MakeCylindersDialog : public HexaBaseDialog, + class HEXABLOCK_EXPORT MakeCylindersDialog : public HexaBaseDialog, public Ui::MakeCylindersDialog { Q_OBJECT @@ -509,7 +499,7 @@ namespace HEXABLOCK }; - class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT MakePipesDialog : public HexaBaseDialog, + class HEXABLOCK_EXPORT MakePipesDialog : public HexaBaseDialog, public Ui::MakePipesDialog { Q_OBJECT @@ -529,7 +519,7 @@ namespace HEXABLOCK - class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT RemoveHexaDialog : public HexaBaseDialog, + class HEXABLOCK_EXPORT RemoveHexaDialog : public HexaBaseDialog, public Ui::RemoveHexaDialog { Q_OBJECT @@ -548,7 +538,7 @@ namespace HEXABLOCK }; - class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT PrismQuadDialog : public HexaBaseDialog, + class HEXABLOCK_EXPORT PrismQuadDialog : public HexaBaseDialog, public Ui::PrismQuadDialog { Q_OBJECT @@ -577,7 +567,7 @@ namespace HEXABLOCK }; - class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT JoinQuadDialog : public HexaBaseDialog, + class HEXABLOCK_EXPORT JoinQuadDialog : public HexaBaseDialog, public Ui::JoinQuadDialog { Q_OBJECT @@ -608,7 +598,7 @@ namespace HEXABLOCK }; - class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT MergeDialog : public HexaBaseDialog, + class HEXABLOCK_EXPORT MergeDialog : public HexaBaseDialog, public Ui::MergeDialog { Q_OBJECT @@ -632,7 +622,7 @@ namespace HEXABLOCK }; - class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT DisconnectDialog : public HexaBaseDialog, + class HEXABLOCK_EXPORT DisconnectDialog : public HexaBaseDialog, public Ui::DisconnectDialog { Q_OBJECT @@ -658,7 +648,7 @@ namespace HEXABLOCK - class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT CutEdgeDialog : public HexaBaseDialog, + class HEXABLOCK_EXPORT CutEdgeDialog : public HexaBaseDialog, public Ui::CutEdgeDialog { Q_OBJECT @@ -682,7 +672,7 @@ namespace HEXABLOCK }; - class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT MakeTransformationDialog : public HexaBaseDialog, + class HEXABLOCK_EXPORT MakeTransformationDialog : public HexaBaseDialog, public Ui::TransformationDialog { Q_OBJECT @@ -704,7 +694,7 @@ namespace HEXABLOCK }; - class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT MakeSymmetryDialog : public HexaBaseDialog, + class HEXABLOCK_EXPORT MakeSymmetryDialog : public HexaBaseDialog, public Ui::SymmetryDialog { Q_OBJECT @@ -728,7 +718,7 @@ namespace HEXABLOCK - class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT PerformTransformationDialog : public HexaBaseDialog, + class HEXABLOCK_EXPORT PerformTransformationDialog : public HexaBaseDialog, public Ui::TransformationDialog { Q_OBJECT @@ -750,7 +740,7 @@ namespace HEXABLOCK }; - class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT PerformSymmetryDialog : public HexaBaseDialog, + class HEXABLOCK_EXPORT PerformSymmetryDialog : public HexaBaseDialog, public Ui::SymmetryDialog { Q_OBJECT @@ -771,7 +761,7 @@ namespace HEXABLOCK void updateHelpFileName(); }; -class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT EdgeAssocDialog : public HexaBaseDialog, +class HEXABLOCK_EXPORT EdgeAssocDialog : public HexaBaseDialog, public Ui::EdgeAssocDialog { Q_OBJECT @@ -809,7 +799,7 @@ class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT EdgeAssocDialog : public HexaBaseDialog, }; - class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT QuadAssocDialog : public HexaBaseDialog, + class HEXABLOCK_EXPORT QuadAssocDialog : public HexaBaseDialog, public Ui::QuadAssocDialog { Q_OBJECT @@ -840,7 +830,7 @@ class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT EdgeAssocDialog : public HexaBaseDialog, - class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT GroupDialog : public HexaBaseDialog, + class HEXABLOCK_EXPORT GroupDialog : public HexaBaseDialog, public Ui::GroupDialog { Q_OBJECT @@ -872,7 +862,7 @@ class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT EdgeAssocDialog : public HexaBaseDialog, - class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT LawDialog : public HexaBaseDialog, + class HEXABLOCK_EXPORT LawDialog : public HexaBaseDialog, public Ui::LawDialog { Q_OBJECT @@ -900,7 +890,7 @@ class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT EdgeAssocDialog : public HexaBaseDialog, - class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT PropagationDialog : public HexaBaseDialog, + class HEXABLOCK_EXPORT PropagationDialog : public HexaBaseDialog, public Ui::PropagationDialog { Q_OBJECT @@ -933,7 +923,7 @@ class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT EdgeAssocDialog : public HexaBaseDialog, // Define the compute mesh dialog box // ---------------------------------- - class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT ComputeMeshDialog : public HexaBaseDialog + class HEXABLOCK_EXPORT ComputeMeshDialog : public HexaBaseDialog { Q_OBJECT @@ -958,7 +948,7 @@ class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT EdgeAssocDialog : public HexaBaseDialog, - class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT ReplaceHexaDialog : public HexaBaseDialog, + class HEXABLOCK_EXPORT ReplaceHexaDialog : public HexaBaseDialog, public Ui::ReplaceHexaDialog { Q_OBJECT @@ -988,7 +978,7 @@ class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT EdgeAssocDialog : public HexaBaseDialog, - class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT QuadRevolutionDialog : public HexaBaseDialog, + class HEXABLOCK_EXPORT QuadRevolutionDialog : public HexaBaseDialog, public Ui::QuadRevolutionDialog { Q_OBJECT @@ -1017,7 +1007,7 @@ class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT EdgeAssocDialog : public HexaBaseDialog, - class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT MakeHemiSphereDialog : public HexaBaseDialog, + class HEXABLOCK_EXPORT MakeHemiSphereDialog : public HexaBaseDialog, public Ui::MakeHemiSphereDialog { Q_OBJECT @@ -1048,7 +1038,7 @@ class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT EdgeAssocDialog : public HexaBaseDialog, HEXA_NS::Elements *_value; }; - class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT ModelInfoDialog : public HexaBaseDialog, + class HEXABLOCK_EXPORT ModelInfoDialog : public HexaBaseDialog, public Ui::ModelInfoDialog { Q_OBJECT @@ -1067,7 +1057,7 @@ class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT EdgeAssocDialog : public HexaBaseDialog, virtual void _initInputWidget( Mode editmode ){} }; - class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT AddShapeDialog : public HexaBaseDialog, + class HEXABLOCK_EXPORT AddShapeDialog : public HexaBaseDialog, public Ui::AddShapeDialog { Q_OBJECT @@ -1092,7 +1082,7 @@ class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT EdgeAssocDialog : public HexaBaseDialog, //***************************** OBSOLETE: A SUPPRIMER !!!! ************************************// - class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT CylinderDialog : public HexaBaseDialog, + class HEXABLOCK_EXPORT CylinderDialog : public HexaBaseDialog, public Ui::CylinderDialog { Q_OBJECT @@ -1117,7 +1107,7 @@ class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT EdgeAssocDialog : public HexaBaseDialog, QModelIndex _ivalue; }; - class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT PipeDialog : public HexaBaseDialog, + class HEXABLOCK_EXPORT PipeDialog : public HexaBaseDialog, public Ui::PipeDialog { Q_OBJECT diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentSelectionModel.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentSelectionModel.hxx index 4f8fb56..bb6d13b 100755 --- a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentSelectionModel.hxx +++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentSelectionModel.hxx @@ -20,6 +20,8 @@ #ifndef _HEXABLOCKGUI_DOCUMENTSELECTIONMODEL_HXX_ #define _HEXABLOCKGUI_DOCUMENTSELECTIONMODEL_HXX_ +#include "HEXABLOCKGUI_Export.hxx" + #include #include @@ -36,7 +38,7 @@ namespace HEXABLOCK namespace GUI { - class SelectionModel: public QItemSelectionModel + class HEXABLOCK_EXPORT SelectionModel: public QItemSelectionModel { Q_OBJECT diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_Exception.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_Exception.hxx index a15215a..6ba6a00 100755 --- a/src/HEXABLOCKGUI/HEXABLOCKGUI_Exception.hxx +++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_Exception.hxx @@ -29,7 +29,7 @@ namespace HEXABLOCK { namespace GUI { - class HEXABLOCKGUI_EXPORT Exception : public std::exception + class HEXABLOCK_EXPORT Exception : public std::exception { protected: std::string _what; diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_Export.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_Export.hxx index cff8920..10351e7 100755 --- a/src/HEXABLOCKGUI/HEXABLOCKGUI_Export.hxx +++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_Export.hxx @@ -20,14 +20,14 @@ #ifndef _HEXABLOCKGUI_EXPORT_HXX_ #define _HEXABLOCKGUI_EXPORT_HXX_ -#ifdef WNT -# if defined HEXABLOCKGUI_EXPORT -# define HEXABLOCKGUI_EXPORT __declspec( dllexport ) +#ifdef WIN32 +# if defined HEXABLOCKGUI_EXPORTS || defined HEXABLOCK_EXPORTS +# define HEXABLOCK_EXPORT __declspec( dllexport ) # else -# define HEXABLOCKGUI_EXPORT __declspec( dllimport ) +# define HEXABLOCK_EXPORT __declspec( dllimport ) # endif #else -# define HEXABLOCKGUI_EXPORT +# define HEXABLOCK_EXPORT #endif #endif diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_GraphicViewsHandler.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_GraphicViewsHandler.hxx index ef6cde0..2c38d6c 100644 --- a/src/HEXABLOCKGUI/HEXABLOCKGUI_GraphicViewsHandler.hxx +++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_GraphicViewsHandler.hxx @@ -20,6 +20,8 @@ #ifndef _HEXABLOCKGUI_VTKGRAPHICVIEWSHANDLER_HXX_ #define _HEXABLOCKGUI_VTKGRAPHICVIEWSHANDLER_HXX_ +#include "HEXABLOCKGUI_Export.hxx" + //Salome Includes #include #include @@ -35,7 +37,7 @@ namespace HEXABLOCK namespace GUI { - class GraphicViewsHandler + class HEXABLOCK_EXPORT GraphicViewsHandler { public: diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_Model.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_Model.hxx index 10a49e2..7a66039 100755 --- a/src/HEXABLOCKGUI/HEXABLOCKGUI_Model.hxx +++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_Model.hxx @@ -20,10 +20,12 @@ #ifndef _HEXABLOCKGUI_MODEL_HXX_ #define _HEXABLOCKGUI_MODEL_HXX_ +#include "HEXABLOCKGUI_Export.hxx" + #include -class HEXABLOCKGUI_Model : public SalomeApp_DataModel +class HEXABLOCK_EXPORT CHEXABLOCKGUI_Model : public SalomeApp_DataModel { public: HEXABLOCKGUI_Model(CAM_Module* theModule); diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_OCCSelector.h b/src/HEXABLOCKGUI/HEXABLOCKGUI_OCCSelector.h index cf41914..cab143c 100755 --- a/src/HEXABLOCKGUI/HEXABLOCKGUI_OCCSelector.h +++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_OCCSelector.h @@ -27,10 +27,11 @@ #ifndef HEXABLOCKGUI_OCCSELECTOR_H #define HEXABLOCKGUI_OCCSELECTOR_H +#include "HEXABLOCKGUI_Export.hxx" #include -class HEXABLOCKGUI_OCCSelector : public LightApp_OCCSelector +class HEXABLOCK_EXPORT HEXABLOCKGUI_OCCSelector : public LightApp_OCCSelector { public: HEXABLOCKGUI_OCCSelector( OCCViewer_Viewer*, SUIT_SelectionMgr* ); diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_OccGraphicView.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_OccGraphicView.hxx index 4939d36..e5d3e59 100644 --- a/src/HEXABLOCKGUI/HEXABLOCKGUI_OccGraphicView.hxx +++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_OccGraphicView.hxx @@ -22,6 +22,7 @@ #ifndef _HEXABLOCKGUI_OCCGRAPHICVIEW_HXX_ #define _HEXABLOCKGUI_OCCGRAPHICVIEW_HXX_ +#include "HEXABLOCKGUI_Export.hxx" #include #include "HEXABLOCKGUI_SalomeTools.hxx" @@ -46,7 +47,7 @@ namespace HEXABLOCK * OccGraphicView ********************************************************************************/ - class OccGraphicView + class HEXABLOCK_EXPORT OccGraphicView { public: diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_Resource.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_Resource.hxx index 0b8de66..87d1621 100755 --- a/src/HEXABLOCKGUI/HEXABLOCKGUI_Resource.hxx +++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_Resource.hxx @@ -20,6 +20,8 @@ #ifndef _HEXABLOCKGUI_RESOURCE_HXX_ #define _HEXABLOCKGUI_RESOURCE_HXX_ +#include "HEXABLOCKGUI_Export.hxx" + #include class HEXABLOCKGUI; @@ -27,7 +29,7 @@ class SUIT_ResourceMgr; -class HEXABLOCKGUI_Resource +class HEXABLOCK_EXPORT HEXABLOCKGUI_Resource { public: HEXABLOCKGUI_Resource(SUIT_ResourceMgr* r); diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.hxx index 752cf49..af2a4a6 100644 --- a/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.hxx +++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.hxx @@ -20,6 +20,7 @@ #ifndef _HEXABLOCKGUI_SALOMETOOLS_HXX_ #define _HEXABLOCKGUI_SALOMETOOLS_HXX_ +#include "HEXABLOCKGUI_Export.hxx" #include #include @@ -40,48 +41,48 @@ namespace HEXABLOCK namespace GUI { - SALOME_Actor* findActorByEntry( SVTK_ViewWindow *theVtkViewWindow, const char* theEntry ); - _PTR(Study) GetActiveStudyDocument(); + HEXABLOCK_EXPORT SALOME_Actor* findActorByEntry( SVTK_ViewWindow *theVtkViewWindow, const char* theEntry ); + HEXABLOCK_EXPORT _PTR(Study) GetActiveStudyDocument(); - int GetNameOfSelectedElements( SVTK_ViewWindow *theWindow,/* SVTK_Selector* theSelector,*/ - const Handle(SALOME_InteractiveObject)& theIO, - QString& theName ); + HEXABLOCK_EXPORT int GetNameOfSelectedElements( SVTK_ViewWindow *theWindow,/* SVTK_Selector* theSelector,*/ + const Handle(SALOME_InteractiveObject)& theIO, + QString& theName ); - std::string shape2string( const TopoDS_Shape& aShape ); + HEXABLOCK_EXPORT std::string shape2string( const TopoDS_Shape& aShape ); - void getEntityOwners( const Handle(AIS_InteractiveObject)& theObj, - const Handle(AIS_InteractiveContext)& theIC, - SelectMgr_IndexedMapOfOwner& theMap ); + HEXABLOCK_EXPORT void getEntityOwners( const Handle(AIS_InteractiveObject)& theObj, + const Handle(AIS_InteractiveContext)& theIC, + SelectMgr_IndexedMapOfOwner& theMap ); - void indicesToOwners( const TColStd_IndexedMapOfInteger& aIndexMap, - const TopoDS_Shape& aMainShape, - const SelectMgr_IndexedMapOfOwner& anAllMap, - SelectMgr_IndexedMapOfOwner& aToHiliteMap ); + HEXABLOCK_EXPORT void indicesToOwners( const TColStd_IndexedMapOfInteger& aIndexMap, + const TopoDS_Shape& aMainShape, + const SelectMgr_IndexedMapOfOwner& anAllMap, + SelectMgr_IndexedMapOfOwner& aToHiliteMap ); - TopoDS_Shape getSubShape(const TopoDS_Shape& theShape, const int theIndex); - int getSubId(const TopoDS_Shape& theShape, const TopoDS_Shape& theSubShape); + HEXABLOCK_EXPORT TopoDS_Shape getSubShape(const TopoDS_Shape& theShape, const int theIndex); + HEXABLOCK_EXPORT int getSubId(const TopoDS_Shape& theShape, const TopoDS_Shape& theSubShape); - Standard_Boolean getExtremaSolution(const gp_Pnt& theInitPnt, + HEXABLOCK_EXPORT Standard_Boolean getExtremaSolution(const gp_Pnt& theInitPnt, const TopoDS_Shape& theRefShape, gp_Pnt& thePnt); - TopoDS_Vertex makePoint(const double x, const double y, const double z); + HEXABLOCK_EXPORT TopoDS_Vertex makePoint(const double x, const double y, const double z); - TopoDS_Vertex makePointWithReference(const TopoDS_Shape& point, const double dx, + HEXABLOCK_EXPORT TopoDS_Vertex makePointWithReference(const TopoDS_Shape& point, const double dx, const double dy, const double dz); - TopoDS_Vertex makePointOnCurve(const TopoDS_Shape& edge, const double param); + HEXABLOCK_EXPORT TopoDS_Vertex makePointOnCurve(const TopoDS_Shape& edge, const double param); - TopoDS_Vertex makePointOnCurveByLength(const TopoDS_Shape& edge, const TopoDS_Shape& point, const double length); + HEXABLOCK_EXPORT TopoDS_Vertex makePointOnCurveByLength(const TopoDS_Shape& edge, const TopoDS_Shape& point, const double length); - TopoDS_Vertex makePointOnCurveByCoord(const TopoDS_Shape& edge, const double x, const double y, const double z); + HEXABLOCK_EXPORT TopoDS_Vertex makePointOnCurveByCoord(const TopoDS_Shape& edge, const double x, const double y, const double z); - TopoDS_Vertex makePointOnLinesIntersection(const TopoDS_Shape& line1, const TopoDS_Shape& line2); + HEXABLOCK_EXPORT TopoDS_Vertex makePointOnLinesIntersection(const TopoDS_Shape& line1, const TopoDS_Shape& line2); - TopoDS_Vertex makePointOnSurface(const TopoDS_Shape& face, const double param_u, const double param_v); + HEXABLOCK_EXPORT TopoDS_Vertex makePointOnSurface(const TopoDS_Shape& face, const double param_u, const double param_v); - TopoDS_Vertex makePointOnSurfaceByCoord(const TopoDS_Shape& face, const double x, const double y, const double z); + HEXABLOCK_EXPORT TopoDS_Vertex makePointOnSurfaceByCoord(const TopoDS_Shape& face, const double x, const double y, const double z); } } diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_Trace.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_Trace.hxx index 0963573..35bf54a 100755 --- a/src/HEXABLOCKGUI/HEXABLOCKGUI_Trace.hxx +++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_Trace.hxx @@ -20,6 +20,8 @@ #ifndef __HEXABLOCKGUI_TRACE_HXX__ #define __HEXABLOCKGUI_TRACE_HXX__ + + #include #include @@ -34,7 +36,7 @@ namespace HEXABLOCK { namespace GUI { - extern HEXABLOCKGUI_EXPORT int traceLevel; + extern HEXABLOCK_EXPORT int traceLevel; } } diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_VtkDocumentGraphicView.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_VtkDocumentGraphicView.hxx index 8023424..2e947e7 100755 --- a/src/HEXABLOCKGUI/HEXABLOCKGUI_VtkDocumentGraphicView.hxx +++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_VtkDocumentGraphicView.hxx @@ -20,6 +20,8 @@ #ifndef _HEXABLOCKGUI_VTKDOCUMENTGRAPHICVIEW_HXX_ #define _HEXABLOCKGUI_VTKDOCUMENTGRAPHICVIEW_HXX_ +#include "HEXABLOCKGUI_Export.hxx" + // SALOME GUI includes #include #include @@ -53,7 +55,7 @@ namespace HEXABLOCK namespace GUI { - class Document_Actor : public SALOME_Actor + class HEXABLOCK_EXPORT Document_Actor : public SALOME_Actor { public: Document_Actor(HEXA_NS::Document* doc, const QString& entry); @@ -92,7 +94,7 @@ namespace HEXABLOCK /******************************************************************************** * VtkDocumentGraphicView ********************************************************************************/ - class VtkDocumentGraphicView : public QAbstractItemView + class HEXABLOCK_EXPORT VtkDocumentGraphicView : public QAbstractItemView { Q_OBJECT diff --git a/src/HEXABLOCKGUI/MyBasicGUI_PointDlg.hxx b/src/HEXABLOCKGUI/MyBasicGUI_PointDlg.hxx index d1fd1f5..fcfc9c2 100755 --- a/src/HEXABLOCKGUI/MyBasicGUI_PointDlg.hxx +++ b/src/HEXABLOCKGUI/MyBasicGUI_PointDlg.hxx @@ -21,7 +21,7 @@ #ifndef MYBASICGUI_POINTDLG_H #define MYBASICGUI_POINTDLG_H - +#include "HEXABLOCKGUI_Export.hxx" #include "MyGEOMBase_Skeleton.hxx" @@ -63,7 +63,7 @@ namespace HEXABLOCK // class : MyBasicGUI_PointDlg // purpose : //================================================================================= -typedef class MyBasicGUI_PointDlg : public MyGEOMBase_Skeleton +typedef class HEXABLOCK_EXPORT MyBasicGUI_PointDlg : public MyGEOMBase_Skeleton { Q_OBJECT diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef.hxx b/src/HEXABLOCKGUI/MyDlgRef/DlgRef.hxx index f408fed..7b3309c 100644 --- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef.hxx +++ b/src/HEXABLOCKGUI/MyDlgRef/DlgRef.hxx @@ -22,13 +22,13 @@ #define GEOM_DLGREF_HXX #if defined WIN32 -# if defined DLGREF_EXPORTS || defined DlgRef_EXPORTS -# define DLGREF_EXPORT __declspec( dllexport ) +# if defined MYDLGREF_EXPORTS || defined MyDlgRef_EXPORTS +# define MYDLGREF_EXPORT __declspec( dllexport ) # else -# define DLGREF_EXPORT __declspec( dllimport ) +# define MYDLGREF_EXPORT __declspec( dllimport ) # endif #else -# define DLGREF_EXPORT +# define MYMYDLGREF_EXPORT #endif ////////////////////////////////////////// @@ -37,7 +37,7 @@ #include "ui_DlgRef_1List1Spin1Btn_QTD.h" -class DLGREF_EXPORT DlgRef_1List1Spin1Btn : public QWidget, +class MYDLGREF_EXPORT DlgRef_1List1Spin1Btn : public QWidget, public Ui::DlgRef_1List1Spin1Btn_QTD { Q_OBJECT @@ -53,7 +53,7 @@ public: #include "ui_DlgRef_1Sel1Check1List_QTD.h" -class DLGREF_EXPORT DlgRef_1Sel1Check1List : public QWidget, +class MYDLGREF_EXPORT DlgRef_1Sel1Check1List : public QWidget, public Ui::DlgRef_1Sel1Check1List_QTD { Q_OBJECT @@ -69,7 +69,7 @@ public: #include "ui_DlgRef_1Sel1Check1Sel_QTD.h" -class DLGREF_EXPORT DlgRef_1Sel1Check1Sel : public QWidget, +class MYDLGREF_EXPORT DlgRef_1Sel1Check1Sel : public QWidget, public Ui::DlgRef_1Sel1Check1Sel_QTD { Q_OBJECT @@ -85,7 +85,7 @@ public: #include "ui_DlgRef_1Sel1Check_QTD.h" -class DLGREF_EXPORT DlgRef_1Sel1Check : public QWidget, +class MYDLGREF_EXPORT DlgRef_1Sel1Check : public QWidget, public Ui::DlgRef_1Sel1Check_QTD { Q_OBJECT @@ -101,7 +101,7 @@ public: #include "ui_DlgRef_1Sel1List1Check3Btn_QTD.h" -class DLGREF_EXPORT DlgRef_1Sel1List1Check3Btn : public QWidget, +class MYDLGREF_EXPORT DlgRef_1Sel1List1Check3Btn : public QWidget, public Ui::DlgRef_1Sel1List1Check3Btn_QTD { Q_OBJECT @@ -117,7 +117,7 @@ public: #include "ui_DlgRef_1Sel1Spin1Check_QTD.h" -class DLGREF_EXPORT DlgRef_1Sel1Spin1Check : public QWidget, +class MYDLGREF_EXPORT DlgRef_1Sel1Spin1Check : public QWidget, public Ui::DlgRef_1Sel1Spin1Check_QTD { Q_OBJECT @@ -133,7 +133,7 @@ public: #include "ui_DlgRef_1Sel1Spin_QTD.h" -class DLGREF_EXPORT DlgRef_1Sel1Spin : public QWidget, +class MYDLGREF_EXPORT DlgRef_1Sel1Spin : public QWidget, public Ui::DlgRef_1Sel1Spin_QTD { Q_OBJECT @@ -149,7 +149,7 @@ public: #include "ui_DlgRef_1Sel2Spin1View1Check_QTD.h" -class DLGREF_EXPORT DlgRef_1Sel2Spin1View1Check : public QWidget, +class MYDLGREF_EXPORT DlgRef_1Sel2Spin1View1Check : public QWidget, public Ui::DlgRef_1Sel2Spin1View1Check_QTD { Q_OBJECT @@ -165,7 +165,7 @@ public: #include "ui_DlgRef_1Sel2Spin_QTD.h" -class DLGREF_EXPORT DlgRef_1Sel2Spin : public QWidget, +class MYDLGREF_EXPORT DlgRef_1Sel2Spin : public QWidget, public Ui::DlgRef_1Sel2Spin_QTD { Q_OBJECT @@ -181,7 +181,7 @@ public: #include "ui_DlgRef_1Sel3Check_QTD.h" -class DLGREF_EXPORT DlgRef_1Sel3Check : public QWidget, +class MYDLGREF_EXPORT DlgRef_1Sel3Check : public QWidget, public Ui::DlgRef_1Sel3Check_QTD { Q_OBJECT @@ -199,7 +199,7 @@ public: #include "ui_DlgRef_1Sel3Spin_QTD.h" -class DLGREF_EXPORT DlgRef_1Sel3Spin : public QWidget, +class MYDLGREF_EXPORT DlgRef_1Sel3Spin : public QWidget, public Ui::DlgRef_1Sel3Spin_QTD { Q_OBJECT @@ -215,7 +215,7 @@ public: #include "ui_DlgRef_1Sel3Spin1Check_QTD.h" -class DLGREF_EXPORT DlgRef_1Sel3Spin1Check : public QWidget, +class MYDLGREF_EXPORT DlgRef_1Sel3Spin1Check : public QWidget, public Ui::DlgRef_1Sel3Spin1Check_QTD { Q_OBJECT @@ -231,7 +231,7 @@ public: #include "ui_DlgRef_1Sel4Spin2Check_QTD.h" -class DLGREF_EXPORT DlgRef_1Sel4Spin2Check : public QWidget, +class MYDLGREF_EXPORT DlgRef_1Sel4Spin2Check : public QWidget, public Ui::DlgRef_1Sel4Spin2Check_QTD { Q_OBJECT @@ -247,7 +247,7 @@ public: #include "ui_DlgRef_1Sel4Spin_QTD.h" -class DLGREF_EXPORT DlgRef_1Sel4Spin : public QWidget, +class MYDLGREF_EXPORT DlgRef_1Sel4Spin : public QWidget, public Ui::DlgRef_1Sel4Spin_QTD { Q_OBJECT @@ -263,7 +263,7 @@ public: #include "ui_DlgRef_1Sel5Spin1Check_QTD.h" -class DLGREF_EXPORT DlgRef_1Sel5Spin1Check : public QWidget, +class MYDLGREF_EXPORT DlgRef_1Sel5Spin1Check : public QWidget, public Ui::DlgRef_1Sel5Spin1Check_QTD { Q_OBJECT @@ -279,7 +279,7 @@ public: #include "ui_DlgRef_1Sel5Spin_QTD.h" -class DLGREF_EXPORT DlgRef_1Sel5Spin : public QWidget, +class MYDLGREF_EXPORT DlgRef_1Sel5Spin : public QWidget, public Ui::DlgRef_1Sel5Spin_QTD { Q_OBJECT @@ -295,7 +295,7 @@ public: #include "ui_DlgRef_1Spin_QTD.h" -class DLGREF_EXPORT DlgRef_1Spin : public QWidget, +class MYDLGREF_EXPORT DlgRef_1Spin : public QWidget, public Ui::DlgRef_1Spin_QTD { Q_OBJECT @@ -311,7 +311,7 @@ public: #include "ui_DlgRef_1Sel_QTD.h" -class DLGREF_EXPORT DlgRef_1Sel : public QWidget, +class MYDLGREF_EXPORT DlgRef_1Sel : public QWidget, public Ui::DlgRef_1Sel_QTD { Q_OBJECT @@ -327,7 +327,7 @@ public: #include "ui_DlgRef_1SelExt_QTD.h" -class DLGREF_EXPORT DlgRef_1SelExt : public QWidget, +class MYDLGREF_EXPORT DlgRef_1SelExt : public QWidget, public Ui::DlgRef_1SelExt_QTD { Q_OBJECT @@ -343,7 +343,7 @@ public: #include "ui_DlgRef_2Sel1List1Check_QTD.h" -class DLGREF_EXPORT DlgRef_2Sel1List1Check : public QWidget, +class MYDLGREF_EXPORT DlgRef_2Sel1List1Check : public QWidget, public Ui::DlgRef_2Sel1List1Check_QTD { Q_OBJECT @@ -359,7 +359,7 @@ public: #include "ui_DlgRef_2Sel1List2Check_QTD.h" -class DLGREF_EXPORT DlgRef_2Sel1List2Check : public QWidget, +class MYDLGREF_EXPORT DlgRef_2Sel1List2Check : public QWidget, public Ui::DlgRef_2Sel1List2Check_QTD { Q_OBJECT @@ -375,7 +375,7 @@ public: #include "ui_DlgRef_2Sel1List_QTD.h" -class DLGREF_EXPORT DlgRef_2Sel1List : public QWidget, +class MYDLGREF_EXPORT DlgRef_2Sel1List : public QWidget, public Ui::DlgRef_2Sel1List_QTD { Q_OBJECT @@ -391,7 +391,7 @@ public: #include "ui_DlgRef_2Sel1Spin2Check_QTD.h" -class DLGREF_EXPORT DlgRef_2Sel1Spin2Check : public QWidget, +class MYDLGREF_EXPORT DlgRef_2Sel1Spin2Check : public QWidget, public Ui::DlgRef_2Sel1Spin2Check_QTD { Q_OBJECT @@ -407,7 +407,7 @@ public: #include "ui_DlgRef_2Sel1Spin_QTD.h" -class DLGREF_EXPORT DlgRef_2Sel1Spin : public QWidget, +class MYDLGREF_EXPORT DlgRef_2Sel1Spin : public QWidget, public Ui::DlgRef_2Sel1Spin_QTD { Q_OBJECT @@ -423,7 +423,7 @@ public: #include "ui_DlgRef_2Sel1SpinInt_QTD.h" -class DLGREF_EXPORT DlgRef_2Sel1SpinInt : public QWidget, +class MYDLGREF_EXPORT DlgRef_2Sel1SpinInt : public QWidget, public Ui::DlgRef_2Sel1SpinInt_QTD { Q_OBJECT @@ -439,7 +439,7 @@ public: #include "ui_DlgRef_2Sel2List_QTD.h" -class DLGREF_EXPORT DlgRef_2Sel2List : public QWidget, +class MYDLGREF_EXPORT DlgRef_2Sel2List : public QWidget, public Ui::DlgRef_2Sel2List_QTD { Q_OBJECT @@ -455,7 +455,7 @@ public: #include "ui_DlgRef_2Sel2Spin1Check_QTD.h" -class DLGREF_EXPORT DlgRef_2Sel2Spin1Check : public QWidget, +class MYDLGREF_EXPORT DlgRef_2Sel2Spin1Check : public QWidget, public Ui::DlgRef_2Sel2Spin1Check_QTD { Q_OBJECT @@ -471,7 +471,7 @@ public: #include "ui_DlgRef_2Sel2Spin3Check_QTD.h" -class DLGREF_EXPORT DlgRef_2Sel2Spin3Check : public QWidget, +class MYDLGREF_EXPORT DlgRef_2Sel2Spin3Check : public QWidget, public Ui::DlgRef_2Sel2Spin3Check_QTD { Q_OBJECT @@ -487,7 +487,7 @@ public: #include "ui_DlgRef_2Sel2Spin_QTD.h" -class DLGREF_EXPORT DlgRef_2Sel2Spin : public QWidget, +class MYDLGREF_EXPORT DlgRef_2Sel2Spin : public QWidget, public Ui::DlgRef_2Sel2Spin_QTD { Q_OBJECT @@ -503,7 +503,7 @@ public: #include "ui_DlgRef_2Sel3Spin2Rb_QTD.h" -class DLGREF_EXPORT DlgRef_2Sel3Spin2Rb : public QWidget, +class MYDLGREF_EXPORT DlgRef_2Sel3Spin2Rb : public QWidget, public Ui::DlgRef_2Sel3Spin2Rb_QTD { Q_OBJECT @@ -519,7 +519,7 @@ public: #include "ui_DlgRef_2Sel3Spin_QTD.h" -class DLGREF_EXPORT DlgRef_2Sel3Spin : public QWidget, +class MYDLGREF_EXPORT DlgRef_2Sel3Spin : public QWidget, public Ui::DlgRef_2Sel3Spin_QTD { Q_OBJECT @@ -535,7 +535,7 @@ public: #include "ui_DlgRef_2Sel4Spin1Check_QTD.h" -class DLGREF_EXPORT DlgRef_2Sel4Spin1Check : public QWidget, +class MYDLGREF_EXPORT DlgRef_2Sel4Spin1Check : public QWidget, public Ui::DlgRef_2Sel4Spin1Check_QTD { Q_OBJECT @@ -551,7 +551,7 @@ public: #include "ui_DlgRef_2Sel_QTD.h" -class DLGREF_EXPORT DlgRef_2Sel : public QWidget, +class MYDLGREF_EXPORT DlgRef_2Sel : public QWidget, public Ui::DlgRef_2Sel_QTD { Q_OBJECT @@ -567,7 +567,7 @@ public: #include "ui_DlgRef_2SelExt_QTD.h" -class DLGREF_EXPORT DlgRef_2SelExt : public QWidget, +class MYDLGREF_EXPORT DlgRef_2SelExt : public QWidget, public Ui::DlgRef_2SelExt_QTD { Q_OBJECT @@ -583,7 +583,7 @@ public: #include "ui_DlgRef_2Spin_QTD.h" -class DLGREF_EXPORT DlgRef_2Spin : public QWidget, +class MYDLGREF_EXPORT DlgRef_2Spin : public QWidget, public Ui::DlgRef_2Spin_QTD { Q_OBJECT @@ -599,7 +599,7 @@ public: #include "ui_DlgRef_3Check_QTD.h" -class DLGREF_EXPORT DlgRef_3Check : public QWidget, +class MYDLGREF_EXPORT DlgRef_3Check : public QWidget, public Ui::DlgRef_3Check_QTD { Q_OBJECT @@ -615,7 +615,7 @@ public: #include "ui_DlgRef_3Radio_QTD.h" -class DLGREF_EXPORT DlgRef_3Radio : public QWidget, +class MYDLGREF_EXPORT DlgRef_3Radio : public QWidget, public Ui::DlgRef_3Radio_QTD { Q_OBJECT @@ -631,7 +631,7 @@ public: #include "ui_DlgRef_3Radio1Sel1Spin_QTD.h" -class DLGREF_EXPORT DlgRef_3Radio1Sel1Spin : public QWidget, +class MYDLGREF_EXPORT DlgRef_3Radio1Sel1Spin : public QWidget, public Ui::DlgRef_3Radio1Sel1Spin_QTD { Q_OBJECT @@ -647,7 +647,7 @@ public: #include "ui_DlgRef_3Sel1Check_QTD.h" -class DLGREF_EXPORT DlgRef_3Sel1Check : public QWidget, +class MYDLGREF_EXPORT DlgRef_3Sel1Check : public QWidget, public Ui::DlgRef_3Sel1Check_QTD { Q_OBJECT @@ -663,7 +663,7 @@ public: #include "ui_DlgRef_3Sel1Spin_QTD.h" -class DLGREF_EXPORT DlgRef_3Sel1Spin : public QWidget, +class MYDLGREF_EXPORT DlgRef_3Sel1Spin : public QWidget, public Ui::DlgRef_3Sel1Spin_QTD { Q_OBJECT @@ -679,7 +679,7 @@ public: #include "ui_DlgRef_3Sel2Spin_QTD.h" -class DLGREF_EXPORT DlgRef_3Sel2Spin : public QWidget, +class MYDLGREF_EXPORT DlgRef_3Sel2Spin : public QWidget, public Ui::DlgRef_3Sel2Spin_QTD { Q_OBJECT @@ -695,7 +695,7 @@ public: #include "ui_DlgRef_3Sel3Spin1Check_QTD.h" -class DLGREF_EXPORT DlgRef_3Sel3Spin1Check : public QWidget, +class MYDLGREF_EXPORT DlgRef_3Sel3Spin1Check : public QWidget, public Ui::DlgRef_3Sel3Spin1Check_QTD { Q_OBJECT @@ -713,7 +713,7 @@ public: #include "ui_DlgRef_3Sel3Spin2Check_QTD.h" -class DLGREF_EXPORT DlgRef_3Sel3Spin2Check : public QWidget, +class MYDLGREF_EXPORT DlgRef_3Sel3Spin2Check : public QWidget, public Ui::DlgRef_3Sel3Spin2Check_QTD { Q_OBJECT @@ -731,7 +731,7 @@ public: #include "ui_DlgRef_3Sel4Spin2Check_QTD.h" -class DLGREF_EXPORT DlgRef_3Sel4Spin2Check : public QWidget, +class MYDLGREF_EXPORT DlgRef_3Sel4Spin2Check : public QWidget, public Ui::DlgRef_3Sel4Spin2Check_QTD { Q_OBJECT @@ -747,7 +747,7 @@ public: #include "ui_DlgRef_3Sel_QTD.h" -class DLGREF_EXPORT DlgRef_3Sel : public QWidget, +class MYDLGREF_EXPORT DlgRef_3Sel : public QWidget, public Ui::DlgRef_3Sel_QTD { Q_OBJECT @@ -763,7 +763,7 @@ public: #include "ui_DlgRef_3Spin1Check_QTD.h" -class DLGREF_EXPORT DlgRef_3Spin1Check : public QWidget, +class MYDLGREF_EXPORT DlgRef_3Spin1Check : public QWidget, public Ui::DlgRef_3Spin1Check_QTD { Q_OBJECT @@ -779,7 +779,7 @@ public: #include "ui_DlgRef_3Spin_QTD.h" -class DLGREF_EXPORT DlgRef_3Spin : public QWidget, +class MYDLGREF_EXPORT DlgRef_3Spin : public QWidget, public Ui::DlgRef_3Spin_QTD { Q_OBJECT @@ -795,7 +795,7 @@ public: #include "ui_DlgRef_4Sel1List1Check_QTD.h" -class DLGREF_EXPORT DlgRef_4Sel1List1Check : public QWidget, +class MYDLGREF_EXPORT DlgRef_4Sel1List1Check : public QWidget, public Ui::DlgRef_4Sel1List1Check_QTD { Q_OBJECT @@ -811,7 +811,7 @@ public: #include "ui_DlgRef_4Sel1List_QTD.h" -class DLGREF_EXPORT DlgRef_4Sel1List : public QWidget, +class MYDLGREF_EXPORT DlgRef_4Sel1List : public QWidget, public Ui::DlgRef_4Sel1List_QTD { Q_OBJECT @@ -827,7 +827,7 @@ public: #include "ui_DlgRef_4Sel1Spin2Check_QTD.h" -class DLGREF_EXPORT DlgRef_4Sel1Spin2Check : public QWidget, +class MYDLGREF_EXPORT DlgRef_4Sel1Spin2Check : public QWidget, public Ui::DlgRef_4Sel1Spin2Check_QTD { Q_OBJECT @@ -845,7 +845,7 @@ public: #include "ui_DlgRef_4Sel1Spin3Check_QTD.h" -class DLGREF_EXPORT DlgRef_4Sel1Spin3Check : public QWidget, +class MYDLGREF_EXPORT DlgRef_4Sel1Spin3Check : public QWidget, public Ui::DlgRef_4Sel1Spin3Check_QTD { Q_OBJECT @@ -861,7 +861,7 @@ public: #include "ui_DlgRef_6Sel_QTD.h" -class DLGREF_EXPORT DlgRef_6Sel : public QWidget, +class MYDLGREF_EXPORT DlgRef_6Sel : public QWidget, public Ui::DlgRef_6Sel_QTD { Q_OBJECT @@ -877,7 +877,7 @@ public: #include "ui_DlgRef_Skeleton_QTD.h" -class DLGREF_EXPORT DlgRef_Skeleton : public QWidget, +class MYDLGREF_EXPORT DlgRef_Skeleton : public QWidget, public Ui::DlgRef_Skeleton_QTD { Q_OBJECT @@ -893,7 +893,7 @@ public: namespace DlgRef { - DLGREF_EXPORT QString PrintDoubleValue( double, int = 16 ); + MYDLGREF_EXPORT QString PrintDoubleValue( double, int = 16 ); }; #endif // GEOM_DLGREF_H diff --git a/src/HEXABLOCKGUI/MyDlgRef/MyDlgRef.hxx b/src/HEXABLOCKGUI/MyDlgRef/MyDlgRef.hxx index 59534be..70bc5f6 100644 --- a/src/HEXABLOCKGUI/MyDlgRef/MyDlgRef.hxx +++ b/src/HEXABLOCKGUI/MyDlgRef/MyDlgRef.hxx @@ -22,7 +22,7 @@ #define MYGEOM_MYDLGREF_HXX #if defined WIN32 -# if defined MYMYDLGREF_EXPORTS || defined DlgRef_EXPORTS +# if defined MYMYDLGREF_EXPORTS || defined MyDlgRef_EXPORTS # define MYDLGREF_EXPORT __declspec( dllexport ) # else # define MYDLGREF_EXPORT __declspec( dllimport ) diff --git a/src/HEXABLOCKGUI/MyGEOMBase_Skeleton.hxx b/src/HEXABLOCKGUI/MyGEOMBase_Skeleton.hxx index 7e1c8eb..531f0c8 100755 --- a/src/HEXABLOCKGUI/MyGEOMBase_Skeleton.hxx +++ b/src/HEXABLOCKGUI/MyGEOMBase_Skeleton.hxx @@ -20,6 +20,7 @@ #ifndef MYGEOMBASE_SKELETON_H #define MYGEOMBASE_SKELETON_H +#include "HEXABLOCKGUI_Export.hxx" #include "HEXABLOCKGUI_OccGraphicView.hxx" #include "HEXABLOCKGUI.hxx" @@ -47,7 +48,7 @@ namespace HEXABLOCK namespace GUI { -class HEXABLOCKGUI_DOCUMENTPANEL_EXPORT MyGEOMBase_Skeleton : public HexaBaseDialog +class HEXABLOCK_EXPORT MyGEOMBase_Skeleton : public HexaBaseDialog { Q_OBJECT diff --git a/src/HEXABLOCKGUI/Resource.hxx b/src/HEXABLOCKGUI/Resource.hxx index cc57b48..f745ea3 100755 --- a/src/HEXABLOCKGUI/Resource.hxx +++ b/src/HEXABLOCKGUI/Resource.hxx @@ -183,7 +183,7 @@ namespace HEXABLOCK { namespace GUI { - class HEXABLOCKGUI_EXPORT Resource { + class HEXABLOCK_EXPORT Resource { public: Resource(); diff --git a/src/HEXABLOCKGUI/klinkitemselectionmodel.hxx b/src/HEXABLOCKGUI/klinkitemselectionmodel.hxx index f5e660c..089b8f3 100644 --- a/src/HEXABLOCKGUI/klinkitemselectionmodel.hxx +++ b/src/HEXABLOCKGUI/klinkitemselectionmodel.hxx @@ -22,6 +22,8 @@ #ifndef KLINKITEMSELECTIONMODEL_H #define KLINKITEMSELECTIONMODEL_H +#include "HEXABLOCKGUI_Export.hxx" + #include #include #include @@ -35,7 +37,7 @@ class KLinkItemSelectionModelPrivate; -class KLinkItemSelectionModel : public QItemSelectionModel +class HEXABLOCK_EXPORT KLinkItemSelectionModel : public QItemSelectionModel { Q_OBJECT public: @@ -84,7 +86,7 @@ static QItemSelection klink_removeInvalidRanges(const QItemSelection &selection) #endif -class KLinkItemSelectionModelPrivate +class HEXABLOCK_EXPORT KLinkItemSelectionModelPrivate { public: KLinkItemSelectionModelPrivate(KLinkItemSelectionModel *proxySelectionModel, QAbstractItemModel *model, diff --git a/src/HEXABLOCKGUI/kmodelindexproxymapper.hxx b/src/HEXABLOCKGUI/kmodelindexproxymapper.hxx index 3a81de1..ac03dc0 100644 --- a/src/HEXABLOCKGUI/kmodelindexproxymapper.hxx +++ b/src/HEXABLOCKGUI/kmodelindexproxymapper.hxx @@ -22,6 +22,8 @@ #ifndef KMODELINDEXPROXYMAPPER_H #define KMODELINDEXPROXYMAPPER_H +#include "HEXABLOCKGUI_Export.hxx" + #include // #include "kdeui_export.h" @@ -31,7 +33,7 @@ class QModelIndex; class QItemSelection; class KModelIndexProxyMapperPrivate; -class KModelIndexProxyMapper : public QObject +class HEXABLOCK_EXPORT KModelIndexProxyMapper : public QObject { Q_OBJECT public: diff --git a/src/TEST_CPP/HexEdgeTest.hxx b/src/TEST_CPP/HexEdgeTest.hxx index 6ec75c8..ae9a3b9 100755 --- a/src/TEST_CPP/HexEdgeTest.hxx +++ b/src/TEST_CPP/HexEdgeTest.hxx @@ -20,6 +20,8 @@ #ifndef __EdgeTest__ #define __EdgeTest__ +#include "HexTest.hxx" + #include #include @@ -27,7 +29,7 @@ #include "Hex.hxx" #include "HexDocument.hxx" -class EdgeTest : public CppUnit::TestFixture +class HEXABLOCKTEST_EXPORT EdgeTest : public CppUnit::TestFixture { CPPUNIT_TEST_SUITE( EdgeTest ); CPPUNIT_TEST( TestGetVertex ); diff --git a/src/TEST_CPP/HexTest.hxx b/src/TEST_CPP/HexTest.hxx new file mode 100755 index 0000000..6b22afd --- /dev/null +++ b/src/TEST_CPP/HexTest.hxx @@ -0,0 +1,34 @@ +// Copyright (C) 2009-2013 CEA/DEN, EDF R&D +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// + +#ifndef __HexTest__ +#define __HexTest__ + +#ifdef WIN32 + #if defined HEXABLOCKTEST_EXPORTS || defined HEXABLOCKTest_EXPORTS + #define HEXABLOCKTEST_EXPORT __declspec( dllexport ) + #else + #define HEXABLOCKTEST_EXPORT __declspec( dllimport ) + #endif +#else + #define HEXABLOCKTEST_EXPORT +#endif + +#endif //__HexTest__ + diff --git a/src/TEST_CPP/HexVertexTest.hxx b/src/TEST_CPP/HexVertexTest.hxx index ffc34ce..ba021f6 100755 --- a/src/TEST_CPP/HexVertexTest.hxx +++ b/src/TEST_CPP/HexVertexTest.hxx @@ -20,6 +20,8 @@ #ifndef __VertexTest__ #define __VertexTest__ +#include "HexTest.hxx" + #include #include @@ -27,7 +29,7 @@ #include "Hex.hxx" #include "HexDocument.hxx" -class VertexTest : public CppUnit::TestFixture +class HEXABLOCKTEST_EXPORT VertexTest : public CppUnit::TestFixture { CPPUNIT_TEST_SUITE( VertexTest ); CPPUNIT_TEST( TestGetX ); diff --git a/src/TEST_CPP/ModelTest.hxx b/src/TEST_CPP/ModelTest.hxx index 45e8570..be2bd3b 100755 --- a/src/TEST_CPP/ModelTest.hxx +++ b/src/TEST_CPP/ModelTest.hxx @@ -20,6 +20,8 @@ #ifndef __ModelTest__ #define __ModelTest__ +#include "HexTest.hxx" + #include #include @@ -28,7 +30,7 @@ #include "HexDocument.hxx" #include "HexEltBase.hxx" -class ModelTest : public CppUnit::TestFixture +class HEXABLOCKTEST_EXPORT ModelTest : public CppUnit::TestFixture { CPPUNIT_TEST_SUITE( ModelTest ); CPPUNIT_TEST( myTest_croix); diff --git a/src/TEST_CPP/test_quads.cxx b/src/TEST_CPP/test_quads.cxx index a916bed..c6bc6b3 100755 --- a/src/TEST_CPP/test_quads.cxx +++ b/src/TEST_CPP/test_quads.cxx @@ -21,7 +21,11 @@ // #include "Hex.hxx" +#include "test_unit.hxx" + +#ifndef WIN32 #include +#endif #include "HexDocument.hxx" #include "HexElements.hxx" diff --git a/src/TEST_CPP/test_tools.cxx b/src/TEST_CPP/test_tools.cxx index bfb2782..bdee887 100755 --- a/src/TEST_CPP/test_tools.cxx +++ b/src/TEST_CPP/test_tools.cxx @@ -25,10 +25,18 @@ #include #include +#ifndef WIN32 #include +#endif #include // pour getpid() +#ifndef WIN32 #include // pour getpid() +#else +#include +#include +#endif + static int nbr_vtk = 0; static cpchar case_name = "hexa"; @@ -50,7 +58,11 @@ void goto_workspace () if (w_default) { +#ifndef WIN32 pid_t pid = getpid (); +#else + int pid = _getpid (); +#endif char bufpid [8]; sprintf (bufpid, "_p%d", pid); workspace += bufpid; @@ -60,7 +72,12 @@ void goto_workspace () call_system (rmdir + workspace); call_system (mkdir + workspace); +#ifndef WIN32 chdir (workspace.c_str()); +#else + _chdir (workspace.c_str()); +#endif + } // ======================================================== free_workspace void free_workspace () diff --git a/src/TEST_CPP/test_unit.hxx b/src/TEST_CPP/test_unit.hxx index 342a823..66370db 100644 --- a/src/TEST_CPP/test_unit.hxx +++ b/src/TEST_CPP/test_unit.hxx @@ -21,56 +21,57 @@ #ifndef _TEST_UNIT_H_ #define _TEST_UNIT_H_ +#include "HexTest.hxx" #include "hexa_base.hxx" -void goto_workspace (); -void free_workspace (); +HEXABLOCKTEST_EXPORT void goto_workspace (); +HEXABLOCKTEST_EXPORT void free_workspace (); -int test_sphere (int nbargs, cpchar tabargs[]); -int test_joint (int nbargs, cpchar tabargs[]); -int test_prism (int nbargs, cpchar tabargs[]); -int test_revolution9 (int nbargs, cpchar tabargs[]); -int test_revolution (int nbargs, cpchar tabargs[]); -int test_coude (int nbargs, cpchar tabargs[]); -int test_count (int nbargs, cpchar tabargs[]); -int test_decoupage (int nbargs, cpchar tabargs[]); -int test_gen_xml (int nbargs, cpchar tabargs[]); -int test_string_xml (int nbargs, cpchar tabargs[]); -int test_relecture (int nbargs, cpchar tabargs[]); -int test_spherical (int nbargs, const char* tabargs[]); -int test_grille_cyl (int nbargs, cpchar tabargs[]); -int test_asso_line (int nbargs, cpchar tabargs[]); -int test_cylindrical (int nbargs, cpchar tabargs[]); -int test_cylinder (int nbargs, cpchar tabargs[]); -int test_xml_cylinder (int nbargs, cpchar tabargs[]); -int test_pipe (int nbargs, cpchar tabargs[]); -int test_joint2 (int nbargs, cpchar tabargs[]); -int test_croix (int nbargs, cpchar tabargs[]); -int test_pipes (int nbargs, cpchar tabargs[]); -int test_lorraine(int nbargs, cpchar tabargs[]); -int test_disconnect2 (int nbargs, cpchar tabargs[]); -int test_disconnect4 (int nbargs, cpchar tabargs[]); -int test_disconnect1 (int nbargs, cpchar tabargs[]); -int test_disconnect3 (int nbargs, cpchar tabargs[]); -int test_disconnect (int nbargs, cpchar tabargs[]); -int test_transfo2 (int nbargs, cpchar tabargs[]); -int test_transfo (int nbargs, cpchar tabargs[]); -int test_copy_document (int nbargs, cpchar tabargs[]); -int test_cylindricals (int nbargs, cpchar tabargs[]); -int test_hexa (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_sphere (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_joint (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_prism (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_revolution9 (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_revolution (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_coude (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_count (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_decoupage (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_gen_xml (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_string_xml (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_relecture (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_spherical (int nbargs, const char* tabargs[]); +HEXABLOCKTEST_EXPORT int test_grille_cyl (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_asso_line (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_cylindrical (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_cylinder (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_xml_cylinder (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_pipe (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_joint2 (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_croix (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_pipes (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_lorraine(int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_disconnect2 (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_disconnect4 (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_disconnect1 (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_disconnect3 (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_disconnect (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_transfo2 (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_transfo (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_copy_document (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_cylindricals (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_hexa (int nbargs, cpchar tabargs[]); // Dans test_quads -int test_hexa_quads_5 (int nbargs, cpchar tabargs[]); -int test_hexa_quads_ab (int nbargs, cpchar tabargs[]); -int test_hexa_quads_ac (int nbargs, cpchar tabargs[]); -int test_hexa_quads_ace (int nbargs, cpchar tabargs[]); -int test_hexa_quads_acd (int nbargs, cpchar tabargs[]); -int test_hexa_quads_abcd (int nbargs, cpchar tabargs[]); -int test_hexa_quads_abce (int nbargs, cpchar tabargs[]); -int test_cramer (int nbargs, cpchar tabargs[]); -int test_hexa_quads_ac1 (int nbargs, cpchar tabargs[]); -int test_asso_grid (int nbargs, cpchar tabargs[]); -int test_piquage (int nbargs, cpchar tabargs[]); -int test_replace (int nbargs, cpchar tabargs[]); -int test_hemispheres (int nbargs, cpchar tabargs[]); -int test_quads (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_hexa_quads_5 (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_hexa_quads_ab (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_hexa_quads_ac (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_hexa_quads_ace (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_hexa_quads_acd (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_hexa_quads_abcd (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_hexa_quads_abce (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_cramer (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_hexa_quads_ac1 (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_asso_grid (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_piquage (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_replace (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_hemispheres (int nbargs, cpchar tabargs[]); +HEXABLOCKTEST_EXPORT int test_quads (int nbargs, cpchar tabargs[]); #endif