ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-11-11 16:19:17 +05:00
Code Issues Packages Projects Releases Wiki Activity

Remove obsolete staff; redesign Handle-based and CDL-generated classes

Browse Source
This commit is contained in:
vsr 2014-10-21 17:45:02 +04:00
parent b7989b4db5
commit 3c1414974e
62 changed files with 234 additions and 2006 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BREPPlugin/BREPPlugin_GUI.cxx
View File

@ -29,7 +29,7 @@
#include <LightApp_SelectionMgr.h>
#include <SalomeApp_Application.h>
#include <SalomeApp_Study.h>
#include <SALOME_ListIteratorOfListIO.hxx>
#include <SALOME_ListIO.hxx>
// GEOM includes
#include "GeometryGUI.h"

1
src/BasicGUI/BasicGUI_CurveDlg.cxx
View File

@ -37,7 +37,6 @@
#include <SalomeApp_Study.h>
#include <LightApp_SelectionMgr.h>
#include <SALOME_ListIteratorOfListIO.hxx>
#include <SALOME_ListIO.hxx>
#include <TopoDS_Shape.hxx>

2
src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx
View File

@ -39,7 +39,7 @@
#include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <OCCViewer_ViewModel.h>
#include <SALOME_ListIteratorOfListIO.hxx>
#include <SALOME_ListIO.hxx>
//=================================================================================
// class : BlocksGUI_ExplodeDlg()

2
src/BooleanGUI/BooleanGUI_Dialog.cxx
View File

@ -35,7 +35,7 @@
#include <SUIT_ResourceMgr.h>
#include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <SALOME_ListIteratorOfListIO.hxx>
#include <SALOME_ListIO.hxx>
// VSR 22/08/2012: issue 0021787: remove "Preview" button from BOP and Partition operations
// Comment next line to enable preview in BOP dialog box

2
src/BuildGUI/BuildGUI_WireDlg.cxx
View File

@ -36,7 +36,7 @@
#include <SUIT_Session.h>
#include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <SALOME_ListIteratorOfListIO.hxx>
#include <SALOME_ListIO.hxx>
#include <TColStd_MapOfInteger.hxx>
#include <TColStd_IndexedMapOfInteger.hxx>

2
src/DependencyTree/DependencyTree_View.cxx
View File

@ -28,7 +28,7 @@
#include <SalomeApp_Study.h>
#include <QtxActionToolMgr.h>
#include <LightApp_SelectionMgr.h>
#include <SALOME_ListIteratorOfListIO.hxx>
#include <SALOME_ListIO.hxx>
// GEOM includes
#include <GEOMBase.h>

1
src/DependencyTree/DependencyTree_ViewModel.cxx
View File

@ -25,7 +25,6 @@
#include <SUIT_Session.h>
#include <SalomeApp_Study.h>
#include <LightApp_SelectionMgr.h>
#include <SALOME_ListIteratorOfListIO.hxx>
#include <SALOME_ListIO.hxx>
#include <OCCViewer_ViewManager.h>

1
src/DisplayGUI/DisplayGUI.cxx
View File

@ -40,7 +40,6 @@
#include <OCCViewer_ViewModel.h>
#include <SALOME_ListIO.hxx>
#include <SALOME_ListIteratorOfListIO.hxx>
#include <SVTK_ViewWindow.h>
#include <SVTK_View.h>

2
src/EntityGUI/EntityGUI.cxx
View File

@ -35,7 +35,7 @@
#include <OCCViewer_ViewModel.h>
#include <OCCViewer_ViewPort3d.h>
#include <OCCViewer_ViewWindow.h>
#include <SALOME_ListIteratorOfListIO.hxx>
#include <SALOME_ListIO.hxx>
#include <SUIT_Desktop.h>
#include <SUIT_MessageBox.h>
#include <SUIT_Session.h>

2
src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx
View File

@ -46,7 +46,7 @@
#include <LightApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <SALOME_ListIteratorOfListIO.hxx>
#include <SALOME_ListIO.hxx>
#include <SalomeApp_Study.h>

2
src/EntityGUI/EntityGUI_FieldDlg.cxx
View File

@ -42,7 +42,7 @@
#include <OCCViewer_ViewManager.h>
#include <SVTK_ViewModel.h>
#include <SALOME_Prs.h>
#include <SALOME_ListIteratorOfListIO.hxx>
#include <SALOME_ListIO.hxx>
#include <SUIT_Desktop.h>
#include <SUIT_MessageBox.h>

2
src/EntityGUI/EntityGUI_SubShapeDlg.cxx
View File

@ -35,7 +35,7 @@
#include <SalomeApp_Study.h>
#include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <SALOME_ListIteratorOfListIO.hxx>
#include <SALOME_ListIO.hxx>
#include <SUIT_Desktop.h>
#include <SUIT_ResourceMgr.h>

9
src/GEOM/CMakeLists.txt
View File

