Abort document operation after error in process apply (Bug #340).

[modules/hydro.git] / src / HYDROData / HYDROData_Document.h

diff --git a/src/HYDROData/HYDROData_Document.h b/src/HYDROData/HYDROData_Document.h
index a702b03c52f8d45e81ca764a49e2fea297ecca5a..1de23428a08d4be1d53b5148a2df943491a01bd7 100644 (file)
--- a/src/HYDROData/HYDROData_Document.h
+++ b/src/HYDROData/HYDROData_Document.h
@@ -43,7 +43,9 @@ public:
 
   //! Returns the document by object
   HYDRODATA_EXPORT static Handle(HYDROData_Document) Document( 
-    const Handle(HYDROData_Entity)& theObject );
+    const TDF_Label& theObjectLabel );
+
+public:
 
   //! Returns true if data model contains document for this study
   HYDRODATA_EXPORT static bool HasDocument(const int theStudyID);
@@ -52,6 +54,8 @@ public:
   HYDRODATA_EXPORT static bool DocumentId( const Handle(HYDROData_Document)& theDocument,
                                            int&                              theDocId );
 
+public:
+
   //! Loads the OCAF document from the file.
   //! \param theFileName full name of the file to load
   //! \param theStudyID identifier of the SALOME study to associate with loaded file
@@ -66,6 +70,8 @@ public:
   //! Removes document data
   HYDRODATA_EXPORT void Close();
 
+public:
+
   // Returns name of document instance in python dump script
   HYDRODATA_EXPORT QString GetDocPyName() const;
 
@@ -77,6 +83,8 @@ public:
   //! Dump model data to Python script representation.
   HYDRODATA_EXPORT virtual QStringList DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const;
 
+public:
+
   //! Starts a new operation (opens a tansaction)
   HYDRODATA_EXPORT void StartOperation();
   //! Finishes the previously started operation (closes the transaction)
@@ -89,6 +97,8 @@ public:
   //! Returns true if document was modified (since creation/opening)
   HYDRODATA_EXPORT bool IsModified();
 
+public:
+
   //! Returns True if there are available Undos
   HYDRODATA_EXPORT bool CanUndo();
   //! Returns a list of stored undo actions
@@ -107,28 +117,41 @@ public:
   //! Redoes last operation
   HYDRODATA_EXPORT void Redo();
 
+public:
+
   //! Creates and locates in the document a new object
   //! \param theKind kind of the created object, can not be UNKNOWN
   //! \returns the created object
   HYDRODATA_EXPORT Handle(HYDROData_Entity) CreateObject(const ObjectKind theKind);
 
+
+  //! Find the data object with the specified name.
+  HYDRODATA_EXPORT Handle(HYDROData_Entity) FindObjectByName( 
+    const QString&   theName, 
+    const ObjectKind theObjectKind = KIND_UNKNOWN ) const;
+
+  //! Find the data objects with the specified names.
+  HYDRODATA_EXPORT HYDROData_SequenceOfObjects FindObjectsByNames(
+    const QStringList& theNames, 
+    const ObjectKind   theObjectKind = KIND_UNKNOWN ) const;
+
 protected:
 
   friend class HYDROData_Iterator;
   friend class test_HYDROData_Document;
 
   //! Creates new document: private because "Document" method must be used instead of direct creation.
-  HYDROData_Document();
+  HYDRODATA_EXPORT HYDROData_Document();
   //! Creates new document by existing OCAF structure
-  HYDROData_Document(const Handle(TDocStd_Document)& theDoc);
+  HYDRODATA_EXPORT HYDROData_Document(const Handle(TDocStd_Document)& theDoc);
   //! Deletes all high-level data, managed this document
-  ~HYDROData_Document();
+  HYDRODATA_EXPORT ~HYDROData_Document();
 
   //! Returns the new identifier of the new object (may be used for correct ordering of objects)
   HYDRODATA_EXPORT int NewID();
 
   //! Returns the label where the objects are located (used by Iterator)
-  TDF_Label LabelOfObjects();
+  HYDRODATA_EXPORT TDF_Label LabelOfObjects();
 
 private: