]> SALOME platform Git repositories - modules/med.git/commitdiff
Salome HOME
Version ok de MED avec MEDGUI.
authorjroy <jroy>
Tue, 6 May 2003 06:59:31 +0000 (06:59 +0000)
committerjroy <jroy>
Tue, 6 May 2003 06:59:31 +0000 (06:59 +0000)
src/MEDGUI/Handle_SMESH_TypeFilter.hxx [deleted file]
src/MEDGUI/Makefile.in
src/MEDGUI/MedGUI.cxx
src/MEDGUI/SMESH_Type.h [deleted file]
src/MEDGUI/SMESH_TypeFilter.cxx [deleted file]
src/MEDGUI/SMESH_TypeFilter.hxx [deleted file]
src/Makefile.in

diff --git a/src/MEDGUI/Handle_SMESH_TypeFilter.hxx b/src/MEDGUI/Handle_SMESH_TypeFilter.hxx
deleted file mode 100644 (file)
index 79db470..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-// File generated by CPPExt (Transient)
-//
-//                     Copyright (C) 1991,1995 by
-//  
-//                      MATRA DATAVISION, FRANCE
-//  
-// This software is furnished in accordance with the terms and conditions
-// of the contract and with the inclusion of the above copyright notice.
-// This software or any other copy thereof may not be provided or otherwise
-// be made available to any other person. No title to an ownership of the
-// software is hereby transferred.
-//  
-// At the termination of the contract, the software and all copies of this
-// software must be deleted.
-
-#ifndef _Handle_SMESH_TypeFilter_HeaderFile
-#define _Handle_SMESH_TypeFilter_HeaderFile
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Handle_SALOME_Filter_HeaderFile
-#include "Handle_SALOME_Filter.hxx"
-#endif
-
-class Standard_Transient;
-class Handle_Standard_Type;
-class Handle(SALOME_Filter);
-class SMESH_TypeFilter;
-Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(SMESH_TypeFilter);
-
-class Handle(SMESH_TypeFilter) : public Handle(SALOME_Filter) {
-  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(SMESH_TypeFilter)():Handle(SALOME_Filter)() {} 
-    Handle(SMESH_TypeFilter)(const Handle(SMESH_TypeFilter)& aHandle) : Handle(SALOME_Filter)(aHandle) 
-     {
-     }
-
-    Handle(SMESH_TypeFilter)(const SMESH_TypeFilter* anItem) : Handle(SALOME_Filter)((SALOME_Filter *)anItem) 
-     {
-     }
-
-    Handle(SMESH_TypeFilter)& operator=(const Handle(SMESH_TypeFilter)& aHandle)
-     {
-      Assign(aHandle.Access());
-      return *this;
-     }
-
-    Handle(SMESH_TypeFilter)& operator=(const SMESH_TypeFilter* anItem)
-     {
-      Assign((Standard_Transient *)anItem);
-      return *this;
-     }
-
-    SMESH_TypeFilter* operator->() 
-     {
-      return (SMESH_TypeFilter *)ControlAccess();
-     }
-
-    SMESH_TypeFilter* operator->() const 
-     {
-      return (SMESH_TypeFilter *)ControlAccess();
-     }
-
-   Standard_EXPORT ~Handle(SMESH_TypeFilter)();
-   Standard_EXPORT static const Handle(SMESH_TypeFilter) DownCast(const Handle(Standard_Transient)& AnObject);
-};
-#endif
index 0057dc768775e2e920a670ef079261cb4b4380ec..e3e2db9c469efe7cf0a21bb7ada8f01d04139f11 100644 (file)
@@ -43,7 +43,7 @@ LIB_SERVER_IDL =
 CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
 CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome
 
-LDFLAGS += -lSalomeGUI -lmedmem -lMEDImpl -lMedEngine -lSMESHFiltersSelection -L${KERNEL_ROOT_DIR}/lib/salome
+LDFLAGS += -lSalomeGUI -lmedmem -lMEDImpl -lMedEngine -L${KERNEL_ROOT_DIR}/lib/salome
 
 
 MED.hh MEDSK.cc: MED.idl
index ff3690a61c8d445cf92a8630645545aecc68c5f4..35a93cb86ef98355f73c4985484fce66f16ee0b1 100644 (file)
@@ -19,8 +19,6 @@
 #include "QAD_Tools.h"
 #include "QAD_FileDlg.h"
 
-#include "SMESH_TypeFilter.hxx"
-
 // QT Includes
 #include <qinputdialog.h>
 
