X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHDS%2FSMESHDS_Script.hxx;h=3874facfcecdc9f895d2eaea615967df5a906035;hp=2183cc5f0ecb973204a73ea676b98eb259fa838b;hb=423f097f5e34c955b122291ad657d8ac49d8aae0;hpb=4791f5b30ea7a9c1247aa551750dc71cb83b99aa

diff --git a/src/SMESHDS/SMESHDS_Script.hxx b/src/SMESHDS/SMESHDS_Script.hxx
index 2183cc5f0..3874facfc 100644
--- a/src/SMESHDS/SMESHDS_Script.hxx
+++ b/src/SMESHDS/SMESHDS_Script.hxx
@@ -27,103 +27,51 @@
 #ifndef _SMESHDS_Script_HeaderFile
 #define _SMESHDS_Script_HeaderFile
 
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Handle_SMESHDS_Script_HeaderFile
-#include "Handle_SMESHDS_Script.hxx"
-#endif
-
-#ifndef _SMESHDS_ListOfCommand_HeaderFile
-#include "SMESHDS_ListOfCommand.hxx"
-#endif
-#ifndef _MMgt_TShared_HeaderFile
-#include <MMgt_TShared.hxx>
-#endif
-#ifndef _Standard_Integer_HeaderFile
-#include <Standard_Integer.hxx>
-#endif
-#ifndef _Standard_Real_HeaderFile
-#include <Standard_Real.hxx>
-#endif
-class SMESHDS_ListOfCommand;
-
-
-class SMESHDS_Script : public MMgt_TShared {
-
-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   void AddNode(const Standard_Integer NewNodeID,const Standard_Real x,const Standard_Real y,const Standard_Real z) ;
-Standard_EXPORT   void AddEdge(const Standard_Integer NewEdgeID,const Standard_Integer idnode1,const Standard_Integer idnode2) ;
-Standard_EXPORT   void AddFace(const Standard_Integer NewFaceID,const Standard_Integer idnode1,const Standard_Integer idnode2,const Standard_Integer idnode3) ;
-Standard_EXPORT   void AddFace(const Standard_Integer NewFaceID,const Standard_Integer idnode1,const Standard_Integer idnode2,const Standard_Integer idnode3,const Standard_Integer idnode4) ;
-Standard_EXPORT   void AddVolume(const Standard_Integer NewVolID,const Standard_Integer idnode1,const Standard_Integer idnode2,const Standard_Integer idnode3,const Standard_Integer idnode4) ;
-Standard_EXPORT   void AddVolume(const Standard_Integer NewVolID,const Standard_Integer idnode1,const Standard_Integer idnode2,const Standard_Integer idnode3,const Standard_Integer idnode4,const Standard_Integer idnode5) ;
-Standard_EXPORT   void AddVolume(const Standard_Integer NewVolID,const Standard_Integer idnode1,const Standard_Integer idnode2,const Standard_Integer idnode3,const Standard_Integer idnode4,const Standard_Integer idnode5,const Standard_Integer idnode6) ;
-Standard_EXPORT   void AddVolume(const Standard_Integer NewVolID,const Standard_Integer idnode1,const Standard_Integer idnode2,const Standard_Integer idnode3,const Standard_Integer idnode4,const Standard_Integer idnode5,const Standard_Integer idnode6,const Standard_Integer idnode7,const Standard_Integer idnode8) ;
-Standard_EXPORT   void MoveNode(const Standard_Integer NewNodeID,const Standard_Real x,const Standard_Real y,const Standard_Real z) ;
-Standard_EXPORT   void RemoveNode(const Standard_Integer NodeID) ;
-Standard_EXPORT   void RemoveElement(const Standard_Integer ElementID) ;
-Standard_EXPORT   void Clear() ;
-Standard_EXPORT  const SMESHDS_ListOfCommand& GetCommands() ;
-Standard_EXPORT ~SMESHDS_Script();
-
-
-
-
- // Type management
- //
- Standard_EXPORT friend Handle_Standard_Type& SMESHDS_Script_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
- //
-SMESHDS_ListOfCommand myCommands;
-
-
+#include "SMESHDS_Command.hxx"
+
+#include <list>
+#include <vector>
+
+
+class SMESHDS_Script
+{
+  public:
+	void AddNode(int NewNodeID, double x, double y, double z);
+	void AddEdge(int NewEdgeID, int idnode1, int idnode2);
+	void AddFace(int NewFaceID, int idnode1, int idnode2, int idnode3);
+	void AddFace(int NewFaceID, int idnode1, int idnode2, int idnode3,
+  		int idnode4);
+	void AddVolume(int NewVolID, int idnode1, int idnode2, int idnode3,
+  		int idnode4);
+	void AddVolume(int NewVolID, int idnode1, int idnode2, int idnode3,
+  		int idnode4, int idnode5);
+	void AddVolume(int NewVolID, int idnode1, int idnode2, int idnode3,
+  		int idnode4, int idnode5, int idnode6);
+	void AddVolume(int NewVolID, int idnode1, int idnode2, int idnode3,
+  		int idnode4, int idnode5, int idnode6, int idnode7, int idnode8);
+
+        void AddPolygonalFace (const int NewFaceID,
+                               std::vector<int> nodes_ids);
+	void AddPolyhedralVolume (const int NewVolID,
+                                  std::vector<int> nodes_ids,
+                                  std::vector<int> quantities);
+
+        void MoveNode(int NewNodeID, double x, double y, double z);
+	void RemoveNode(int NodeID);
+	void RemoveElement(int ElementID);
+	void ChangeElementNodes(int ElementID, int nodes[], int nbnodes);
+	void ChangePolyhedronNodes(const int        ElementID,
+                                   std::vector<int> nodes_ids,
+                                   std::vector<int> quantities);
+	void Renumber (const bool isNodes, const int startID, const int deltaID);
+	void Clear();
+	const std::list<SMESHDS_Command*> & GetCommands();
+	~SMESHDS_Script();
+  
+  private:
+	SMESHDS_Command* getCommand(const SMESHDS_CommandType aType);
+
+	std::list<SMESHDS_Command*> myCommands;
 };
 
-
-
-
-
-// other inline functions and methods (like "C++: function call" methods)
-//
-
-
 #endif