@ -48,9 +48,6 @@ SET(_link_LIBRARIES
SET(GEOM_HEADERS
GEOM_Application.hxx
GEOM_Application.ixx
GEOM_Application.jxx
Handle_GEOM_Application.hxx
GEOM_Engine.hxx
GEOM_Function.hxx
GEOM_Object.hxx
@ -61,10 +58,7 @@ SET(GEOM_HEADERS
GEOM_ISubShape.hxx
GEOM_Solver.hxx
GEOM_PythonDump.hxx
GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx
GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx
GEOM_DataMapOfAsciiStringTransient.hxx
Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx
GEOM_BaseObject.hxx
)
@ -82,9 +76,6 @@ SET(GEOM_SOURCES
GEOM_BaseDriver.cxx
GEOM_SubShapeDriver.cxx
GEOM_PythonDump.cxx
GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_0.cxx
GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient_0.cxx
GEOM_DataMapOfAsciiStringTransient_0.cxx
)
# --- rules ---

21
src/GEOM/GEOM_Application.cxx
View File

@ -20,8 +20,12 @@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include <Standard_Stream.hxx>
#include <GEOM_Application.ixx>
#include <GEOM_Application.hxx>
#include <TColStd_SequenceOfExtendedString.hxx>
IMPLEMENT_STANDARD_HANDLE (GEOM_Application, TDocStd_Application)
IMPLEMENT_STANDARD_RTTIEXT(GEOM_Application, TDocStd_Application)
//=======================================================================
//function : GEOM_Application
@ -32,6 +36,14 @@ GEOM_Application::GEOM_Application()
{
}
//=======================================================================
//function : ~GEOM_Application
//purpose :
//=======================================================================
GEOM_Application::~GEOM_Application()
{
}
//=======================================================================
//function : Formats
@ -53,8 +65,3 @@ Standard_CString GEOM_Application::ResourcesName()
{
return Standard_CString ("GEOMDS_Resources");
}

88
src/GEOM/GEOM_Application.hxx
View File

@ -20,92 +20,28 @@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// File : GEOM_Application.hxx
// Module : GEOM
//
#ifndef _GEOM_Application_HeaderFile
#define _GEOM_Application_HeaderFile
#ifndef _Standard_HeaderFile
#include <Standard.hxx>
#endif
#ifndef _Handle_GEOM_Application_HeaderFile
#include <Handle_GEOM_Application.hxx>
#endif
#ifndef _TDocStd_Application_HeaderFile
#include <TDocStd_Application.hxx>
#endif
#ifndef _Standard_CString_HeaderFile
#include <Standard_CString.hxx>
#endif
#include <Standard.hxx>
#include <Standard_DefineHandle.hxx>
class TColStd_SequenceOfExtendedString;
class GEOM_Application : public TDocStd_Application
{
public:
Standard_EXPORT GEOM_Application();
Standard_EXPORT ~GEOM_Application();
class GEOM_Application : public TDocStd_Application {
Standard_EXPORT virtual void Formats(TColStd_SequenceOfExtendedString& Formats);
Standard_EXPORT Standard_CString ResourcesName();
public:
inline void* operator new(size_t,void* anAddress)
{
return anAddress;
}
inline void* operator new(size_t size)
{
return Standard::Allocate(size);
}
inline void operator delete(void *anAddress)
{
if (anAddress) Standard::Free((Standard_Address&)anAddress);
}
// inline void operator delete(void *anAddress, size_t size)
// {
// if (anAddress) Standard::Free((Standard_Address&)anAddress,size);
// }
// Methods PUBLIC
//
Standard_EXPORT GEOM_Application();
Standard_EXPORT virtual void Formats(TColStd_SequenceOfExtendedString& Formats) ;
Standard_EXPORT Standard_CString ResourcesName() ;
Standard_EXPORT ~GEOM_Application();
// Type management
//
Standard_EXPORT friend Handle_Standard_Type& GEOM_Application_Type_();
Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
Standard_EXPORT Standard_Boolean IsKind(const Handle(Standard_Type)&) const;
protected:
// Methods PROTECTED
//
// Fields PROTECTED
//
private:
// Methods PRIVATE
//
// Fields PRIVATE
//
DEFINE_STANDARD_RTTI(GEOM_Application);
};
// other inline functions and methods (like "C++: function call" methods)
//
DEFINE_STANDARD_HANDLE(GEOM_Application, TDocStd_Application)
#endif

85
src/GEOM/GEOM_Application.ixx
View File

@ -1,85 +0,0 @@
// Copyright (C) 2007-2014 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, or (at your option) any later version.
//
// 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 : GEOM_Application.ixx
// Module : GEOM
//
#include "GEOM_Application.jxx"
#ifndef _Standard_TypeMismatch_HeaderFile
#include <Standard_TypeMismatch.hxx>
#endif
GEOM_Application::~GEOM_Application() {}
Standard_EXPORT Handle_Standard_Type& GEOM_Application_Type_()
{
static Handle_Standard_Type aType1 = STANDARD_TYPE(TDocStd_Application);
if ( aType1.IsNull()) aType1 = STANDARD_TYPE(TDocStd_Application);
static Handle_Standard_Type aType2 = STANDARD_TYPE(CDF_Application);
if ( aType2.IsNull()) aType2 = STANDARD_TYPE(CDF_Application);
static Handle_Standard_Type aType3 = STANDARD_TYPE(CDM_Application);
if ( aType3.IsNull()) aType3 = STANDARD_TYPE(CDM_Application);
static Handle_Standard_Type aType4 = STANDARD_TYPE(Standard_Transient);
if ( aType4.IsNull()) aType4 = STANDARD_TYPE(Standard_Transient);
static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,aType4,NULL};
static Handle_Standard_Type _aType = new Standard_Type("GEOM_Application",
sizeof(GEOM_Application),
1,
(Standard_Address)_Ancestors,
(Standard_Address)NULL);
return _aType;
}
// DownCast method
// allow safe downcasting
const Handle(GEOM_Application) Handle(GEOM_Application)::DownCast(const Handle(Standard_Transient)& AnObject)
{
Handle(GEOM_Application) _anOtherObject;
if (!AnObject.IsNull()) {
if (AnObject->IsKind(STANDARD_TYPE(GEOM_Application))) {
_anOtherObject = Handle(GEOM_Application)((Handle(GEOM_Application)&)AnObject);
}
}
return _anOtherObject ;
}
const Handle(Standard_Type)& GEOM_Application::DynamicType() const
{
return STANDARD_TYPE(GEOM_Application) ;
}
Standard_Boolean GEOM_Application::IsKind(const Handle(Standard_Type)& AType) const
{
return (STANDARD_TYPE(GEOM_Application) == AType || TDocStd_Application::IsKind(AType));
}
Handle_GEOM_Application::~Handle_GEOM_Application() {}

31
src/GEOM/GEOM_Application.jxx
View File

@ -1,31 +0,0 @@
// Copyright (C) 2007-2014 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, or (at your option) any later version.
//
// 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 : GEOM_Application.jxx
// Module : GEOM
//
#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
#include <TColStd_SequenceOfExtendedString.hxx>
#endif
#ifndef _GEOM_Application_HeaderFile
#include "GEOM_Application.hxx"
#endif

107
src/GEOM/GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx
View File

@ -1,107 +0,0 @@
// Copyright (C) 2007-2014 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, or (at your option) any later version.
//
// 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 _GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient_HeaderFile
#define _GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient_HeaderFile
#ifndef _TCollection_BasicMapIterator_HeaderFile
#include <TCollection_BasicMapIterator.hxx>
#endif
#ifndef _Handle_Standard_Transient_HeaderFile
#include <Handle_Standard_Transient.hxx>
#endif
#ifndef _Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_HeaderFile
#include <Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx>
#endif
class Standard_NoSuchObject;
class TCollection_AsciiString;
class Standard_Transient;
class GEOM_DataMapOfAsciiStringTransient;
class GEOM_DataMapNodeOfDataMapOfAsciiStringTransient;
#ifndef _Standard_HeaderFile
#include <Standard.hxx>
#endif
#ifndef _Standard_Macro_HeaderFile
#include <Standard_Macro.hxx>
#endif
class GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient : public TCollection_BasicMapIterator {
public:
void* operator new(size_t,void* anAddress)
{
return anAddress;
}
void* operator new(size_t size)
{
return Standard::Allocate(size);
}
void operator delete(void *anAddress)
{
if (anAddress) Standard::Free((Standard_Address&)anAddress);
}
// Methods PUBLIC
//
Standard_EXPORT GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient();
Standard_EXPORT GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient(const GEOM_DataMapOfAsciiStringTransient& aMap);
Standard_EXPORT void Initialize(const GEOM_DataMapOfAsciiStringTransient& aMap) ;
Standard_EXPORT const TCollection_AsciiString& Key() const;
Standard_EXPORT const Handle_Standard_Transient& Value() const;
protected:
// Methods PROTECTED
//
// Fields PROTECTED
//
private:
// Methods PRIVATE
//
// Fields PRIVATE
//
};
// other Inline functions and methods (like "C++: function call" methods)
//
#endif

57
src/GEOM/GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient_0.cxx
View File

@ -1,57 +0,0 @@
// Copyright (C) 2007-2014 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, or (at your option) any later version.
//
// 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
//
#include <GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx>
#ifndef _Standard_NoSuchObject_HeaderFile
#include <Standard_NoSuchObject.hxx>
#endif
#ifndef _TCollection_AsciiString_HeaderFile
#include <TCollection_AsciiString.hxx>
#endif
#ifndef _Standard_Transient_HeaderFile
#include <Standard_Transient.hxx>
#endif
#ifndef _GEOM_DataMapOfAsciiStringTransient_HeaderFile
#include <GEOM_DataMapOfAsciiStringTransient.hxx>
#endif
#ifndef _GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_HeaderFile
#include <GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx>
#endif
#define TheKey TCollection_AsciiString
#define TheKey_hxx <TCollection_AsciiString.hxx>
#define TheItem Handle_Standard_Transient
#define TheItem_hxx <Standard_Transient.hxx>
#define Hasher TCollection_AsciiString
#define Hasher_hxx <TCollection_AsciiString.hxx>
#define TCollection_DataMapNode GEOM_DataMapNodeOfDataMapOfAsciiStringTransient
#define TCollection_DataMapNode_hxx <GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx>
#define TCollection_DataMapIterator GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient
#define TCollection_DataMapIterator_hxx <GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx>
#define Handle_TCollection_DataMapNode Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient
#define TCollection_DataMapNode_Type_() GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_Type_()
#define TCollection_DataMap GEOM_DataMapOfAsciiStringTransient
#define TCollection_DataMap_hxx <GEOM_DataMapOfAsciiStringTransient.hxx>
#include <TCollection_DataMapIterator.gxx>

144
src/GEOM/GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx
View File

@ -1,144 +0,0 @@
// Copyright (C) 2007-2014 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, or (at your option) any later version.
//
// 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 _GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_HeaderFile
#define _GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_HeaderFile
#ifndef _Standard_HeaderFile
#include <Standard.hxx>
#endif
#ifndef _Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_HeaderFile
#include <Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx>
#endif
#ifndef _TCollection_AsciiString_HeaderFile
#include <TCollection_AsciiString.hxx>
#endif
#ifndef _Handle_Standard_Transient_HeaderFile
#include <Handle_Standard_Transient.hxx>
#endif
#ifndef _TCollection_MapNode_HeaderFile
#include <TCollection_MapNode.hxx>
#endif
#ifndef _TCollection_MapNodePtr_HeaderFile
#include <TCollection_MapNodePtr.hxx>
#endif
class Standard_Transient;
class TCollection_AsciiString;
class GEOM_DataMapOfAsciiStringTransient;
class GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient;
class GEOM_DataMapNodeOfDataMapOfAsciiStringTransient : public TCollection_MapNode {
public:
void* operator new(size_t,void* anAddress)
{
return anAddress;
}
void* operator new(size_t size)
{
return Standard::Allocate(size);
}
void operator delete(void *anAddress)
{
if (anAddress) Standard::Free((Standard_Address&)anAddress);
}
// Methods PUBLIC
//
GEOM_DataMapNodeOfDataMapOfAsciiStringTransient(const TCollection_AsciiString& K,const Handle(Standard_Transient)& I,const TCollection_MapNodePtr& n);
TCollection_AsciiString& Key() const;
Handle_Standard_Transient& Value() const;
Standard_EXPORT ~GEOM_DataMapNodeOfDataMapOfAsciiStringTransient();
// Type management
//
Standard_EXPORT friend Handle_Standard_Type& GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_Type_();
Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
Standard_EXPORT Standard_Boolean IsKind(const Handle(Standard_Type)&) const;
protected:
// Methods PROTECTED
//
// Fields PROTECTED
//
private:
// Methods PRIVATE
//
// Fields PRIVATE
//
TCollection_AsciiString myKey;
Handle_Standard_Transient myValue;
};
#define TheKey TCollection_AsciiString
#define TheKey_hxx <TCollection_AsciiString.hxx>
#define TheItem Handle_Standard_Transient
#define TheItem_hxx <Standard_Transient.hxx>
#define Hasher TCollection_AsciiString
#define Hasher_hxx <TCollection_AsciiString.hxx>
#define TCollection_DataMapNode GEOM_DataMapNodeOfDataMapOfAsciiStringTransient
#define TCollection_DataMapNode_hxx <GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx>
#define TCollection_DataMapIterator GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient
#define TCollection_DataMapIterator_hxx <GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx>
#define Handle_TCollection_DataMapNode Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient
#define TCollection_DataMapNode_Type_() GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_Type_()
#define TCollection_DataMap GEOM_DataMapOfAsciiStringTransient
#define TCollection_DataMap_hxx <GEOM_DataMapOfAsciiStringTransient.hxx>
#include <TCollection_DataMapNode.lxx>
#undef TheKey
#undef TheKey_hxx
#undef TheItem
#undef TheItem_hxx
#undef Hasher
#undef Hasher_hxx
#undef TCollection_DataMapNode
#undef TCollection_DataMapNode_hxx
#undef TCollection_DataMapIterator
#undef TCollection_DataMapIterator_hxx
#undef Handle_TCollection_DataMapNode
#undef TCollection_DataMapNode_Type_
#undef TCollection_DataMap
#undef TCollection_DataMap_hxx
// other Inline functions and methods (like "C++: function call" methods)
//
#endif

106
src/GEOM/GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_0.cxx
View File

@ -1,106 +0,0 @@
// Copyright (C) 2007-2014 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, or (at your option) any later version.
//
// 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
//
#include <GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx>
#ifndef _Standard_TypeMismatch_HeaderFile
#include <Standard_TypeMismatch.hxx>
#endif
#ifndef _Standard_Transient_HeaderFile
#include <Standard_Transient.hxx>
#endif
#ifndef _TCollection_AsciiString_HeaderFile
#include <TCollection_AsciiString.hxx>
#endif
#ifndef _GEOM_DataMapOfAsciiStringTransient_HeaderFile
#include <GEOM_DataMapOfAsciiStringTransient.hxx>
#endif
#ifndef _GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient_HeaderFile
#include <GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx>
#endif
GEOM_DataMapNodeOfDataMapOfAsciiStringTransient::~GEOM_DataMapNodeOfDataMapOfAsciiStringTransient() {}
Standard_EXPORT Handle_Standard_Type& GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_Type_()
{
static Handle_Standard_Type aType1 = STANDARD_TYPE(TCollection_MapNode);
if ( aType1.IsNull()) aType1 = STANDARD_TYPE(TCollection_MapNode);
static Handle_Standard_Type aType2 = STANDARD_TYPE(MMgt_TShared);
if ( aType2.IsNull()) aType2 = STANDARD_TYPE(MMgt_TShared);
static Handle_Standard_Type aType3 = STANDARD_TYPE(Standard_Transient);
if ( aType3.IsNull()) aType3 = STANDARD_TYPE(Standard_Transient);
static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
static Handle_Standard_Type _aType = new Standard_Type("GEOM_DataMapNodeOfDataMapOfAsciiStringTransient",
sizeof(GEOM_DataMapNodeOfDataMapOfAsciiStringTransient),
1,
(Standard_Address)_Ancestors,
(Standard_Address)NULL);
return _aType;
}
// DownCast method
// allow safe downcasting
//
const Handle(GEOM_DataMapNodeOfDataMapOfAsciiStringTransient) Handle(GEOM_DataMapNodeOfDataMapOfAsciiStringTransient)::DownCast(const Handle(Standard_Transient)& AnObject)
{
Handle(GEOM_DataMapNodeOfDataMapOfAsciiStringTransient) _anOtherObject;
if (!AnObject.IsNull()) {
if (AnObject->IsKind(STANDARD_TYPE(GEOM_DataMapNodeOfDataMapOfAsciiStringTransient))) {
_anOtherObject = Handle(GEOM_DataMapNodeOfDataMapOfAsciiStringTransient)((Handle(GEOM_DataMapNodeOfDataMapOfAsciiStringTransient)&)AnObject);
}
}
return _anOtherObject ;
}
const Handle(Standard_Type)& GEOM_DataMapNodeOfDataMapOfAsciiStringTransient::DynamicType() const
{
return STANDARD_TYPE(GEOM_DataMapNodeOfDataMapOfAsciiStringTransient) ;
}
Standard_Boolean GEOM_DataMapNodeOfDataMapOfAsciiStringTransient::IsKind(const Handle(Standard_Type)& AType) const
{
return (STANDARD_TYPE(GEOM_DataMapNodeOfDataMapOfAsciiStringTransient) == AType || TCollection_MapNode::IsKind(AType));
}
Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient::~Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient() {}
#define TheKey TCollection_AsciiString
#define TheKey_hxx <TCollection_AsciiString.hxx>
#define TheItem Handle_Standard_Transient
#define TheItem_hxx <Standard_Transient.hxx>
#define Hasher TCollection_AsciiString
#define Hasher_hxx <TCollection_AsciiString.hxx>
#define TCollection_DataMapNode GEOM_DataMapNodeOfDataMapOfAsciiStringTransient
#define TCollection_DataMapNode_hxx <GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx>
#define TCollection_DataMapIterator GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient
#define TCollection_DataMapIterator_hxx <GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx>
#define Handle_TCollection_DataMapNode Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient
#define TCollection_DataMapNode_Type_() GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_Type_()
#define TCollection_DataMap GEOM_DataMapOfAsciiStringTransient
#define TCollection_DataMap_hxx <GEOM_DataMapOfAsciiStringTransient.hxx>
#include <TCollection_DataMapNode.gxx>

97
src/GEOM/GEOM_DataMapOfAsciiStringTransient.hxx
View File

@ -23,96 +23,11 @@
#ifndef _GEOM_DataMapOfAsciiStringTransient_HeaderFile
#define _GEOM_DataMapOfAsciiStringTransient_HeaderFile
#ifndef _TCollection_BasicMap_HeaderFile
#include <TCollection_BasicMap.hxx>
#endif
#ifndef _Handle_Standard_Transient_HeaderFile
#include <Handle_Standard_Transient.hxx>
#endif
#ifndef _Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_HeaderFile
#include <Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx>
#endif
#ifndef _Standard_Integer_HeaderFile
#include <Standard_Integer.hxx>
#endif
#ifndef _Standard_Boolean_HeaderFile
#include <Standard_Boolean.hxx>
#endif
#include <NCollection_DataMap.hxx>
#include <Standard_Transient.hxx>
#include <TCollection_AsciiString.hxx>
class Standard_DomainError;
class Standard_NoSuchObject;
class TCollection_AsciiString;
class Standard_Transient;
class GEOM_DataMapNodeOfDataMapOfAsciiStringTransient;
class GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient;
typedef NCollection_DataMap<TCollection_AsciiString, Handle(Standard_Transient)> GEOM_DataMapOfAsciiStringTransient;
typedef GEOM_DataMapOfAsciiStringTransient::Iterator GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient;
#ifndef _Standard_HeaderFile
#include <Standard.hxx>
#endif
#ifndef _Standard_Macro_HeaderFile
#include <Standard_Macro.hxx>
#endif
#include <Basics_OCCTVersion.hxx>
class GEOM_DataMapOfAsciiStringTransient : public TCollection_BasicMap {
public:
void* operator new(size_t,void* anAddress)
{
return anAddress;
}
void* operator new(size_t size)
{
return Standard::Allocate(size);
}
void operator delete(void *anAddress)
{
if (anAddress) Standard::Free((Standard_Address&)anAddress);
}
// Methods PUBLIC
//
Standard_EXPORT GEOM_DataMapOfAsciiStringTransient(const Standard_Integer NbBuckets = 1);
Standard_EXPORT GEOM_DataMapOfAsciiStringTransient& Assign(const GEOM_DataMapOfAsciiStringTransient& Other) ;
GEOM_DataMapOfAsciiStringTransient& operator =(const GEOM_DataMapOfAsciiStringTransient& Other)
{
return Assign(Other);
}
Standard_EXPORT void ReSize(const Standard_Integer NbBuckets) ;
Standard_EXPORT void Clear() ;
~GEOM_DataMapOfAsciiStringTransient()
{
Clear();
}
Standard_EXPORT Standard_Boolean Bind(const TCollection_AsciiString& K,const Handle(Standard_Transient)& I) ;
Standard_EXPORT Standard_Boolean IsBound(const TCollection_AsciiString& K) const;
Standard_EXPORT Standard_Boolean UnBind(const TCollection_AsciiString& K) ;
Standard_EXPORT const Handle_Standard_Transient& Find(const TCollection_AsciiString& K) const;
const Handle_Standard_Transient& operator()(const TCollection_AsciiString& K) const
{
return Find(K);
}
Standard_EXPORT Handle_Standard_Transient& ChangeFind(const TCollection_AsciiString& K) ;
Handle_Standard_Transient& operator()(const TCollection_AsciiString& K)
{
return ChangeFind(K);
}
Standard_EXPORT Standard_Address Find1 (const TCollection_AsciiString& K) const;
Standard_EXPORT Standard_Address ChangeFind1 (const TCollection_AsciiString& K);
private:
// Methods PRIVATE
//
Standard_EXPORT GEOM_DataMapOfAsciiStringTransient(const GEOM_DataMapOfAsciiStringTransient& Other);
};
// other Inline functions and methods (like "C++: function call" methods)
//
#endif
#endif // _GEOM_DataMapOfAsciiStringTransient_HeaderFile

60
src/GEOM/GEOM_DataMapOfAsciiStringTransient_0.cxx
View File

@ -1,60 +0,0 @@
// Copyright (C) 2007-2014 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, or (at your option) any later version.
//
// 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
//
#include <GEOM_DataMapOfAsciiStringTransient.hxx>
#ifndef _Standard_DomainError_HeaderFile
#include <Standard_DomainError.hxx>
#endif
#ifndef _Standard_NoSuchObject_HeaderFile
#include <Standard_NoSuchObject.hxx>
#endif
#ifndef _TCollection_AsciiString_HeaderFile
#include <TCollection_AsciiString.hxx>
#endif
#ifndef _Standard_Transient_HeaderFile
#include <Standard_Transient.hxx>
#endif
#ifndef _GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_HeaderFile
#include <GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx>
#endif
#ifndef _GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient_HeaderFile
#include <GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx>
#endif
#define TheKey TCollection_AsciiString
#define TheKey_hxx <TCollection_AsciiString.hxx>
#define TheItem Handle_Standard_Transient
#define TheItem_hxx <Standard_Transient.hxx>
#define Hasher TCollection_AsciiString
#define Hasher_hxx <TCollection_AsciiString.hxx>
#define TCollection_DataMapNode GEOM_DataMapNodeOfDataMapOfAsciiStringTransient
#define TCollection_DataMapNode_hxx <GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx>
#define TCollection_DataMapIterator GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient
#define TCollection_DataMapIterator_hxx <GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx>
#define Handle_TCollection_DataMapNode Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient
#define TCollection_DataMapNode_Type_() GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_Type_()
#define TCollection_DataMap GEOM_DataMapOfAsciiStringTransient
#define TCollection_DataMap_hxx <GEOM_DataMapOfAsciiStringTransient.hxx>
#include <TCollection_DataMap.gxx>

1
src/GEOM/GEOM_Engine.cxx
View File

@ -26,7 +26,6 @@
#include "GEOM_Engine.hxx"
#include "GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx"
#include "GEOM_Field.hxx"
#include "GEOM_Function.hxx"
#include "GEOM_ISubShape.hxx"

99
src/GEOM/Handle_GEOM_Application.hxx
View File

@ -1,99 +0,0 @@
// Copyright (C) 2007-2014 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, or (at your option) any later version.
//
// 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 : Handle_GEOM_Application.hxx
// Module : GEOM
//
#ifndef _Handle_GEOM_Application_HeaderFile
#define _Handle_GEOM_Application_HeaderFile
#ifndef _Standard_Macro_HeaderFile
#include <Standard_Macro.hxx>
#endif
#ifndef _Standard_HeaderFile
#include <Standard.hxx>
#endif
#ifndef _Handle_TDocStd_Application_HeaderFile
#include <Handle_TDocStd_Application.hxx>
#endif
class Standard_Transient;
class Handle_Standard_Type;
class Handle(TDocStd_Application);
class GEOM_Application;
Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(SimpleOCAF_Application);
class Handle(GEOM_Application) : public Handle(TDocStd_Application) {
public:
inline void* operator new(size_t,void* anAddress)
{
return anAddress;
}
inline void* operator new(size_t size)
{
return Standard::Allocate(size);
}
inline void operator delete(void *anAddress)
{
if (anAddress) Standard::Free((Standard_Address&)anAddress);
}
// inline void operator delete(void *anAddress, size_t size)
// {
// if (anAddress) Standard::Free((Standard_Address&)anAddress,size);
// }
Handle(GEOM_Application)():Handle(TDocStd_Application)() {}
Handle(GEOM_Application)(const Handle(GEOM_Application)& aHandle) : Handle(TDocStd_Application)(aHandle)
{
}
Handle(GEOM_Application)(const GEOM_Application* anItem) : Handle(TDocStd_Application)((TDocStd_Application *)anItem)
{
}
Handle(GEOM_Application)& operator=(const Handle(GEOM_Application)& aHandle)
{
Assign(aHandle.Access());
return *this;
}
Handle(GEOM_Application)& operator=(const GEOM_Application* anItem)
{
Assign((Standard_Transient *)anItem);
return *this;
}
GEOM_Application* operator->()
{
return (GEOM_Application *)ControlAccess();
}
GEOM_Application* operator->() const
{
return (GEOM_Application *)ControlAccess();
}
Standard_EXPORT ~Handle(GEOM_Application)();
Standard_EXPORT static const Handle(GEOM_Application) DownCast(const Handle(Standard_Transient)& AnObject);
};
#endif

95
src/GEOM/Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx
View File

@ -1,95 +0,0 @@
// Copyright (C) 2007-2014 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, or (at your option) any later version.
//
// 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 : Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx
// Module : GEOM
//
#ifndef _Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_HeaderFile
#define _Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_HeaderFile
#ifndef _Standard_Macro_HeaderFile
#include <Standard_Macro.hxx>
#endif
#ifndef _Standard_HeaderFile
#include <Standard.hxx>
#endif
#ifndef _Handle_TCollection_MapNode_HeaderFile
#include <Handle_TCollection_MapNode.hxx>
#endif
class Standard_Transient;
class Handle_Standard_Type;
class Handle(TCollection_MapNode);
class GEOM_DataMapNodeOfDataMapOfAsciiStringTransient;
Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(GEOM_DataMapNodeOfDataMapOfAsciiStringTransient);
class Handle(GEOM_DataMapNodeOfDataMapOfAsciiStringTransient) : public Handle(TCollection_MapNode) {
public:
void* operator new(size_t,void* anAddress)
{
return anAddress;
}
void* operator new(size_t size)
{
return Standard::Allocate(size);
}
void operator delete(void *anAddress)
{
if (anAddress) Standard::Free((Standard_Address&)anAddress);
}
Handle(GEOM_DataMapNodeOfDataMapOfAsciiStringTransient)():Handle(TCollection_MapNode)() {}
Handle(GEOM_DataMapNodeOfDataMapOfAsciiStringTransient)(const Handle(GEOM_DataMapNodeOfDataMapOfAsciiStringTransient)& aHandle) : Handle(TCollection_MapNode)(aHandle)
{
}
Handle(GEOM_DataMapNodeOfDataMapOfAsciiStringTransient)(const GEOM_DataMapNodeOfDataMapOfAsciiStringTransient* anItem) : Handle(TCollection_MapNode)((TCollection_MapNode *)anItem)
{
}
Handle(GEOM_DataMapNodeOfDataMapOfAsciiStringTransient)& operator=(const Handle(GEOM_DataMapNodeOfDataMapOfAsciiStringTransient)& aHandle)
{
Assign(aHandle.Access());
return *this;
}
Handle(GEOM_DataMapNodeOfDataMapOfAsciiStringTransient)& operator=(const GEOM_DataMapNodeOfDataMapOfAsciiStringTransient* anItem)
{
Assign((Standard_Transient *)anItem);
return *this;
}
GEOM_DataMapNodeOfDataMapOfAsciiStringTransient* operator->()
{
return (GEOM_DataMapNodeOfDataMapOfAsciiStringTransient *)ControlAccess();
}
GEOM_DataMapNodeOfDataMapOfAsciiStringTransient* operator->() const
{
return (GEOM_DataMapNodeOfDataMapOfAsciiStringTransient *)ControlAccess();
}
Standard_EXPORT ~Handle(GEOM_DataMapNodeOfDataMapOfAsciiStringTransient)();
Standard_EXPORT static const Handle(GEOM_DataMapNodeOfDataMapOfAsciiStringTransient) DownCast(const Handle(Standard_Transient)& AnObject);
};
#endif

1
src/GEOMBase/GEOMBase.cxx
View File

@ -40,7 +40,6 @@
#include <SOCC_Prs.h>
#include <SALOME_ListIO.hxx>
#include <SALOME_ListIteratorOfListIO.hxx>
#include <SUIT_Desktop.h>
#include <SUIT_Session.h>

2
src/GEOMBase/GEOMBase_Helper.cxx
View File

@ -45,7 +45,7 @@
#include <LightApp_SelectionMgr.h>
#include <LightApp_DataOwner.h>
#include <SalomeApp_Tools.h>
#include <SALOME_ListIteratorOfListIO.hxx>
#include <SALOME_ListIO.hxx>
#include <SALOME_Prs.h>

5
src/GEOMGUI/GEOM_Displayer.cxx
View File

@ -65,7 +65,6 @@
#include <SalomeApp_TypeFilter.h>
#include <SalomeApp_Tools.h>
#include <SALOME_ListIteratorOfListIO.hxx>
#include <SALOME_ListIO.hxx>
#include <SALOME_Prs.h>
@ -235,6 +234,7 @@ namespace
if ( aAISShape.IsNull() )
continue;
#ifdef USE_TEXTURED_SHAPE
const Handle(Image_PixMap)& aPixmap = aAISShape->TexturePixMap();
if ( aPixmap.IsNull() )
continue;
@ -250,6 +250,7 @@ namespace
aPixmapUsersMap.UnBind( aPixmap );
aPixmapCacheMap.remove( aPixmapCacheMap.key( aPixmap ) );
}
#endif
}
}
}
@ -876,6 +877,7 @@ void GEOM_Displayer::updateShapeProperties( const Handle(GEOM_AISShape)& AISShap
aImagePath = propMap.value( GEOM::propertyName( GEOM::Texture ) ).toString();
}
#ifdef USE_TEXTURED_SHAPE
Handle(Image_PixMap) aPixmap;
if ( !aImagePath.isEmpty() )
aPixmap = cacheTextureFor( aImagePath, AISShape );
@ -891,6 +893,7 @@ void GEOM_Displayer::updateShapeProperties( const Handle(GEOM_AISShape)& AISShap
else {
AISShape->SetTextureMapOff();
}
#endif
// set line width
AISShape->SetWidth( HasWidth() ?

3
src/GEOMGUI/GeometryGUI.cxx
View File

@ -78,8 +78,7 @@
#include <LightApp_Preferences.h>
#include <SALOME_LifeCycleCORBA.hxx>
// #include <SALOME_ListIO.hxx>
#include <SALOME_ListIteratorOfListIO.hxx>
#include <SALOME_ListIO.hxx>
#include <SALOMEDSClient_ClientFactory.hxx>
#include <SALOMEDSClient_IParameters.hxx>

1
src/GEOMToolsGUI/GEOMToolsGUI.cxx
View File

@ -48,7 +48,6 @@
#include <GEOMImpl_Types.hxx>
#include <SALOME_ListIO.hxx>
#include <SALOME_ListIteratorOfListIO.hxx>
#include <SALOME_Prs.h>
// QT Includes

1
src/GEOMToolsGUI/GEOMToolsGUI_1.cxx
View File

@ -54,7 +54,6 @@
#include <Basics_OCCTVersion.hxx>
#include <SALOME_ListIO.hxx>
#include <SALOME_ListIteratorOfListIO.hxx>
#include <SALOMEDS_SObject.hxx>

1
src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx
View File

@ -38,7 +38,6 @@
#include <SalomeApp_Application.h>
#include <SalomeApp_Study.h>
#include <SALOME_ListIO.hxx>
#include <SALOME_ListIteratorOfListIO.hxx>
#include <QButtonGroup>
#include <QGridLayout>

2
src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.cxx
View File

@ -36,7 +36,7 @@
#include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h>
#include <SUIT_ViewManager.h>
#include <SALOME_ListIteratorOfListIO.hxx>
#include <SALOME_ListIO.hxx>
#include <OCCViewer_ViewModel.h>
#include <SVTK_ViewModel.h>
#include <SVTK_ViewWindow.h>

2
src/GEOMToolsGUI/GEOMToolsGUI_ReduceStudyDlg.cxx
View File

@ -32,7 +32,7 @@
#include <SalomeApp_Application.h>
#include <SalomeApp_Study.h>
#include <SALOME_ListIteratorOfListIO.hxx>
#include <SALOME_ListIO.hxx>
// Qt includes
#include <QGridLayout>

1
src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx
View File

@ -31,7 +31,6 @@
#include <GEOM_Constants.h>
#include <SALOME_ListIO.hxx>
#include <SALOME_ListIteratorOfListIO.hxx>
#include <SVTK_ViewModel.h>
#include <SVTK_ViewWindow.h>

2
src/GroupGUI/GroupGUI_GroupDlg.cxx
View File

@ -41,7 +41,7 @@
#include <OCCViewer_ViewManager.h>
#include <SVTK_ViewModel.h>
#include <SALOME_Prs.h>
#include <SALOME_ListIteratorOfListIO.hxx>
#include <SALOME_ListIO.hxx>
#include <SUIT_Desktop.h>
#include <SUIT_MessageBox.h>

2
src/IGESPlugin/IGESPlugin_GUI.cxx
View File

@ -30,7 +30,7 @@
#include <LightApp_SelectionMgr.h>
#include <SalomeApp_Application.h>
#include <SalomeApp_Study.h>
#include <SALOME_ListIteratorOfListIO.hxx>
#include <SALOME_ListIO.hxx>
// GEOM includes
#include "GeometryGUI.h"

9
src/OBJECT/CMakeLists.txt
View File

@ -65,17 +65,8 @@ SET(_link_LIBRARIES
SET(OBJECT_HEADERS
GEOM_Actor.h
GEOM_AISShape.hxx
GEOM_AISShape.ixx
GEOM_AISShape.jxx
Handle_GEOM_AISShape.hxx
GEOM_TopWireframeShape.hxx
GEOM_TopWireframeShape.ixx
GEOM_TopWireframeShape.jxx
Handle_GEOM_TopWireframeShape.hxx
GEOM_InteractiveObject.hxx
GEOM_InteractiveObject.ixx
GEOM_InteractiveObject.jxx
Handle_GEOM_InteractiveObject.hxx
GEOM_AISTrihedron.hxx
GEOM_VTKTrihedron.hxx
GEOM_VTKPropertyMaterial.hxx

50
src/OBJECT/GEOM_AISShape.cxx
View File

@ -20,18 +20,12 @@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// GEOM OBJECT : interactive object for Geometry entities visualization
// File : GEOM_AISShape.cxx
// Author : Nicolas REJNERI
// Module : GEOM
/*!
\class GEOM_AISShape GEOM_AISShape.hxx
\brief ....
*/
#include "GEOM_AISShape.ixx"
#include "SALOME_InteractiveObject.hxx"
#include "GEOM_AISShape.hxx"
#include "GEOM_AISVector.hxx"
#include <Basics_OCCTVersion.hxx>
@ -39,9 +33,7 @@
// Open CASCADE Includes
#include <AIS_Drawer.hxx>
#include <AIS_InteractiveContext.hxx>
#include <BRep_Tool.hxx>
#include <GCPnts_AbscissaPoint.hxx>
#include <GeomAdaptor_Curve.hxx>
#include <gp_Pnt.hxx>
@ -86,10 +78,12 @@
#include <V3d_View.hxx>
#include <SalomeApp_Tools.h>
#include <SUIT_Session.h>
#include <SUIT_ResourceMgr.h>
IMPLEMENT_STANDARD_HANDLE (GEOM_AISShape, SALOME_AISShape)
IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISShape, SALOME_AISShape)
GEOM_AISShape::TopLevelDispMode GEOM_AISShape::myTopLevelDm = GEOM_AISShape::TopKeepCurrent;
Quantity_Color GEOM_AISShape::myTopLevelColor;
@ -181,6 +175,10 @@ GEOM_AISShape::GEOM_AISShape(const TopoDS_Shape& shape,
}
}
GEOM_AISShape::~GEOM_AISShape()
{
}
void GEOM_AISShape::setIO(const Handle(SALOME_InteractiveObject)& io){
SetOwner( io );
}
@ -233,7 +231,7 @@ void GEOM_AISShape::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresent
// StdSelect_DisplayMode d = (StdSelect_DisplayMode) aMode;
bool isTopLev = isTopLevel() && switchTopLevel();
switch (aMode) {
case 0://StdSelect_DM_Wireframe:
case Wireframe:
case CustomHighlight:
{
if(isTopLev) {
@ -248,26 +246,30 @@ void GEOM_AISShape::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresent
StdPrs_WFDeflectionShape::Add(aPrs,myshape,myDrawer);
break;
}
case 1://StdSelect_DM_Shading:
case Shading:
{
shadingMode(aPresentationManager, aPrs, aMode);
break;
}
case 2: { //ShadingWithEdges
//Shaded faces
shadingMode(aPresentationManager, aPrs, AIS_Shaded);
case ShadingWithEdges:
{
shadingMode(aPresentationManager, aPrs, Shading);
myDrawer->SetFaceBoundaryDraw( Standard_True );
Handle(Prs3d_LineAspect) aBoundaryAspect =
new Prs3d_LineAspect ( myEdgesInShadingColor, Aspect_TOL_SOLID, myOwnWidth );
myDrawer->SetFaceBoundaryAspect (aBoundaryAspect);
break;
}
case 3: //StdSelect_DM_HLR:
case TexturedShape:
{
if(!isTopLev)
AIS_TexturedShape::Compute(aPresentationManager, aPrs, aMode);
#ifdef USE_TEXTURED_SHAPE
AIS_TexturedShape::Compute(aPresentationManager, aPrs, aMode);
#else
AIS_Shape::Compute(aPresentationManager, aPrs, aMode);
#endif
else
shadingMode(aPresentationManager, aPrs, AIS_Shaded);
shadingMode(aPresentationManager, aPrs, Shading);
break;
}
}
@ -410,7 +412,11 @@ void GEOM_AISShape::shadingMode(const Handle(PrsMgr_PresentationManager3d)& aPre
{
// PAL12113: AIS_Shape::Compute() works correctly with shapes containing no faces
//StdPrs_ShadedShape::Add(aPrs,myshape,myDrawer);
#ifdef USE_TEXTURED_SHAPE
AIS_TexturedShape::Compute(aPresentationManager, aPrs, aMode);
#else
AIS_Shape::Compute(aPresentationManager, aPrs, aMode);
#endif
}
}
@ -424,10 +430,10 @@ void GEOM_AISShape::setTopLevel(Standard_Boolean f) {
myPrevDisplayMode = DisplayMode();
Standard_Integer dm;
switch(topLevelDisplayMode()) {
case TopKeepCurrent : dm = myPrevDisplayMode; break;
case TopWireFrame : dm = AIS_WireFrame; break;
case TopShadingWithEdges : dm = ShadingWithEdges; break;
default : dm = AIS_Shaded; break;
case TopKeepCurrent : dm = myPrevDisplayMode; break;
case TopWireFrame : dm = Wireframe; break;
case TopShadingWithEdges : dm = ShadingWithEdges; break;
default : dm = Shading; break;
}
SetDisplayMode(dm);
} else {

221
src/OBJECT/GEOM_AISShape.hxx
View File

@ -20,168 +20,119 @@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// GEOM OBJECT : interactive object for Geometry entities visualization
// File : GEOM_AISShape.hxx
// Module : GEOM
//
#ifndef _GEOM_AISShape_HeaderFile
#define _GEOM_AISShape_HeaderFile
#include "GEOM_OBJECT_defs.hxx"
#include <SALOME_AISShape.hxx>
#include <SALOME_InteractiveObject.hxx>
#include <GEOM_Gen.hh>
#ifndef _Standard_HeaderFile
#include <Standard.hxx>
#endif
#ifndef _Handle_GEOM_AISShape_HeaderFile
#include "Handle_GEOM_AISShape.hxx"
#endif
#ifndef _Handle_SALOME_InteractiveObject_HeaderFile
#include "Handle_SALOME_InteractiveObject.hxx"
#endif
#ifndef _Standard_CString_HeaderFile
#include <Standard_CString.hxx>
#endif
#ifndef _SALOME_AISShape_HeaderFile
#include "SALOME_AISShape.hxx"
#endif
#ifndef _Standard_Boolean_HeaderFile
#include <Standard_Boolean.hxx>
#endif
#ifndef _PrsMgr_PresentationManager_HeaderFile
#include <Standard_DefineHandle.hxx>
#include <PrsMgr_PresentationManager.hxx>
#endif
#ifndef _Handle_Prs3d_Presentation_HeaderFile
#include <Handle_Prs3d_Presentation.hxx>
#endif
#include <TCollection_AsciiString.hxx>
#include <AIS_DisplayMode.hxx>
#include <Graphic3d_MaterialAspect.hxx>
#include <QList>
#include <QVariant>
class Prs3d_Presentation;
class SALOME_InteractiveObject;
#include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(GEOM_Gen)
class TopoDS_Shape;
class GEOM_OBJECT_EXPORT GEOM_AISShape : public SALOME_AISShape {
class GEOM_AISShape : public SALOME_AISShape
{
public:
//! Enumeration of display modes
typedef enum {
Wireframe = AIS_WireFrame, //!< wireframe
Shading = AIS_Shaded, //!< shadin
ShadingWithEdges, //!< shading with edges
TexturedShape, //!< texture
CustomHighlight //!< fields
} DispMode;
//! Enumeration of display modes
typedef enum {
//WireFrame, //!< the same as AIS_WireFrame
//Shading, //!< the same as AIS_Shaded
ShadingWithEdges = AIS_Shaded+1, //!< shading with edges
TexturedShape = ShadingWithEdges+1, //!< the same as AIS_ExactHLR
CustomHighlight = TexturedShape+1
} DispMode;
//! Enumeration of top level display modes
typedef enum {
TopShowAdditionalWActor = 0,
TopKeepCurrent, //!< Keep current display mode
TopWireFrame,
TopShading,
TopShadingWithEdges,
} TopLevelDispMode;
Standard_EXPORT GEOM_AISShape(const TopoDS_Shape& shape, const Standard_CString aName);
Standard_EXPORT ~GEOM_AISShape();
//! Enumeration of top level display modes
typedef enum {
TopShowAdditionalWActor = 0,
TopKeepCurrent, //!< Keep current display mode
TopWireFrame,
TopShading,
TopShadingWithEdges,
} TopLevelDispMode;
Standard_EXPORT Standard_Boolean hasIO();
Standard_EXPORT void setIO(const Handle(SALOME_InteractiveObject)& name);
Standard_EXPORT Handle(SALOME_InteractiveObject) getIO();
Standard_EXPORT void setName(const Standard_CString aName);
Standard_EXPORT Standard_CString getName();
inline void* operator new(size_t,void* anAddress)
{
return anAddress;
}
inline void* operator new(size_t size)
{
return Standard::Allocate(size);
}
inline void operator delete(void *anAddress)
{
if (anAddress) Standard::Free((Standard_Address&)anAddress);
}
// inline void operator delete(void *anAddress, size_t size)
// {
// if (anAddress) Standard::Free((Standard_Address&)anAddress,size);
// }
// Methods PUBLIC
//
GEOM_AISShape(const TopoDS_Shape& shape, const Standard_CString aName);
Standard_Boolean hasIO() ;
void setIO(const Handle(SALOME_InteractiveObject)& name) ;
void setName(const Standard_CString aName) ;
Standard_CString getName() ;
Standard_Boolean isTopLevel();
void setTopLevel(Standard_Boolean);
Handle_SALOME_InteractiveObject getIO() ;
void highlightSubShapes(const TColStd_IndexedMapOfInteger& aIndexMap, const Standard_Boolean aHighlight );
~GEOM_AISShape();
Standard_EXPORT Standard_Boolean isTopLevel();
Standard_EXPORT void setTopLevel(Standard_Boolean);
void SetShadingColor(const Quantity_Color &aCol);
void SetEdgesInShadingColor(const Quantity_Color &aCol);
void SetDisplayVectors(bool isShow);
void SetDisplayVertices(bool isShow);
Standard_EXPORT void highlightSubShapes(const TColStd_IndexedMapOfInteger& aIndexMap, const Standard_Boolean aHighlight );
Standard_EXPORT void SetShadingColor(const Quantity_Color &aCol);
Standard_EXPORT void SetEdgesInShadingColor(const Quantity_Color &aCol);
Standard_EXPORT void SetDisplayVectors(bool isShow);
Standard_EXPORT void SetDisplayVertices(bool isShow);
virtual void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
const Handle(Prs3d_Presentation)& aPresentation,
const Standard_Integer aMode = 0) ;
Standard_EXPORT virtual void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
const Handle(Prs3d_Presentation)& aPresentation,
const Standard_Integer aMode = 0);
Standard_EXPORT virtual bool isShowVectors() { return myDisplayVectors; }
Standard_EXPORT virtual bool isShowVertices() { return myDisplayVertices; }
virtual bool isShowVectors () { return myDisplayVectors; }
virtual bool isShowVertices () { return myDisplayVertices; }
virtual Standard_Boolean switchTopLevel();
virtual Standard_Boolean toActivate();
Standard_EXPORT virtual Standard_Boolean switchTopLevel();
Standard_EXPORT virtual Standard_Boolean toActivate();
// Type management
//
friend Handle_Standard_Type& GEOM_AISShape_Type_();
const Handle(Standard_Type)& DynamicType() const;
Standard_Boolean IsKind(const Handle(Standard_Type)&) const;
Standard_EXPORT static Quantity_Color topLevelColor();
Standard_EXPORT static void setTopLevelColor(const Quantity_Color c);
static Quantity_Color topLevelColor();
static void setTopLevelColor(const Quantity_Color c);
Standard_EXPORT static TopLevelDispMode topLevelDisplayMode();
Standard_EXPORT static void setTopLevelDisplayMode(const TopLevelDispMode dm);
static TopLevelDispMode topLevelDisplayMode();
static void setTopLevelDisplayMode(const TopLevelDispMode dm);
void setPrevDisplayMode(const Standard_Integer mode);
Standard_Integer prevDisplayMode() const {return myPrevDisplayMode;}
Standard_EXPORT void setPrevDisplayMode(const Standard_Integer mode);
Standard_EXPORT Standard_Integer prevDisplayMode() const {return myPrevDisplayMode;}
// Field step information
void setFieldStepInfo( const GEOM::field_data_type theFieldDataType,
const int theFieldDimension,
const QList<QVariant>& theFieldStepData,
const TCollection_AsciiString& theFieldStepName,
const double theFieldStepRangeMin,
const double theFieldStepRangeMax );
void getFieldStepInfo( GEOM::field_data_type& theFieldDataType,
int& theFieldDimension,
QList<QVariant>& theFieldStepData,
TCollection_AsciiString& theFieldStepName,
double& theFieldStepRangeMin,
double& theFieldStepRangeMax ) const;
Standard_EXPORT void setFieldStepInfo( const GEOM::field_data_type theFieldDataType,
const int theFieldDimension,
const QList<QVariant>& theFieldStepData,
const TCollection_AsciiString& theFieldStepName,
const double theFieldStepRangeMin,
const double theFieldStepRangeMax );
Standard_EXPORT void getFieldStepInfo( GEOM::field_data_type& theFieldDataType,
int& theFieldDimension,
QList<QVariant>& theFieldStepData,
TCollection_AsciiString& theFieldStepName,
double& theFieldStepRangeMin,
double& theFieldStepRangeMax ) const;
protected:
void shadingMode(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
const Handle(Prs3d_Presentation)& aPrs,
const Standard_Integer aMode);
Standard_EXPORT void shadingMode(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
const Handle(Prs3d_Presentation)& aPrs,
const Standard_Integer aMode);
// Displaying the field data
void drawField( const Handle(Prs3d_Presentation)& thePrs,
const bool theIsText = false,
const bool theIsHighlight = false );
Standard_EXPORT void drawField( const Handle(Prs3d_Presentation)& thePrs,
const bool theIsText = false,
const bool theIsHighlight = false );
// Auxiliary method to compute a center of mass for the specified shape
static Standard_Boolean computeMassCenter( const TopoDS_Shape& theShape,
gp_Pnt& theCenter );
Quantity_Color myShadingColor;
Quantity_Color myEdgesInShadingColor;
Standard_EXPORT static Standard_Boolean computeMassCenter( const TopoDS_Shape& theShape,
gp_Pnt& theCenter );
private:
Quantity_Color myShadingColor;
Quantity_Color myEdgesInShadingColor;
TCollection_AsciiString myName;
bool myDisplayVectors;
bool myDisplayVertices;
@ -195,13 +146,13 @@ private:
double myFieldStepRangeMin;
double myFieldStepRangeMax;
static TopLevelDispMode myTopLevelDm;
static Quantity_Color myTopLevelColor;
static TopLevelDispMode myTopLevelDm;
static Quantity_Color myTopLevelColor;
public:
DEFINE_STANDARD_RTTI(GEOM_AISShape);
};
// other inline functions and methods (like "C++: function call" methods)
//
DEFINE_STANDARD_HANDLE(GEOM_AISShape, SALOME_AISShape)
#endif

91
src/OBJECT/GEOM_AISShape.ixx
View File

@ -1,91 +0,0 @@
// Copyright (C) 2007-2014 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, or (at your option) any later version.
//
// 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
//
// GEOM OBJECT : interactive object for Geometry entities visualization
// File : GEOM_AISShape.ixx
// Module : GEOM
//
#include "GEOM_AISShape.jxx"
#ifndef _Standard_TypeMismatch_HeaderFile
#include <Standard_TypeMismatch.hxx>
#endif
GEOM_AISShape::~GEOM_AISShape() {}
Standard_EXPORT Handle_Standard_Type& GEOM_AISShape_Type_()
{
static Handle_Standard_Type aType1 = STANDARD_TYPE(SALOME_AISShape);
if ( aType1.IsNull()) aType1 = STANDARD_TYPE(SALOME_AISShape);
static Handle_Standard_Type aType2 = STANDARD_TYPE(AIS_Shape);
if ( aType2.IsNull()) aType2 = STANDARD_TYPE(AIS_Shape);
static Handle_Standard_Type aType3 = STANDARD_TYPE(AIS_InteractiveObject);
if ( aType3.IsNull()) aType3 = STANDARD_TYPE(AIS_InteractiveObject);
static Handle_Standard_Type aType4 = STANDARD_TYPE(SelectMgr_SelectableObject);
if ( aType4.IsNull()) aType4 = STANDARD_TYPE(SelectMgr_SelectableObject);
static Handle_Standard_Type aType5 = STANDARD_TYPE(PrsMgr_PresentableObject);
if ( aType5.IsNull()) aType5 = STANDARD_TYPE(PrsMgr_PresentableObject);
static Handle_Standard_Type aType6 = STANDARD_TYPE(MMgt_TShared);
if ( aType6.IsNull()) aType6 = STANDARD_TYPE(MMgt_TShared);
static Handle_Standard_Type aType7 = STANDARD_TYPE(Standard_Transient);
if ( aType7.IsNull()) aType7 = STANDARD_TYPE(Standard_Transient);
static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,aType4,aType5,aType6,aType7,NULL};
static Handle_Standard_Type _aType = new Standard_Type("GEOM_AISShape",
sizeof(GEOM_AISShape),
1,
(Standard_Address)_Ancestors,
(Standard_Address)NULL);
return _aType;
}
// DownCast method
// allow safe downcasting
//
const Handle(GEOM_AISShape) Handle(GEOM_AISShape)::DownCast(const Handle(Standard_Transient)& AnObject)
{
Handle(GEOM_AISShape) _anOtherObject;
if (!AnObject.IsNull()) {
if (AnObject->IsKind(STANDARD_TYPE(GEOM_AISShape))) {
_anOtherObject = Handle(GEOM_AISShape)((Handle(GEOM_AISShape)&)AnObject);
}
}
return _anOtherObject ;
}
const Handle(Standard_Type)& GEOM_AISShape::DynamicType() const
{
return STANDARD_TYPE(GEOM_AISShape) ;
}
Standard_Boolean GEOM_AISShape::IsKind(const Handle(Standard_Type)& AType) const
{
return (STANDARD_TYPE(GEOM_AISShape) == AType || SALOME_AISShape::IsKind(AType));
}
Handle_GEOM_AISShape::~Handle_GEOM_AISShape() {}

41
src/OBJECT/GEOM_AISShape.jxx
View File

@ -1,41 +0,0 @@
// Copyright (C) 2007-2014 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, or (at your option) any later version.
//
// 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
//
// GEOM OBJECT : interactive object for Geometry entities visualization
// File : GEOM_AISShape.jxx
// Module : GEOM
//
#ifndef _GEOM_InteractiveObject_HeaderFile
#include "GEOM_InteractiveObject.hxx"
#endif
#ifndef _TopoDS_Shape_HeaderFile
#include <TopoDS_Shape.hxx>
#endif
#ifndef _GEOM_AISShape_HeaderFile
#include "GEOM_AISShape.hxx"
#endif
#ifndef _PrsMgr_PresentationManager3d_HeaderFile
#include <PrsMgr_PresentationManager3d.hxx>
#endif
#ifndef _Prs3d_Presentation_HeaderFile
#include <Prs3d_Presentation.hxx>
#endif

23
src/OBJECT/GEOM_InteractiveObject.cxx
View File

@ -20,17 +20,15 @@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// GEOM OBJECT : interactive object for Geometry entities visualization
// File : GEOM_InteractiveObject.cxx
// Author : Christophe ATTANASIO
// Module : GEOM
//
/*!
\class GEOM_InteractiveObject GEOM_InteractiveObject.hxx
\brief ....
*/
#include "GEOM_InteractiveObject.ixx"
#include "GEOM_InteractiveObject.hxx"
IMPLEMENT_STANDARD_HANDLE (GEOM_InteractiveObject, SALOME_InteractiveObject)
IMPLEMENT_STANDARD_RTTIEXT(GEOM_InteractiveObject, SALOME_InteractiveObject)
GEOM_InteractiveObject::GEOM_InteractiveObject()
: SALOME_InteractiveObject()
@ -49,15 +47,22 @@ GEOM_InteractiveObject::GEOM_InteractiveObject(const char* anIOR,
myFatherIOR = aFatherIOR;
}
const char* GEOM_InteractiveObject::getIOR(){
GEOM_InteractiveObject::~GEOM_InteractiveObject()
{
}
const char* GEOM_InteractiveObject::getIOR()
{
return myIOR.c_str();
}
const char* GEOM_InteractiveObject::getFatherIOR(){
const char* GEOM_InteractiveObject::getFatherIOR()
{
return myFatherIOR.c_str();
}
Standard_Boolean GEOM_InteractiveObject::isSame(const Handle(SALOME_InteractiveObject)& anIO ){
Standard_Boolean GEOM_InteractiveObject::isSame(const Handle(SALOME_InteractiveObject)& anIO )
{
if ( anIO->hasEntry() && this->hasEntry() ) {
if ( myEntry == anIO->getEntry() )
return Standard_True;

108
src/OBJECT/GEOM_InteractiveObject.hxx
View File

@ -20,106 +20,40 @@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// GEOM OBJECT : interactive object for Geometry entities visualization
// File : GEOM_InteractiveObject.hxx
// Module : GEOM
//
#ifndef _GEOM_InteractiveObject_HeaderFile
#define _GEOM_InteractiveObject_HeaderFile
#ifndef _Standard_HeaderFile
#include <SALOME_InteractiveObject.hxx>
#include <Standard.hxx>
#endif
#ifndef _Handle_GEOM_InteractiveObject_HeaderFile
#include "Handle_GEOM_InteractiveObject.hxx"
#endif
#ifndef _Standard_CString_HeaderFile
#include <Standard_CString.hxx>
#endif
#ifndef _SALOME_InteractiveObject_HeaderFile
#include "SALOME_InteractiveObject.hxx"
#endif
#ifndef _Standard_Boolean_HeaderFile
#include <Standard_Boolean.hxx>
#endif
#ifndef _Handle_SALOME_InteractiveObject_HeaderFile
#include "Handle_SALOME_InteractiveObject.hxx"
#endif
class GEOM_InteractiveObject : public SALOME_InteractiveObject {
#include <Standard_DefineHandle.hxx>
class GEOM_InteractiveObject : public SALOME_InteractiveObject
{
public:
Standard_EXPORT GEOM_InteractiveObject();
Standard_EXPORT GEOM_InteractiveObject(const char* anIOR,
const char* aFatherIOR,
const char* aComponentDataType,
const char* anEntry = "");
Standard_EXPORT ~GEOM_InteractiveObject();
inline void* operator new(size_t,void* anAddress)
{
return anAddress;
}
inline void* operator new(size_t size)
{
return Standard::Allocate(size);
}
inline void operator delete(void *anAddress)
{
if (anAddress) Standard::Free((Standard_Address&)anAddress);
}
// inline void operator delete(void *anAddress, size_t size)
// {
// if (anAddress) Standard::Free((Standard_Address&)anAddress,size);
// }
// Methods PUBLIC
//
Standard_EXPORT GEOM_InteractiveObject();
Standard_EXPORT GEOM_InteractiveObject(const char* anIOR,
const char* aFatherIOR,
const char* aComponentDataType,
const char* anEntry = "");
Standard_EXPORT void setIOR(const char* anEntry) ;
Standard_EXPORT const char* getIOR() ;
Standard_EXPORT void setFatherIOR(const char* anEntry) ;
Standard_EXPORT const char* getFatherIOR() ;
Standard_EXPORT virtual Standard_Boolean isSame(const Handle(SALOME_InteractiveObject)& anIO) ;
Standard_EXPORT ~GEOM_InteractiveObject();
Standard_EXPORT void setIOR(const char* anEntry);
Standard_EXPORT const char* getIOR();
Standard_EXPORT void setFatherIOR(const char* anEntry);
Standard_EXPORT const char* getFatherIOR();
// Type management
//
Standard_EXPORT friend Handle_Standard_Type& GEOM_InteractiveObject_Type_();
Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
Standard_EXPORT Standard_Boolean IsKind(const Handle(Standard_Type)&) const;
protected:
// Methods PROTECTED
//
// Fields PROTECTED
//
Standard_EXPORT virtual Standard_Boolean isSame(const Handle(SALOME_InteractiveObject)& anIO);
private:
std::string myIOR;
std::string myFatherIOR;
// Methods PRIVATE
//
// Fields PRIVATE
//
std::string myIOR;
std::string myFatherIOR;
public:
DEFINE_STANDARD_RTTI(GEOM_InteractiveObject);
};
// other inline functions and methods (like "C++: function call" methods)
//
DEFINE_STANDARD_HANDLE(GEOM_InteractiveObject, SALOME_InteractiveObject)
#endif

83
src/OBJECT/GEOM_InteractiveObject.ixx
View File

@ -1,83 +0,0 @@
// Copyright (C) 2007-2014 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, or (at your option) any later version.
//
// 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
//
// GEOM OBJECT : interactive object for Geometry entities visualization
// File : GEOM_InteractiveObject.ixx
// Module : GEOM
//
#include "GEOM_InteractiveObject.jxx"
#ifndef _Standard_TypeMismatch_HeaderFile
#include <Standard_TypeMismatch.hxx>
#endif
GEOM_InteractiveObject::~GEOM_InteractiveObject() {}
Standard_EXPORT Handle_Standard_Type& GEOM_InteractiveObject_Type_()
{
static Handle_Standard_Type aType1 = STANDARD_TYPE(SALOME_InteractiveObject);
if ( aType1.IsNull()) aType1 = STANDARD_TYPE(SALOME_InteractiveObject);
static Handle_Standard_Type aType2 = STANDARD_TYPE(MMgt_TShared);
if ( aType2.IsNull()) aType2 = STANDARD_TYPE(MMgt_TShared);
static Handle_Standard_Type aType3 = STANDARD_TYPE(Standard_Transient);
if ( aType3.IsNull()) aType3 = STANDARD_TYPE(Standard_Transient);
static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
static Handle_Standard_Type _aType = new Standard_Type("GEOM_InteractiveObject",
sizeof(GEOM_InteractiveObject),
1,
(Standard_Address)_Ancestors,
(Standard_Address)NULL);
return _aType;
}
// DownCast method
// allow safe downcasting
//
const Handle(GEOM_InteractiveObject) Handle(GEOM_InteractiveObject)::DownCast(const Handle(Standard_Transient)& AnObject)
{
Handle(GEOM_InteractiveObject) _anOtherObject;
if (!AnObject.IsNull()) {
if (AnObject->IsKind(STANDARD_TYPE(GEOM_InteractiveObject))) {
_anOtherObject = Handle(GEOM_InteractiveObject)((Handle(GEOM_InteractiveObject)&)AnObject);
}
}
return _anOtherObject ;
}
const Handle(Standard_Type)& GEOM_InteractiveObject::DynamicType() const
{
return STANDARD_TYPE(GEOM_InteractiveObject) ;
}
Standard_Boolean GEOM_InteractiveObject::IsKind(const Handle(Standard_Type)& AType) const
{
return (STANDARD_TYPE(GEOM_InteractiveObject) == AType || SALOME_InteractiveObject::IsKind(AType));
}
Handle_GEOM_InteractiveObject::~Handle_GEOM_InteractiveObject() {}

32
src/OBJECT/GEOM_InteractiveObject.jxx
View File

@ -1,32 +0,0 @@
// Copyright (C) 2007-2014 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, or (at your option) any later version.
//
// 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
//
// GEOM OBJECT : interactive object for Geometry entities visualization
// File : GEOM_InteractiveObject.jxx
// Module : GEOM
//
#ifndef _SALOME_InteractiveObject_HeaderFile
#include "SALOME_InteractiveObject.hxx"
#endif
#ifndef _GEOM_InteractiveObject_HeaderFile
#include "GEOM_InteractiveObject.hxx"
#endif

5
src/OBJECT/GEOM_TopWireframeShape.cxx
View File

@ -32,7 +32,7 @@
*/
//Local includes
#include "GEOM_TopWireframeShape.ixx"
#include "GEOM_TopWireframeShape.hxx"
#include "GEOM_AISShape.hxx"
//GUI includes
@ -43,6 +43,9 @@
#include <TopoDS_Shape.hxx>
#include <Prs3d_IsoAspect.hxx>
IMPLEMENT_STANDARD_HANDLE(GEOM_TopWireframeShape, SALOME_AISShape)
IMPLEMENT_STANDARD_RTTIEXT(GEOM_TopWireframeShape, SALOME_AISShape)
GEOM_TopWireframeShape::GEOM_TopWireframeShape( const TopoDS_Shape& shape )
:SALOME_AISShape(shape)
{

98
src/OBJECT/GEOM_TopWireframeShape.hxx
View File

@ -20,91 +20,39 @@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// GEOM OBJECT : interactive object for Geometry entities visualization
// File : GEOM_TopWireframeShape.hxx
// Module : GEOM
//
#ifndef _GEOM_TopWireframeShape_HeaderFile
#define _GEOM_TopWireframeShape_HeaderFile
#include "GEOM_OBJECT_defs.hxx"
#include <SALOME_AISShape.hxx>
#ifndef _Standard_HeaderFile
#include <Standard.hxx>
#endif
#ifndef _Handle_GEOM_TopWireframeShape_HeaderFile
#include "Handle_GEOM_TopWireframeShape.hxx"
#endif
#include <Standard_DefineHandle.hxx>
#ifndef _SALOME_AISShape_HeaderFile
#include "SALOME_AISShape.hxx"
#endif
#ifndef _Standard_Boolean_HeaderFile
#include <Standard_Boolean.hxx>
#endif
class GEOM_TopWireframeShape : public SALOME_AISShape
{
public:
Standard_EXPORT GEOM_TopWireframeShape(const TopoDS_Shape& shape);
Standard_EXPORT ~GEOM_TopWireframeShape();
class GEOM_OBJECT_EXPORT GEOM_TopWireframeShape : public SALOME_AISShape {
Standard_EXPORT virtual Standard_Boolean hasIO();
Standard_EXPORT void setIO(const Handle(SALOME_InteractiveObject)& io);
Standard_EXPORT virtual Handle(SALOME_InteractiveObject) getIO();
Standard_EXPORT virtual void setName(const Standard_CString aName);
Standard_EXPORT virtual Standard_CString getName();
Standard_EXPORT virtual Standard_Boolean isTopLevel();
Standard_EXPORT virtual void setTopLevel(Standard_Boolean);
Standard_EXPORT virtual Standard_Boolean switchTopLevel();
Standard_EXPORT virtual Standard_Boolean toActivate();
Standard_EXPORT virtual void highlightSubShapes(const TColStd_IndexedMapOfInteger& aIndexMap, const Standard_Boolean aHighlight );
public:
inline void* operator new(size_t,void* anAddress)
{
return anAddress;
}
inline void* operator new(size_t size)
{
return Standard::Allocate(size);
}
inline void operator delete(void *anAddress)
{
if (anAddress) Standard::Free((Standard_Address&)anAddress);
}
// inline void operator delete(void *anAddress, size_t size)
// {
// if (anAddress) Standard::Free((Standard_Address&)anAddress,size);
// }
// Methods PUBLIC
//
GEOM_TopWireframeShape(const TopoDS_Shape& shape);
virtual Handle_SALOME_InteractiveObject getIO();
virtual Standard_Boolean hasIO();
virtual Standard_Boolean isTopLevel();
virtual Standard_Boolean switchTopLevel();
virtual Standard_Boolean toActivate();
virtual void setTopLevel(Standard_Boolean);
virtual Standard_CString getName();
virtual void setName(const Standard_CString aName);
virtual void highlightSubShapes(const TColStd_IndexedMapOfInteger& aIndexMap, const Standard_Boolean aHighlight );
~GEOM_TopWireframeShape();
// Type management
//
friend Handle_Standard_Type& GEOM_TopWireframeShape_Type_();
const Handle(Standard_Type)& DynamicType() const;
Standard_Boolean IsKind(const Handle(Standard_Type)&) const;
void setIO(const Handle(SALOME_InteractiveObject)& io);
protected:
// Methods PROTECTED
//
// Fields PROTECTED
//
private:
// Methods PRIVATE
//
// Fields PRIVATE
//
DEFINE_STANDARD_RTTI(GEOM_TopWireframeShape);
};
// other inline functions and methods (like "C++: function call" methods)
//
DEFINE_STANDARD_HANDLE(GEOM_TopWireframeShape, SALOME_AISShape)
#endif

87
src/OBJECT/GEOM_TopWireframeShape.ixx
View File

@ -1,87 +0,0 @@
// Copyright (C) 2007-2014 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, or (at your option) any later version.
//
// 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
//
// GEOM OBJECT : interactive object for Geometry entities visualization
// File : GEOM_AISShape.ixx
// Module : GEOM
//
#include "GEOM_TopWireframeShape.jxx"
#ifndef _Standard_TypeMismatch_HeaderFile
#include <Standard_TypeMismatch.hxx>
#endif
Standard_EXPORT Handle_Standard_Type& GEOM_TopWireframeShape_Type_()
{
static Handle_Standard_Type aType1 = STANDARD_TYPE(SALOME_AISShape);
if ( aType1.IsNull()) aType1 = STANDARD_TYPE(SALOME_AISShape);
static Handle_Standard_Type aType2 = STANDARD_TYPE(AIS_Shape);
if ( aType2.IsNull()) aType2 = STANDARD_TYPE(AIS_Shape);
static Handle_Standard_Type aType3 = STANDARD_TYPE(AIS_InteractiveObject);
if ( aType3.IsNull()) aType3 = STANDARD_TYPE(AIS_InteractiveObject);
static Handle_Standard_Type aType4 = STANDARD_TYPE(SelectMgr_SelectableObject);
if ( aType4.IsNull()) aType4 = STANDARD_TYPE(SelectMgr_SelectableObject);
static Handle_Standard_Type aType5 = STANDARD_TYPE(PrsMgr_PresentableObject);
if ( aType5.IsNull()) aType5 = STANDARD_TYPE(PrsMgr_PresentableObject);
static Handle_Standard_Type aType6 = STANDARD_TYPE(MMgt_TShared);
if ( aType6.IsNull()) aType6 = STANDARD_TYPE(MMgt_TShared);
static Handle_Standard_Type aType7 = STANDARD_TYPE(Standard_Transient);
if ( aType7.IsNull()) aType7 = STANDARD_TYPE(Standard_Transient);
static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,aType4,aType5,aType6,aType7,NULL};
static Handle_Standard_Type _aType = new Standard_Type("GEOM_TopWireframeShape",
sizeof(GEOM_TopWireframeShape),
1,
(Standard_Address)_Ancestors,
(Standard_Address)NULL);
return _aType;
}
// DownCast method
// allow safe downcasting
//
const Handle(GEOM_TopWireframeShape) Handle(GEOM_TopWireframeShape)::DownCast(const Handle(Standard_Transient)& AnObject)
{
Handle(GEOM_TopWireframeShape) _anOtherObject;
if (!AnObject.IsNull()) {
if (AnObject->IsKind(STANDARD_TYPE(GEOM_TopWireframeShape))) {
_anOtherObject = Handle(GEOM_TopWireframeShape)((Handle(GEOM_TopWireframeShape)&)AnObject);
}
}
return _anOtherObject ;
}
const Handle(Standard_Type)& GEOM_TopWireframeShape::DynamicType() const
{
return STANDARD_TYPE(GEOM_TopWireframeShape) ;
}
Standard_Boolean GEOM_TopWireframeShape::IsKind(const Handle(Standard_Type)& AType) const
{
return (STANDARD_TYPE(GEOM_TopWireframeShape) == AType || SALOME_AISShape::IsKind(AType));
}
Handle_GEOM_TopWireframeShape::~Handle_GEOM_TopWireframeShape() {}

33
src/OBJECT/GEOM_TopWireframeShape.jxx
View File

@ -1,33 +0,0 @@
// Copyright (C) 2007-2014 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, or (at your option) any later version.
//
// 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
//
// GEOM OBJECT : interactive object for Geometry entities visualization
// File : GEOM_AISShape.jxx
// Module : GEOM
//
#ifndef _TopoDS_Shape_HeaderFile
#include <TopoDS_Shape.hxx>
#endif
#ifndef _GEOM_TopWireframeShape_HeaderFile
#include "GEOM_TopWireframeShape.hxx"
#endif

100
src/OBJECT/Handle_GEOM_AISShape.hxx
View File

@ -1,100 +0,0 @@
// Copyright (C) 2007-2014 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, or (at your option) any later version.
//
// 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
//
// GEOM OBJECT : interactive object for Geometry entities visualization
// File : Handle_GEOM_AISShape.hxx
// Module : GEOM
//
#ifndef _Handle_GEOM_AISShape_HeaderFile
#define _Handle_GEOM_AISShape_HeaderFile
#ifndef _Standard_Macro_HeaderFile
#include <Standard_Macro.hxx>
#endif
#ifndef _Standard_HeaderFile
#include <Standard.hxx>
#endif
#ifndef _Handle_SALOME_AISShape_HeaderFile
#include "Handle_SALOME_AISShape.hxx"
#endif
class Standard_Transient;
class Handle_Standard_Type;
class Handle(SALOME_AISShape);
class GEOM_AISShape;
Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(GEOM_AISShape);
class Handle(GEOM_AISShape) : public Handle(SALOME_AISShape) {
public:
inline void* operator new(size_t,void* anAddress)
{
return anAddress;
}
inline void* operator new(size_t size)
{
return Standard::Allocate(size);
}
inline void operator delete(void *anAddress)
{
if (anAddress) Standard::Free((Standard_Address&)anAddress);
}
// inline void operator delete(void *anAddress, size_t size)
// {
// if (anAddress) Standard::Free((Standard_Address&)anAddress,size);
// }
Handle(GEOM_AISShape)():Handle(SALOME_AISShape)() {}
Handle(GEOM_AISShape)(const Handle(GEOM_AISShape)& aHandle) : Handle(SALOME_AISShape)(aHandle)
{
}
Handle(GEOM_AISShape)(const GEOM_AISShape* anItem) : Handle(SALOME_AISShape)((SALOME_AISShape *)anItem)
{
}
Handle(GEOM_AISShape)& operator=(const Handle(GEOM_AISShape)& aHandle)
{
Assign(aHandle.Access());
return *this;
}
Handle(GEOM_AISShape)& operator=(const GEOM_AISShape* anItem)
{
Assign((Standard_Transient *)anItem);
return *this;
}
GEOM_AISShape* operator->()
{
return (GEOM_AISShape *)ControlAccess();
}
GEOM_AISShape* operator->() const
{
return (GEOM_AISShape *)ControlAccess();
}
Standard_EXPORT ~Handle(GEOM_AISShape)();
Standard_EXPORT static const Handle(GEOM_AISShape) DownCast(const Handle(Standard_Transient)& AnObject);
};
#endif

100
src/OBJECT/Handle_GEOM_InteractiveObject.hxx
View File

@ -1,100 +0,0 @@
// Copyright (C) 2007-2014 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, or (at your option) any later version.
//
// 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
//
// GEOM OBJECT : interactive object for Geometry entities visualization
// File : Handle_GEOM_InteractiveObject.hxx
// Module : GEOM
//
#ifndef _Handle_GEOM_InteractiveObject_HeaderFile
#define _Handle_GEOM_InteractiveObject_HeaderFile
#ifndef _Standard_Macro_HeaderFile
#include <Standard_Macro.hxx>
#endif
#ifndef _Standard_HeaderFile
#include <Standard.hxx>
#endif
#ifndef _Handle_SALOME_InteractiveObject_HeaderFile
#include "Handle_SALOME_InteractiveObject.hxx"
#endif
class Standard_Transient;
class Handle_Standard_Type;
class Handle(SALOME_InteractiveObject);
class GEOM_InteractiveObject;
Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(GEOM_InteractiveObject);
class Handle(GEOM_InteractiveObject) : public Handle(SALOME_InteractiveObject) {
public:
inline void* operator new(size_t,void* anAddress)
{
return anAddress;
}
inline void* operator new(size_t size)
{
return Standard::Allocate(size);
}
inline void operator delete(void *anAddress)
{
if (anAddress) Standard::Free((Standard_Address&)anAddress);
}
// inline void operator delete(void *anAddress, size_t size)
// {
// if (anAddress) Standard::Free((Standard_Address&)anAddress,size);
// }
Handle(GEOM_InteractiveObject)():Handle(SALOME_InteractiveObject)() {}
Handle(GEOM_InteractiveObject)(const Handle(GEOM_InteractiveObject)& aHandle) : Handle(SALOME_InteractiveObject)(aHandle)
{
}
Handle(GEOM_InteractiveObject)(const GEOM_InteractiveObject* anItem) : Handle(SALOME_InteractiveObject)((SALOME_InteractiveObject *)anItem)
{
}
Handle(GEOM_InteractiveObject)& operator=(const Handle(GEOM_InteractiveObject)& aHandle)
{
Assign(aHandle.Access());
return *this;
}
Handle(GEOM_InteractiveObject)& operator=(const GEOM_InteractiveObject* anItem)
{
Assign((Standard_Transient *)anItem);
return *this;
}
GEOM_InteractiveObject* operator->()
{
return (GEOM_InteractiveObject *)ControlAccess();
}
GEOM_InteractiveObject* operator->() const
{
return (GEOM_InteractiveObject *)ControlAccess();
}
Standard_EXPORT ~Handle(GEOM_InteractiveObject)();
Standard_EXPORT static const Handle(GEOM_InteractiveObject) DownCast(const Handle(Standard_Transient)& AnObject);
};
#endif

100
src/OBJECT/Handle_GEOM_TopWireframeShape.hxx
View File

@ -1,100 +0,0 @@
// Copyright (C) 2007-2014 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, or (at your option) any later version.
//
// 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
//
// GEOM OBJECT : interactive object for Geometry entities visualization
// File : Handle_GEOM_TopWireframeShape.hxx
// Module : GEOM
//
#ifndef _Handle_GEOM_TopWireframeShape_HeaderFile
#define _Handle_GEOM_TopWireframeShape_HeaderFile
#ifndef _Standard_Macro_HeaderFile
#include <Standard_Macro.hxx>
#endif
#ifndef _Standard_HeaderFile
#include <Standard.hxx>
#endif
#ifndef _Handle_SALOME_AISShape_HeaderFile
#include "Handle_SALOME_AISShape.hxx"
#endif
class Standard_Transient;
class Handle_Standard_Type;
class Handle(SALOME_AISShape);
class GEOM_TopWireframeShape;
Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(GEOM_TopWireframeShape);
class Handle(GEOM_TopWireframeShape) : public Handle(SALOME_AISShape) {
public:
inline void* operator new(size_t,void* anAddress)
{
return anAddress;
}
inline void* operator new(size_t size)
{
return Standard::Allocate(size);
}
inline void operator delete(void *anAddress)
{
if (anAddress) Standard::Free((Standard_Address&)anAddress);
}
// inline void operator delete(void *anAddress, size_t size)
// {
// if (anAddress) Standard::Free((Standard_Address&)anAddress,size);
// }
Handle(GEOM_TopWireframeShape)():Handle(SALOME_AISShape)() {}
Handle(GEOM_TopWireframeShape)(const Handle(GEOM_TopWireframeShape)& aHandle) : Handle(SALOME_AISShape)(aHandle)
{
}
Handle(GEOM_TopWireframeShape)(const GEOM_TopWireframeShape* anItem) : Handle(SALOME_AISShape)((SALOME_AISShape *)anItem)
{
}
Handle(GEOM_TopWireframeShape)& operator=(const Handle(GEOM_TopWireframeShape)& aHandle)
{
Assign(aHandle.Access());
return *this;
}
Handle(GEOM_TopWireframeShape)& operator=(const GEOM_TopWireframeShape* anItem)
{
Assign((Standard_Transient *)anItem);
return *this;
}
GEOM_TopWireframeShape* operator->()
{
return (GEOM_TopWireframeShape *)ControlAccess();
}
GEOM_TopWireframeShape* operator->() const
{
return (GEOM_TopWireframeShape *)ControlAccess();
}
Standard_EXPORT ~Handle(GEOM_TopWireframeShape)();
Standard_EXPORT static const Handle(GEOM_TopWireframeShape) DownCast(const Handle(Standard_Transient)& AnObject);
};
#endif

2
src/RepairGUI/RepairGUI_GlueDlg.cxx
View File

@ -43,7 +43,7 @@
#include <SUIT_ViewWindow.h>
#include <SUIT_ViewManager.h>
#include <OCCViewer_ViewModel.h>
#include <SALOME_ListIteratorOfListIO.hxx>
#include <SALOME_ListIO.hxx>
#include <GEOMImpl_Types.hxx>

2
src/RepairGUI/RepairGUI_LimitToleranceDlg.cxx
View File

@ -40,7 +40,7 @@
#include <SUIT_ViewWindow.h>
#include <SUIT_ViewManager.h>
#include <OCCViewer_ViewModel.h>
#include <SALOME_ListIteratorOfListIO.hxx>
#include <SALOME_ListIO.hxx>
#include <GEOMImpl_Types.hxx>

1
src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx
View File

@ -38,7 +38,6 @@
#include <SUIT_Session.h>
#include <SUIT_ResourceMgr.h>
#include <SUIT_MessageBox.h>
#include <SALOME_ListIteratorOfListIO.hxx>
#include <SALOME_ListIO.hxx>
#include <Basics_Utils.hxx>

2
src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx
View File

@ -33,7 +33,7 @@
#include <SalomeApp_Application.h>
#include <SalomeApp_Study.h>
#include <LightApp_SelectionMgr.h>
#include <SALOME_ListIteratorOfListIO.hxx>
#include <SALOME_ListIO.hxx>
// OCCT Includes
#include <TopAbs.hxx>

2
src/STEPPlugin/STEPPlugin_GUI.cxx
View File

@ -29,7 +29,7 @@
#include <LightApp_SelectionMgr.h>
#include <SalomeApp_Application.h>
#include <SalomeApp_Study.h>
#include <SALOME_ListIteratorOfListIO.hxx>
#include <SALOME_ListIO.hxx>
// GEOM includes
#include "GeometryGUI.h"

2
src/STLPlugin/STLPlugin_GUI.cxx
View File

@ -30,7 +30,7 @@
#include <LightApp_SelectionMgr.h>
#include <SalomeApp_Application.h>
#include <SalomeApp_Study.h>
#include <SALOME_ListIteratorOfListIO.hxx>
#include <SALOME_ListIO.hxx>
// GEOM includes
#include "GeometryGUI.h"

2
src/TransformationGUI/TransformationGUI.cxx
View File

@ -37,7 +37,7 @@
#include <LightApp_SelectionMgr.h>
#include <SalomeApp_Application.h>
#include <SalomeApp_Study.h>
#include <SALOME_ListIteratorOfListIO.hxx>
#include <SALOME_ListIO.hxx>
#include "TransformationGUI_MultiTranslationDlg.h" // Method MULTI TRANSLATION
#include "TransformationGUI_MultiRotationDlg.h" // Method MULTI ROTATION

2
src/VTKPlugin/VTKPlugin_GUI.cxx
View File

@ -28,7 +28,7 @@
#include <LightApp_SelectionMgr.h>
#include <SalomeApp_Application.h>
#include <SalomeApp_Study.h>
#include <SALOME_ListIteratorOfListIO.hxx>
#include <SALOME_ListIO.hxx>
// GEOM includes
#include "GeometryGUI.h"