diff --git a/src/MEDGUI/SMESH_Type.h b/src/MEDGUI/SMESH_Type.h
deleted file mode 100644 (file)
index 7bf4272..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-//  File      : SMESH_Type.h
-//  Created   : Mon Jun 03 15:14:15 2002
-//  Author    : Nicolas REJNERI
-
-//  Project   : SALOME
-//  Module    : SMESH
-//  Copyright : Open CASCADE 2002
-//  $Header$
-
-enum MeshObjectType {
-  HYPOTHESIS,
-  ALGORITHM,
-  MESH,
-  SUBMESH,
-  MESHorSUBMESH,
-  SUBMESH_VERTEX,
-  SUBMESH_EDGE,
-  SUBMESH_FACE,
-  SUBMESH_SOLID,
-  SUBMESH_COMPOUND
-};
diff --git a/src/MEDGUI/SMESH_TypeFilter.cxx b/src/MEDGUI/SMESH_TypeFilter.cxx
deleted file mode 100644 (file)
index 4aa830b..0000000
+++ /dev/null
@@ -1,138 +0,0 @@
-//  File      : SMESH_TypeFilter.cxx
-//  Created   : Fri Dec 07 09:57:24 2001
-//  Author    : Nicolas REJNERI
-//  Project   : SALOME
-//  Module    : SMESH
-//  Copyright : Open CASCADE
-//  $Header$
-
-#include "SMESH_TypeFilter.ixx"
-
-#include "SALOME_InteractiveObject.hxx"
-#include "SALOME_TypeFilter.hxx"
-
-#include "utilities.h"
-#include "QAD_Application.h"
-#include "QAD_Desktop.h"
-#include "QAD_Study.h"
-
-
-SMESH_TypeFilter::SMESH_TypeFilter(MeshObjectType aType) 
-{
-  myKind = aType;
-}
-
-Standard_Boolean SMESH_TypeFilter::IsOk(const Handle(SALOME_InteractiveObject)& anObj) const 
-{
-  Handle(SALOME_TypeFilter) meshFilter = new SALOME_TypeFilter( "MESH" );
-  if ( !meshFilter->IsOk(anObj) ) 
-    return false;
-
-  if ( anObj->hasEntry() ) {
-    QAD_Study* ActiveStudy = QAD_Application::getDesktop()->getActiveStudy();
-    SALOMEDS::Study_var aStudy = ActiveStudy->getStudyDocument();
-    SALOMEDS::SObject_var obj = aStudy->FindObjectID( anObj->getEntry() );
-
-    bool Ok = false;
-
-    switch ( myKind )
-      {
-      case HYPOTHESIS:
-       {
-         SALOMEDS::SObject_var objFather = obj->GetFather();
-         SALOMEDS::SComponent_var objComponent = obj->GetFatherComponent();
-         if (( objFather->Tag() == 1 ) && (strcmp( objFather->GetID(), objComponent->GetID() ) != 0 ) )
-           Ok = true;
-         break;
-       }
-      case ALGORITHM:
-       {
-         SALOMEDS::SObject_var objFather = obj->GetFather();
-         SALOMEDS::SComponent_var objComponent = obj->GetFatherComponent();
-         if (( objFather->Tag() == 2 ) && (strcmp( objFather->GetID(), objComponent->GetID() ) != 0 ) )
-           Ok = true;
-         break;
-       }
-      case MESH:
-       {
-         SALOMEDS::SObject_var objFather = obj->GetFather();
-         SALOMEDS::SComponent_var objComponent = obj->GetFatherComponent();
-         
-         if (( obj->Tag() >= 3 ) && (strcmp( objFather->GetID(), objComponent->GetID() ) == 0 ) )
-           Ok = true;
-         break;
-       }
-      case SUBMESH:
-       {
-         SALOMEDS::SObject_var objFather = obj->GetFather();
-         SALOMEDS::SComponent_var objComponent = obj->GetFatherComponent();
-         
-         if (( objFather->Tag() >= 4 ) && (strcmp( objFather->GetID(), objComponent->GetID() ) != 0 ) )
-           Ok = true;
-         break;
-       }
-      case MESHorSUBMESH:
-       {
-         SALOMEDS::SObject_var objFather = obj->GetFather();
-         SALOMEDS::SComponent_var objComponent = obj->GetFatherComponent();
-         
-         if (( obj->Tag() >= 3 ) && (strcmp( objFather->GetID(), objComponent->GetID() ) == 0 ) )
-           Ok = true;
-
-          if (( objFather->Tag() >= 4 ) && (strcmp( objFather->GetID(), objComponent->GetID() ) != 0 ) )
-           Ok = true;
-
-         break;
-       }
-      case SUBMESH_VERTEX:
-       {
-         SALOMEDS::SObject_var objFather = obj->GetFather();
-         SALOMEDS::SComponent_var objComponent = obj->GetFatherComponent();
-         
-         if (( obj->Tag() == 4 ) && (strcmp( objFather->GetID(), objComponent->GetID() ) != 0 ) && ( objFather->Tag() >= 3 ))
-           Ok = true;
-         break;
-       }
-      case SUBMESH_EDGE:
-       {
-         SALOMEDS::SObject_var objFather = obj->GetFather();
-         SALOMEDS::SComponent_var objComponent = obj->GetFatherComponent();
-         
-         if (( obj->Tag() == 5 ) && (strcmp( objFather->GetID(), objComponent->GetID() ) != 0 ) && ( objFather->Tag() >= 3 ))
-           Ok = true;
-         break;
-       }
-      case SUBMESH_FACE:
-       {
-         SALOMEDS::SObject_var objFather = obj->GetFather();
-         SALOMEDS::SComponent_var objComponent = obj->GetFatherComponent();
-         
-         if (( obj->Tag() == 6 ) && (strcmp( objFather->GetID(), objComponent->GetID() ) != 0 ) && ( objFather->Tag() >= 3 ))
-           Ok = true;
-         break;
-       }
-      case SUBMESH_SOLID:
-       {
-         SALOMEDS::SObject_var objFather = obj->GetFather();
-         SALOMEDS::SComponent_var objComponent = obj->GetFatherComponent();
-         
-         if (( obj->Tag() == 7 ) && (strcmp( objFather->GetID(), objComponent->GetID() ) != 0 ) && ( objFather->Tag() >= 3 ))
-           Ok = true;
-         break;
-       }
-      case SUBMESH_COMPOUND:
-       {
-         SALOMEDS::SObject_var objFather = obj->GetFather();
-         SALOMEDS::SComponent_var objComponent = obj->GetFatherComponent();
-         
-         if (( obj->Tag() == 8 ) && (strcmp( objFather->GetID(), objComponent->GetID() ) != 0 ) && ( objFather->Tag() >= 3 ))
-           Ok = true;
-         break;
-       }
-      }
-
-    if ( Ok )
-      return true;
-  }
-  return false;
-}
diff --git a/src/MEDGUI/SMESH_TypeFilter.hxx b/src/MEDGUI/SMESH_TypeFilter.hxx
deleted file mode 100644 (file)
index 9e98ab8..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-// File generated by CPPExt (Transient)
-//
-//                     Copyright (C) 1991,1995 by
-//  
-//                      MATRA DATAVISION, FRANCE
-//  
-// This software is furnished in accordance with the terms and conditions
-// of the contract and with the inclusion of the above copyright notice.
-// This software or any other copy thereof may not be provided or otherwise
-// be made available to any other person. No title to an ownership of the
-// software is hereby transferred.
-//  
-// At the termination of the contract, the software and all copies of this
-// software must be deleted.
-//
-#ifndef _SMESH_TypeFilter_HeaderFile
-#define _SMESH_TypeFilter_HeaderFile
-
-#ifndef _Handle_SMESH_TypeFilter_HeaderFile
-#include "Handle_SMESH_TypeFilter.hxx"
-#endif
-
-#include "SALOME_InteractiveObject.hxx"
-#include "SALOME_Filter.hxx"
-#include "SMESH_Type.h"
-
-// Open CASCADE Includes
-#include <Standard.hxx>
-
-class SMESH_TypeFilter : public SALOME_Filter {
-
-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 SMESH_TypeFilter(MeshObjectType aType);
-Standard_EXPORT virtual  Standard_Boolean IsOk(const Handle(SALOME_InteractiveObject)& anobj) const;
-Standard_EXPORT ~SMESH_TypeFilter();
-
-
-
-
- // Type management
- //
- Standard_EXPORT friend Handle_Standard_Type& SMESH_TypeFilter_Type_();
- Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
- Standard_EXPORT Standard_Boolean            IsKind(const Handle(Standard_Type)&) const;
-
-protected:
-
- // Methods PROTECTED
- // 
-
-
- // Fields PROTECTED
- //
-MeshObjectType myKind;
-
-private: 
-
- // Methods PRIVATE
- // 
-
-
- // Fields PRIVATE
- //
-
-
-};
-
-
-
-
-
-// other inline functions and methods (like "C++: function call" methods)
-//
-
-
-#endif
index dc47549855b4e15eaf94f7c61a526fd4cef1150b..ffdf337a4b48e08d89acd8be609475ec04e1181b 100644 (file)
@@ -15,7 +15,7 @@ VPATH=.:@srcdir@
 
 @COMMENCE@
 
-#SUBDIRS = MEDMEM MEDMEM_SWIG MedMem MED MEDGUI MedCorba_Swig
-SUBDIRS = MEDMEM MEDMEM_SWIG MedMem MED MedCorba_Swig
+SUBDIRS = MEDMEM MEDMEM_SWIG MedMem MED MEDGUI MedCorba_Swig
+#SUBDIRS = MEDMEM MEDMEM_SWIG MedMem MED MedCorba_Swig
 
 @MODULE@