From: rnv Date: Thu, 19 Sep 2013 11:32:13 +0000 (+0000) Subject: ATOMIC win32 building. X-Git-Tag: V7_3_0a1~12 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e1925a79bcbf685ec49ee8f83d5bef8e9b528a64;p=samples%2Fatomic.git ATOMIC win32 building. --- diff --git a/src/ATOMICGUI/ATOMICGUI.cxx b/src/ATOMICGUI/ATOMICGUI.cxx index cd11663..7954310 100644 --- a/src/ATOMICGUI/ATOMICGUI.cxx +++ b/src/ATOMICGUI/ATOMICGUI.cxx @@ -17,8 +17,6 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -using namespace std; - #include "ATOMICGUI.h" #include "ATOMICGUI_DataModel.h" @@ -42,6 +40,8 @@ using namespace std; #include +using namespace std; + /*! Constructor */ ATOMICGUI::ATOMICGUI() : LightApp_Module( "ATOMICGUI" ) diff --git a/src/ATOMICGUI/ATOMICGUI.h b/src/ATOMICGUI/ATOMICGUI.h index 6379101..ea26cfa 100644 --- a/src/ATOMICGUI/ATOMICGUI.h +++ b/src/ATOMICGUI/ATOMICGUI.h @@ -20,13 +20,15 @@ #if !defined(ATOMICGUI_H) #define ATOMICGUI_H +#include "ATOMICGUI_ATOMICGUI.hxx" + #include /*! * Class : ATOMICGUI * Description : GUI module class for ATOMIC component */ -class ATOMICGUI: public LightApp_Module +class ATOMICGUI_EXPORT ATOMICGUI: public LightApp_Module { Q_OBJECT enum { agCreateMol, diff --git a/src/ATOMICGUI/ATOMICGUI_ATOMICGUI.hxx b/src/ATOMICGUI/ATOMICGUI_ATOMICGUI.hxx new file mode 100755 index 0000000..227f89c --- /dev/null +++ b/src/ATOMICGUI/ATOMICGUI_ATOMICGUI.hxx @@ -0,0 +1,39 @@ +// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// 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 +// + +// File : ATOMICGUI_ATOMICGUI.hxx +// Author : Roman NIKOLAEV, Open CASCADE S.A.S. (roman.nikolaev@opencascade.com) +// +#ifndef ATOMICGUI_ATOMICGUI_HXX +#define ATOMICGUI_ATOMICGUI_HXX + +#if defined WIN32 +# if defined ATOMICGUI_EXPORTS || defined ATOMIC_EXPORTS +# define ATOMICGUI_EXPORT __declspec( dllexport ) +# else +# define ATOMICGUI_EXPORT __declspec( dllimport ) +# endif +#else +# define ATOMICGUI_EXPORT +#endif + +#endif // ATOMICGUI_ATOMICGUI_HXX diff --git a/src/ATOMICGUI/ATOMICGUI_AddAtomDlg.h b/src/ATOMICGUI/ATOMICGUI_AddAtomDlg.h index 104a1e3..6b756c5 100644 --- a/src/ATOMICGUI/ATOMICGUI_AddAtomDlg.h +++ b/src/ATOMICGUI/ATOMICGUI_AddAtomDlg.h @@ -20,6 +20,8 @@ #if !defined(ATOMICGUI_ATOMDLG_H) #define ATOMICGUI_ATOMDLG_H +#include "ATOMICGUI_ATOMICGUI.hxx" + #include class QtxDoubleSpinBox; @@ -29,7 +31,7 @@ class QLineEdit; * Class : ATOMICGUI_AddAtomDlg * Description : Dialog for Atom creation */ -class ATOMICGUI_AddAtomDlg : public LightApp_Dialog +class ATOMICGUI_EXPORT ATOMICGUI_AddAtomDlg : public LightApp_Dialog { Q_OBJECT diff --git a/src/ATOMICGUI/ATOMICGUI_AddAtomOp.h b/src/ATOMICGUI/ATOMICGUI_AddAtomOp.h index a1c3edf..72b8b4b 100644 --- a/src/ATOMICGUI/ATOMICGUI_AddAtomOp.h +++ b/src/ATOMICGUI/ATOMICGUI_AddAtomOp.h @@ -22,6 +22,8 @@ #include "ATOMICGUI_Operation.h" +#include "ATOMICGUI_ATOMICGUI.hxx" + class ATOMICGUI_AddAtomDlg; /*! @@ -29,7 +31,7 @@ class ATOMICGUI_AddAtomDlg; * Description : Operation class for Atom creation * Uses ATOMICGUI_AddAtomDlg class */ -class ATOMICGUI_AddAtomOp : public ATOMICGUI_Operation +class ATOMICGUI_EXPORT ATOMICGUI_AddAtomOp : public ATOMICGUI_Operation { Q_OBJECT diff --git a/src/ATOMICGUI/ATOMICGUI_CreateMolOp.h b/src/ATOMICGUI/ATOMICGUI_CreateMolOp.h index 32bb4ed..a63363c 100644 --- a/src/ATOMICGUI/ATOMICGUI_CreateMolOp.h +++ b/src/ATOMICGUI/ATOMICGUI_CreateMolOp.h @@ -20,13 +20,15 @@ #ifndef ATOMICGUI_CREATECONF_OP_H #define ATOMICGUI_CREATECONF_OP_H +#include "ATOMICGUI_ATOMICGUI.hxx" + #include "ATOMICGUI_Operation.h" /*! * Class : ATOMICGUI_AddAtomOp * Description : Operation class for Molecule creation */ -class ATOMICGUI_CreateMolOp : public ATOMICGUI_Operation +class ATOMICGUI_EXPORT ATOMICGUI_CreateMolOp : public ATOMICGUI_Operation { Q_OBJECT diff --git a/src/ATOMICGUI/ATOMICGUI_Data.cxx b/src/ATOMICGUI/ATOMICGUI_Data.cxx index a5fd61c..812ece4 100644 --- a/src/ATOMICGUI/ATOMICGUI_Data.cxx +++ b/src/ATOMICGUI/ATOMICGUI_Data.cxx @@ -64,14 +64,14 @@ void ATOMICGUI_AtomicMolecule::addAtom( const QString& atom, /*! Removes an atom from molecule by index */ void ATOMICGUI_AtomicMolecule::deleteAtom( const int index ) { - if ( index >= 0 and index < myAtoms.count() ) + if ( index >= 0 && index < myAtoms.count() ) myAtoms.removeAt( index ); } /*! Gets an atom id by index */ int ATOMICGUI_AtomicMolecule::atomId( const int index ) const { - if ( index >= 0 and index < myAtoms.count() ) + if ( index >= 0 && index < myAtoms.count() ) return myAtoms[ index ].id(); return 0; } @@ -80,7 +80,7 @@ int ATOMICGUI_AtomicMolecule::atomId( const int index ) const QString ATOMICGUI_AtomicMolecule::atomName( const int index ) const { QString n; - if ( index >= 0 and index < myAtoms.count() ) + if ( index >= 0 && index < myAtoms.count() ) n = myAtoms[ index ].name(); return n; } @@ -88,7 +88,7 @@ QString ATOMICGUI_AtomicMolecule::atomName( const int index ) const /*! Gets an atom x coordinate by index */ double ATOMICGUI_AtomicMolecule::atomX( const int index ) const { - if ( index >= 0 and index < myAtoms.count() ) + if ( index >= 0 && index < myAtoms.count() ) return myAtoms[ index ].x(); return 0; } @@ -96,7 +96,7 @@ double ATOMICGUI_AtomicMolecule::atomX( const int index ) const /*! Gets an atom y coordinate by index */ double ATOMICGUI_AtomicMolecule::atomY( const int index ) const { - if ( index >= 0 and index < myAtoms.count() ) + if ( index >= 0 && index < myAtoms.count() ) return myAtoms[ index ].y(); return 0; } @@ -104,7 +104,7 @@ double ATOMICGUI_AtomicMolecule::atomY( const int index ) const /*! Gets an atom z coordinate by index */ double ATOMICGUI_AtomicMolecule::atomZ( const int index ) const { - if ( index >= 0 and index < myAtoms.count() ) + if ( index >= 0 && index < myAtoms.count() ) return myAtoms[ index ].z(); return 0; } @@ -114,6 +114,6 @@ void ATOMICGUI_AtomicMolecule::setName( const QString& name, const int index ) { if ( index < 0 ) myName = name; - else if ( index >= 0 and index < myAtoms.count() ) + else if ( index >= 0 && index < myAtoms.count() ) myAtoms[ index ].myName = name; } diff --git a/src/ATOMICGUI/ATOMICGUI_Data.h b/src/ATOMICGUI/ATOMICGUI_Data.h index 5cd89e5..c10621d 100644 --- a/src/ATOMICGUI/ATOMICGUI_Data.h +++ b/src/ATOMICGUI/ATOMICGUI_Data.h @@ -20,6 +20,8 @@ #if !defined(ATOMICGUI_DATA_H) #define ATOMICGUI_DATA_H +#include "ATOMICGUI_ATOMICGUI.hxx" + #include #include @@ -27,7 +29,7 @@ * Class : ATOMICGUI_AtomicMolecule, ATOMICGUI_AtomicMolecule::Atom * Description : Core classes for data of ATOMIC component */ -class ATOMICGUI_AtomicMolecule +class ATOMICGUI_EXPORT ATOMICGUI_AtomicMolecule { private: diff --git a/src/ATOMICGUI/ATOMICGUI_DataModel.h b/src/ATOMICGUI/ATOMICGUI_DataModel.h index 406a628..998fb24 100644 --- a/src/ATOMICGUI/ATOMICGUI_DataModel.h +++ b/src/ATOMICGUI/ATOMICGUI_DataModel.h @@ -20,6 +20,8 @@ #if !defined(ATOMICGUI_DATAMODEL_H) #define ATOMICGUI_DATAMODEL_H +#include "ATOMICGUI_ATOMICGUI.hxx" + #include "ATOMICGUI_Data.h" #include #include @@ -33,7 +35,7 @@ class ATOMICGUI_DataObject; * Class : ATOMICGUI_DataModel * Description : Data Model of ATOMIC component */ -class ATOMICGUI_DataModel : public LightApp_DataModel +class ATOMICGUI_EXPORT ATOMICGUI_DataModel : public LightApp_DataModel { Q_OBJECT diff --git a/src/ATOMICGUI/ATOMICGUI_DataObject.h b/src/ATOMICGUI/ATOMICGUI_DataObject.h index 0f53903..4abe4d5 100644 --- a/src/ATOMICGUI/ATOMICGUI_DataObject.h +++ b/src/ATOMICGUI/ATOMICGUI_DataObject.h @@ -20,6 +20,8 @@ #if !defined(ATOMICGUI_DATAOBJECT_H) #define ATOMICGUI_DATAOBJECT_H +#include "ATOMICGUI_ATOMICGUI.hxx" + #include #include @@ -33,7 +35,7 @@ class ATOMICGUI_AtomicMolecule; * If it is an Atom then myIndex field is >= 0 * For Molecule myIndex equals to -1. */ -class ATOMICGUI_DataObject : public virtual LightApp_DataObject +class ATOMICGUI_EXPORT ATOMICGUI_DataObject : public virtual LightApp_DataObject { public: ATOMICGUI_DataObject ( SUIT_DataObject*, ATOMICGUI_AtomicMolecule* = 0, int = -1 ); @@ -56,7 +58,7 @@ private: int myIndex; }; -class ATOMICGUI_ModuleObject : public ATOMICGUI_DataObject, +class ATOMICGUI_EXPORT ATOMICGUI_ModuleObject : public ATOMICGUI_DataObject, public LightApp_ModuleObject { public: diff --git a/src/ATOMICGUI/ATOMICGUI_DeleteOp.h b/src/ATOMICGUI/ATOMICGUI_DeleteOp.h index 7b82f6d..4aa66ed 100644 --- a/src/ATOMICGUI/ATOMICGUI_DeleteOp.h +++ b/src/ATOMICGUI/ATOMICGUI_DeleteOp.h @@ -20,13 +20,15 @@ #ifndef ATOMICGUI_DELETEOP_OP_H #define ATOMICGUI_DELETEOP_OP_H +#include "ATOMICGUI_ATOMICGUI.hxx" + #include "ATOMICGUI_Operation.h" /*! * Class : ATOMICGUI_DeleteOp * Description : Operation for objects removal in ATOMIC component */ -class ATOMICGUI_DeleteOp : public ATOMICGUI_Operation +class ATOMICGUI_EXPORT ATOMICGUI_DeleteOp : public ATOMICGUI_Operation { Q_OBJECT diff --git a/src/ATOMICGUI/ATOMICGUI_ImportExportOp.h b/src/ATOMICGUI/ATOMICGUI_ImportExportOp.h index 12b9aac..d390f10 100644 --- a/src/ATOMICGUI/ATOMICGUI_ImportExportOp.h +++ b/src/ATOMICGUI/ATOMICGUI_ImportExportOp.h @@ -22,12 +22,14 @@ #include "ATOMICGUI_Operation.h" +#include "ATOMICGUI_ATOMICGUI.hxx" + /*! * Class : ATOMICGUI_ImportExportOp * Description : Operation for Import and Export of data structure to/from * an external file in XML format in ATOMIC component */ -class ATOMICGUI_ImportExportOp : public ATOMICGUI_Operation +class ATOMICGUI_EXPORT ATOMICGUI_ImportExportOp : public ATOMICGUI_Operation { Q_OBJECT diff --git a/src/ATOMICGUI/ATOMICGUI_Operation.h b/src/ATOMICGUI/ATOMICGUI_Operation.h index 206f93e..33557f2 100644 --- a/src/ATOMICGUI/ATOMICGUI_Operation.h +++ b/src/ATOMICGUI/ATOMICGUI_Operation.h @@ -20,6 +20,8 @@ #ifndef ATOMICGUI_OPERATION_H #define ATOMICGUI_OPERATION_H +#include "ATOMICGUI_ATOMICGUI.hxx" + #include class ATOMICGUI_DataModel; @@ -29,7 +31,7 @@ class ATOMICGUI; * Class : ATOMICGUI_AddAtomDlg * Description : Base Operation class for ATOMIC component */ -class ATOMICGUI_Operation : public LightApp_Operation +class ATOMICGUI_EXPORT ATOMICGUI_Operation : public LightApp_Operation { Q_OBJECT diff --git a/src/ATOMICGUI/ATOMICGUI_RenameOp.h b/src/ATOMICGUI/ATOMICGUI_RenameOp.h index c960de9..ba139a6 100644 --- a/src/ATOMICGUI/ATOMICGUI_RenameOp.h +++ b/src/ATOMICGUI/ATOMICGUI_RenameOp.h @@ -20,13 +20,15 @@ #ifndef ATOMICGUI_RENAME_OP_H #define ATOMICGUI_RENAME_OP_H +#include "ATOMICGUI_ATOMICGUI.hxx" + #include "ATOMICGUI_Operation.h" /*! * Class : ATOMICGUI_DeleteOp * Description : Operation for objects rename in ATOMIC component */ -class ATOMICGUI_RenameOp : public ATOMICGUI_Operation +class ATOMICGUI_EXPORT ATOMICGUI_RenameOp : public ATOMICGUI_Operation { Q_OBJECT diff --git a/src/ATOMICGUI/ATOMICGUI_Selection.h b/src/ATOMICGUI/ATOMICGUI_Selection.h index 25c3a76..7dd8cce 100644 --- a/src/ATOMICGUI/ATOMICGUI_Selection.h +++ b/src/ATOMICGUI/ATOMICGUI_Selection.h @@ -20,6 +20,8 @@ #if !defined(ATOMICGUI_SELECTION_H) #define ATOMICGUI_SELECTION_H +#include "ATOMICGUI_ATOMICGUI.hxx" + #include #include @@ -30,7 +32,7 @@ class LightApp_SelectionMgr; * Description : Selection class for ATOMIC component. * Computation of object parameters for popup manager. */ -class ATOMICGUI_Selection : public LightApp_Selection +class ATOMICGUI_EXPORT ATOMICGUI_Selection : public LightApp_Selection { public: ATOMICGUI_Selection (); diff --git a/src/ATOMICGUI/CMakeLists.txt b/src/ATOMICGUI/CMakeLists.txt index 22c061c..53b2e32 100644 --- a/src/ATOMICGUI/CMakeLists.txt +++ b/src/ATOMICGUI/CMakeLists.txt @@ -60,6 +60,7 @@ SET(_other_HEADERS ATOMICGUI_Data.h ATOMICGUI_DataObject.h ATOMICGUI_Selection.h + ATOMICGUI_ATOMICGUI.hxx ) # header files / to install @@ -83,7 +84,7 @@ SET(_other_SOURCES ATOMICGUI_CreateMolOp.cxx ATOMICGUI_RenameOp.cxx ATOMICGUI_DeleteOp.cxx - ATOMICGUI_ImportExportOp.cxx + ATOMICGUI_ImportExportOp.cxx ) # sources / to compile