From 5e9a572ab896b9df457b85e3ba1b8ed0fe6fbfba Mon Sep 17 00:00:00 2001 From: smh Date: Mon, 26 Jan 2004 13:30:23 +0000 Subject: [PATCH] MPV: Merge V1.2c --- idl/Makefile.in | 3 +- idl/SALOMEDS.idl | 394 +++++++++++++++++++++++++---------- idl/SALOMEDS_Attributes.idl | 187 ++++++++++++----- idl/SALOME_Component.idl | 8 +- idl/SALOME_Exception.idl | 2 +- idl/SALOME_ModuleCatalog.idl | 27 ++- idl/SALOME_Session.idl | 9 +- 7 files changed, 456 insertions(+), 174 deletions(-) diff --git a/idl/Makefile.in b/idl/Makefile.in index cda494641..8033ab2b0 100644 --- a/idl/Makefile.in +++ b/idl/Makefile.in @@ -24,7 +24,8 @@ IDL_FILES = \ TypeData.idl \ MPIObject.idl \ MPIContainer.idl \ - Logger.idl + Logger.idl \ + SALOME_GenericObj.idl PY_CLIENT_IDL = $(IDL_FILES) diff --git a/idl/SALOMEDS.idl b/idl/SALOMEDS.idl index ed5f15d54..686297a17 100644 --- a/idl/SALOMEDS.idl +++ b/idl/SALOMEDS.idl @@ -2,20 +2,20 @@ // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // // This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// +// 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org // // // @@ -23,8 +23,8 @@ // Author : Yves FRICAUD // $Header$ -/*! \mainpage - \image html Application-About.png +/*! \mainpage + \image html Application-About.png */ /*! @@ -62,20 +62,20 @@ module SALOMEDS typedef string SalomeReference; /*! List of the names of studies which are currently open in this %SALOME session. -Since %SALOME is a multi-study application, it allows to open a lot of studies +Since %SALOME is a multi-study application, it allows to open a lot of studies during each working session. */ typedef sequence ListOfOpenStudies; /*! List of file names */ typedef sequence ListOfFileNames; -/*! List of modification dates of the study +/*! List of modification dates of a study */ typedef sequence ListOfDates ; /*! An unbounded sequence of strings */ typedef sequence ListOfStrings ; -/*! A byte stream which is used for binary data transfer between components +/*! A byte stream which is used for binary data transfer between different components */ typedef sequence TMPFile; @@ -100,11 +100,11 @@ during each working session. interface UseCaseBuilder; interface Callback; -/*! List of attributes +/*! List of attributes of %SObjects */ typedef sequence ListOfAttributes; -/*! Exception indicating that this feature hasn't been implemented. +/*! Exception indicating that this feature hasn't been implemented in %SALOME PRO application. */ exception NotImplemented {}; @@ -127,6 +127,7 @@ during each working session. interface Study { + exception StudyInvalidContext {}; exception StudyInvalidComponent {}; /*! Invalid directory of the %study exception @@ -180,25 +181,40 @@ during each working session. SComponent FindComponentID(in ID aComponentID); /*! Allows to find a %SObject by the Name Attribute of this %SObject + + \param anObjectName String parameter defining the name of the object + \return The obtained %SObject +
See also an example of this method usage in batchmode of %SALOME application. */ SObject FindObject (in string anObjectName); /*! Allows to find a %SObject by its ID + \param aObjectID This parameter defines the ID of the required object + \return The obtained %SObject + */ SObject FindObjectID (in ID aObjectID); /*! Allows to find a %SObject by IOR of the object belonging to this %SObject. + \param anObjectName This parameter defines the IOR of the object + \return The obtained %SObject + */ SObject FindObjectIOR (in ID aObjectIOR); /*! - Returns a list of %SObjects belonging to this %Component. The Name Attribute - of these %SObjects should correspond to anObjectName. + Finds in the study all %SObjects produced by a given %Component. + \param anObjectName The Name Attribute of the searched %SObjects should correspond to anObjectName. + \param aComponentName The name of the component, which objects are searched for. */ ListOfSObject FindObjectByName(in string anObjectName, in string aComponentName); /*! Allows to find a %SObject by the path to it. + + \param thePath The path to the required %SObject. + \return The obtained %SObject. + */ SObject FindObjectByPath(in string thePath); /*! @@ -208,12 +224,15 @@ during each working session. /*! Sets the context of the %Study. + \param thePath String parameter defining the context of the study. +
See also an example of this method usage in batchmode of %SALOME application. */ void SetContext(in string thePath); /*! - Gets the context of the %Study + Gets the context of the %Study. +
See also an example of this method usage in batchmode of %SALOME application. */ @@ -238,19 +257,24 @@ during each working session. \note If the parameter theContext is empty, then the current context will be used. */ ListOfStrings GetComponentNames(in string theContext); -/*! \brief Creation of a new iterator of child levels - - Creates a new iterator of child levels of the %SObject +/*! + Creates a new iterator of child levels of the given %SObject. + \param aSO The given %SObject + \return A new iterator of child levels of the given %SObject. */ ChildIterator NewChildIterator(in SObject aSO); -/*! \brief Creation of a new iterator of the %SComponent +/*! - Creates a new iterator of the %SComponent. + Creates a new iterator of the %SComponents. + + \return A new iterator of the %SComponents. */ SComponentIterator NewComponentIterator(); -/*! \brief Creation of a %StudyBuilder - +/*! Creates a new %StudyBuilder to add or modify an object in the study. + + \return A new %StudyBuilder. +
See also an example of this method usage in batchmode of %SALOME application. */ @@ -264,6 +288,7 @@ during each working session. /*! \brief Getting properties of the study Returns the attriubte, which contains the properties of this study. +
See also an example of this method usage in batchmode of %SALOME application. */ @@ -324,6 +349,17 @@ during each working session. Enables(if isEnabled = True)/disables automatic addition of new %SObjects to the use case. */ void EnableUseCaseAutoFilling(in boolean isEnabled); + +/*! + Functions for internal usage only +*/ + void AddPostponed(in string theIOR); + + void AddCreatedPostponed(in string theIOR); + + void RemovePostponed(in long theUndoLimit); + + void UndoPostponed(in long theWay); }; //========================================================================== @@ -354,49 +390,66 @@ during each working session.
See also an example of this method usage in batchmode of %SALOME application. */ - SComponent NewComponent(in string ComponentDataType); + SComponent NewComponent(in string ComponentDataType) raises(LockProtection); /*! \brief Definition of the instance to the %SComponent Defines the instance to the %SComponent. */ - void DefineComponentInstance (in SComponent aComponent,in Object ComponentIOR); -/*! \brief Deletion of the %SComponent + void DefineComponentInstance (in SComponent aComponent,in Object ComponentIOR) raises(LockProtection); +/*! \brief Deletion of a %SComponent - Removes the %SComponent. + Removes a %SComponent. */ - void RemoveComponent(in SComponent aComponent); + void RemoveComponent(in SComponent aComponent) raises(LockProtection); /*! \brief Creation of a new %SObject - Creates a new %SObject. + Creates a new %SObject under a definite father %SObject. + + \param theFatherObject The father %SObject under which this one should be created. + \return New %SObject +
See also an example of this method usage in batchmode of %SALOME application. */ - SObject NewObject (in SObject theFatherObject); + + SObject NewObject (in SObject theFatherObject) raises(LockProtection); + /*! \brief Creation of a new %SObject with a definite %tag Creates a new %SObject with a definite %tag. + + \param atag Long value corresponding to the tag of the new %SObject. + \return New %SObject + */ - SObject NewObjectToTag (in SObject theFatherObject, in long atag); + SObject NewObjectToTag (in SObject theFatherObject, in long atag) raises(LockProtection); /*! \brief Deletion of the %SObject Removes a %SObject from the %StudyBuilder. + + \param anObject The %SObject to be deleted. */ - void RemoveObject (in SObject anObject); + void RemoveObject (in SObject anObject) raises(LockProtection); /*! \brief Deletion of the %SObject with all his child objects. Removes the %SObject with all his child objects. + + \param anObject The %SObject to be deleted with all child objects. */ - void RemoveObjectWithChildren(in SObject anObject); + void RemoveObjectWithChildren(in SObject anObject) raises(LockProtection); /*! Loads a %SComponent. +
See also an example of this method usage in batchmode of %SALOME application. */ void LoadWith (in SComponent sco, in Driver Engine) raises (SALOME::SALOME_Exception); /*! Loads a %SObject. + + \param sco %SObject to be loaded. */ void Load (in SObject sco); @@ -410,9 +463,9 @@ during each working session. */ GenericAttribute FindOrCreateAttribute(in SObject anObject, - in string aTypeOfAttribute); + in string aTypeOfAttribute) raises(LockProtection); -/*! \brief Looking for an attribute assigned to %SObject +/*! \brief Looking for an attribute assigned to a %SObject Allows to find an attribute of a specific type which is assigned to the object. \param anObject The %SObject corresponding to the attribute which is looked for. @@ -433,37 +486,46 @@ during each working session.
See also an example of this method usage in batchmode of %SALOME application. */ void RemoveAttribute(in SObject anObject, - in string aTypeOfAttribute); -/*! \brief Addition of a reference - + in string aTypeOfAttribute) raises(LockProtection); +/*! Adds a reference between %anObject and %theReferencedObject. + \param anObject The %SObject which will get a reference + \param theReferencedObject The %SObject having a reference */ void Addreference(in SObject anObject, in SObject theReferencedObject) ; /*! Adds a directory in the %Study. + \param theName String parameter defining the name of the directory. +
See also an example of this method usage in batchmode of %SALOME application. */ - void AddDirectory(in string theName); + void AddDirectory(in string theName) raises(LockProtection); /*! \brief Identification of the %SObject's substructure. Identification of the %SObject's substructure by GUID. - It has the following format "00000000-0000-0000-0000-000000000000" + + + \param anObject The %SObject which will be identified + \param theGUID GUID has the following format "00000000-0000-0000-0000-000000000000" */ - void SetGUID(in SObject anObject, in string theGUID); + void SetGUID(in SObject anObject, in string theGUID) raises(LockProtection); /*! +Searches for a definite %SObject with a definite GUID and returns True if it finds it. - Returns True if the %SObject has GUID. +\param anObject A definite %SObject which will be identified +\param theGUID GUID has the following format "00000000-0000-0000-0000-000000000000" */ boolean IsGUID(in SObject anObject, in string theGUID); /*! \brief Creation of a new command Creates a new command which can contain several different actions. +
See also an example of this method usage in batchmode of %SALOME application. */ @@ -471,6 +533,9 @@ during each working session. /*! \brief Execution of the command Commits all actions declared within this command. + + \exception LockProtection This exception is raised, when trying to perform this command a study, which is protected for modifications. +
See also an example of this method usage in batchmode of %SALOME application. */ @@ -482,6 +547,7 @@ during each working session. /*! \brief Cancelation of the command Cancels all actions declared within the command. +
See also an example of this method usage in batchmode of %SALOME application. */ void AbortCommand(); // command management @@ -493,6 +559,9 @@ during each working session. /*! \brief Undo method Cancels all actions of the last command. + + \exception LockProtection This exception is raised, when trying to perform this command a study, which is protected for modifications. +
See also an example of this method usage in batchmode of %SALOME application. */ @@ -500,28 +569,40 @@ during each working session. /*! \brief Redo method Redoes all actions of the last command. + +\exception LockProtection This exception is raised, when trying to perform this command a study, which is protected for modifications. +
See also an example of this method usage in batchmode of %SALOME application. */ void Redo() raises (LockProtection); /*! Returns True if at this moment there are any actions which can be canceled. +
See also an example of this method usage in batchmode of %SALOME application. */ boolean GetAvailableUndos(); /*! Returns True if at this moment there are any actions which can be redone. +
See also an example of this method usage in batchmode of %SALOME application. */ boolean GetAvailableRedos(); /*! - Sets the callback for addition of the given %SObject. Returns the previous callback. + This method is called when adding an object into study. + It sets the callback for addition of the given %SObject. + \param theCallback New assigned callback. + \return The previous callback. */ Callback SetOnAddSObject(in Callback theCallback); /*! - Sets the callback for removal of the given %SObject. Returns the previous callback. + This method is called when adding an object into study. + It sets the callback for removal of the given %SObject. + + \return The previous callback. + \param theCallback New assigned callback. */ Callback SetOnRemoveSObject(in Callback theCallback); @@ -545,9 +626,12 @@ during each working session. */ void ping(); -/*! \brief Creation of a new %Study +/*! \brief Creation of a new study + + Creates a new study with a definite name. + + \param study_name String parameter defining the name of the study - Creates a new %Study with a definite name.
See also an example of this method usage in batchmode of %SALOME application. */ @@ -556,33 +640,39 @@ during each working session. /*! \brief Open a study Reads and activates the structure of the study %Objects. + \param aStudyUrl The path to the study \warning This method doesn't activate the corba objects. Only a component can do it. +
See also an example of this method usage in batchmode of %SALOME application. */ Study Open (in URL aStudyUrl) raises (SALOME::SALOME_Exception); /*! \brief Closing the study - Closes the study. + Closes a study. */ void Close(in Study aStudy); /*! \brief Saving the study in a HDF file (or files). - Saves the study. + Saves a study. + \param theMultiFile If this parameter is True the study will be saved in several files. +
See also an example of this method usage in batchmode of %SALOME application. */ void Save(in Study aStudy, in boolean theMultiFile); -/*! \brief Saving the study in a ASCII file (or files). +/*! \brief Saving a study in a ASCII file (or files). - Saves the study in a ASCII format. + Saves a study in an ASCII format file (or files). \param theMultiFile If this parameter is True the study will be saved in several files. */ void SaveASCII(in Study aStudy, in boolean theMultiFile); /*! \brief Saving the study in a specified HDF file (or files). Saves the study in a specified file (or files). + \param aUrl The path to the definite file in whcih the study will be saved + \param aStudy The study which will be saved \param theMultiFile If this parameter is True the study will be saved in several files.
See also an example of this method usage in batchmode of %SALOME application. @@ -593,6 +683,9 @@ during each working session. /*! \brief Saving the study in a specified ASCII file (or files). Saves the study in a specified ASCII file (or files). + + \param aUrl The path to the definite file in whcih the study will be saved + \param aStudy The study which will be saved \param theMultiFile If this parameter is True the study will be saved in several files. */ void SaveAsASCII(in URL aUrl, // if the file already exists @@ -602,21 +695,25 @@ during each working session. /*! \brief List of open studies. - Returns the list of open studies in the current session. +Gets the list of open studies + + \return A list of open studies in the current session. */ ListOfOpenStudies GetOpenStudies(); /*! \brief Getting a particular %Study picked by name Activates a particular %Study - amongst the session collection picking it by name. + among the session collection picking it by name. + \param aStudyName The name of the study */ Study GetStudyByName (in string aStudyName); /*! \brief Getting a particular %Study picked by ID Activates a particular %Study - amongst the session collection picking it by ID. + among the session collection picking it by ID. + \param aStudyID The ID of the study */ Study GetStudyByID (in short aStudyID); @@ -628,14 +725,19 @@ during each working session. boolean CanCopy(in SObject theObject); /*! Returns True, if the given %SObject is copied to the clipboard. + \param theObject The %SObject which will be copied */ boolean Copy(in SObject theObject); /*! Returns True, if the object from the clipboard can be pasted to the given %SObject. + \param theObject The %SObject stored in the clipboard. */ boolean CanPaste(in SObject theObject); /*! Returns the %SObject in which the object from the clipboard was pasted to. + \param theObject The %SObject which will be pasted + \exception SALOMEDS::StudyBuilder::LockProtection This exception is raised, when trying to paste + an object into a study, which is protected for modifications. */ SObject Paste(in SObject theObject) raises (SALOMEDS::StudyBuilder::LockProtection); }; @@ -647,6 +749,7 @@ during each working session. The objects in the %study are built by the %StudyBuilder. The %SObject interface provides methods for elementary inquiries, like getting an object %ID or its attribuites. \note +
Tag of an item in %SALOME application is an integer value uniquely defining an item in the tree-type data structure.
ID of an item is a description of item's position in the tree-type data structure. @@ -659,54 +762,59 @@ during each working session. /*! Name of the %SObject */ attribute string Name; // equivalent to setName() & getName() -/*! \brief Getting an object %ID +/*! Gets an object %ID - Returns ID of the %SObject. + \return ID of the %SObject. */ ID GetID(); -/*! \brief Acquisition of the father %Component of the %SObject +/*! Acquisition of the father %Component of the %SObject - Returns the father %Component of the %SObject. + \return The father %Component of the %SObject. */ SComponent GetFatherComponent(); -/*! \brief Acquisition of the father %SObject of the %SObject +/*! Acquisition of the father %SObject of the %SObject - Returns the father %SObject of the given %SObject. + \return the father %SObject of the given %SObject. */ SObject GetFather(); -/*! \brief %Tag of %SObject +/*! Gets the %tag of a %SObject - Returns the %tag of the %SObject. + \return the %tag of a %SObject. */ short Tag(); -/*! \brief Looking for subobjects of an object. +/*! Looks for subobjects of a given %SObject. - Returns True if it finds a subobject of the %SObject with a definite tag. + \param atag Tag of the given %SObject + \return True if it finds a subobject of the %SObject with a definite tag as well as the required subobject. */ boolean FindSubObject (in long atag, out SObject obj); -/*! \brief Looking for attributes of the %SObject +/*! Looks for attributes of a given %SObject + + \param aTypeOfAttribute String value defining the type of the required attribute of the given %SObject. + \return True if it finds an attribute of a definite type of the given %SObject as well as the discovered attribute. - Returns True if it finds an attribute of a definite type of the %SObject.
See also an example of this method usage in batchmode of %SALOME application. */ boolean FindAttribute(out GenericAttribute anAttribute, in string aTypeOfAttribute); -/*! - Returns the object which this %SObject refers to. It also returns True if it finds +/*! Looks for a %SObject which the given %SObject refers to. + + \return The object which the given %SObject refers to as well as True if it finds this object. */ boolean ReferencedObject(out SObject obj); // A REVOIR -/*! \brief Getting all attributes of the %SObject +/*! Gets all attributes of a given %SObject + + \return The list of all attributes of the given %SObject. - Returns the list of all attributes of the %SObject.
See also an example of this method usage in batchmode of %SALOME application. */ ListOfAttributes GetAllAttributes(); -/*! \brief Returning the study +/*! Gets the study of a given %SObject. - Returns the study containing the given %SObject. + /return The study containing the given %SObject. */ Study GetStudy(); }; @@ -728,7 +836,8 @@ during each working session. /*! \brief Method CheckLocked Checks whether the %Study is protected for modifications. - \note
This exception is raised only outside the transaction. + + \note
This exception is raised only outside a transaction. */ void CheckLocked() raises (LockProtection); }; @@ -745,13 +854,14 @@ during each working session. //========================================================================== interface SComponent : SObject { -/*! \brief Data type of the %SComponent +/*! Gets the data type of the given %SComponent - Returns the data type of the %SComponent. + \return The data type of this %SComponent. */ string ComponentDataType(); -/*! - Returns IOR of the according component. +/*! Gets the IOR of the given component + + \return True (if there is an instance of the given component) and its IOR. */ boolean ComponentIOR (out ID theID); //returns True if there is an instance //In this case ID identifies this one @@ -767,23 +877,22 @@ during each working session. //========================================================================== interface SComponentIterator { -/*! \brief Initialization of the Iterator - +/*! Activates the %SComponentIterator. */ void Init(); -/*! \brief Method More +/*! Method More - Returns True if there is one more %SComponent in the list. + \return True if there is one more %SComponent in the list. */ boolean More(); -/*! \brief Moving the iterator to the next %SComponent - +/*! Moves the iterator to the next %SComponent in the list. */ void Next(); /*! Returns the %SComponent corresponding to the current %SComponent found by the iterator. +
See also an example of this method usage in batchmode of %SALOME application. */ @@ -799,19 +908,21 @@ Moves the iterator to the next %SComponent in the list. //========================================================================== interface ChildIterator { -/*! \brief Initialization of the Iterator. +/*! Activates the %ChildIterator. */ void Init(); -/*! \brief Initialization of the Iterator for all child levels. +/*! + +Activates the %ChildIterator for all child levels. -Activates the %ChildIterator (if True) for all child levels. +\param allLevels If this boolean parameter is True, the %ChildIterator will be activated for all child levels. */ void InitEx(in boolean allLevels); -/*! \brief Method More +/*! Method More - Returns True if the %ChildIterator finds one more child level. + \return True if there is one more %ChildIterator in the list. */ boolean More(); /*! @@ -832,14 +943,14 @@ Activates the %ChildIterator (if True) for all child levels. */ interface UseCaseIterator { -/*! \brief Initialization of the Iterator. - -Activates the %UseCaseIterator. If allLevels is True the Iterator is activated for all subobjects. +/*! +Activates the %UseCaseIterator. +\param allLevels If the value of this parameter is True the Iterator is activated for all subobjects. */ void Init(in boolean allLevels); -/*! \brief Method More +/*! Method More - Returns True if the %UseCaseIterator finds one more object. + \return True if the %UseCaseIterator finds one more object. */ boolean More(); /*! @@ -862,11 +973,17 @@ Activates the %UseCaseIterator. If allLevels is True the Iterator is interface UseCaseBuilder { /*! - Adds to the use case an object theObject as a child of the current object of the use case. + Adds to the use case an object as a child of the current object of the use case. + + \param theObject The added %SObject. + \return True if this %SObject has been added in the use case. */ boolean Append(in SObject theObject); /*! - Removes an object theObject from the use case. + Removes an object from the use case. + + \param theObject The deleted %SObject + \return True if this %SObject has been deleted from the use case. */ boolean Remove(in SObject theObject); /*! @@ -936,17 +1053,26 @@ Activates the %UseCaseIterator. If allLevels is True the Iterator is //========================================================================== /*! \brief %Driver interface - This interface contains a set of methods used for the management - of the object produced in the %study by a component. +This class represents a common tool for all components integrated into SALOME application, that allows them to communicate with the study. It contains a set of methods which +can be called by any component and which provide the following functionality: +
    +
  • publishing in the study of the objects created by a definite component +
  • saving/loading of the data created by a definite component. These methods are called by the StudyManager when loading/saving a study containing the data created by a definite component. +
  • transforming of the transient references into persistant references (or vice versa) of the SObjects when saving (or loading) a study +
  • copy/paste common functionality. These methods can be called by any component in order to copy/paste its object created in the study +
+ */ //========================================================================== interface Driver { - /*! \brief Saving the data. + /*! \brief Saving the data produced by a definite component. This method is called by the StudyManager when saving a study. \param theComponent %SComponent corresponding to this Component + \param theURL The path to the file in which the data will be saved. + \param isMultiFile If the value of this boolean parameter is True, the data will be saved in several files. \return A byte stream TMPFile that contains all saved data
See also an example of this method usage in batchmode of %SALOME application. @@ -956,6 +1082,17 @@ Activates the %UseCaseIterator. If allLevels is True the Iterator is TMPFile Save(in SComponent theComponent, in string theURL, in boolean isMultiFile); +/*! \brief Saving the data in ASCII format produced by a definite component. + + This method is called by the StudyManager when saving a study in ASCII format. + \param theComponent %SComponent corresponding to this Component + \param theURL The path to the file in which the data will be saved. + \param isMultiFile If the value of this boolean parameter is True, the data will be saved in several files. + \return A byte stream TMPFile that will contain all saved data + +
See also an example of this method usage in batchmode of %SALOME application. + + */ TMPFile SaveASCII(in SComponent theComponent, in string theURL, in boolean isMultiFile); /*! \brief Loading the data. @@ -963,32 +1100,53 @@ Activates the %UseCaseIterator. If allLevels is True the Iterator is This method is called by the StudyManager when opening a study. \param theComponent %SComponent corresponding to this Component \param theStream The file which contains all data saved by the component on Save method + \param isMultiFile If the value of this boolean parameter is True, the data will be loaded from several files + */ boolean Load(in SComponent theComponent, in TMPFile theStream, in string theURL, in boolean isMultiFile); + /*! \brief Loading the data from files in ASCII format. + + This method is called by the StudyManager when opening a study. + \param theComponent %SComponent corresponding to this Component + \param theStream The file which contains all data saved by the component on Save method + \param isMultiFile If the value of this boolean parameter is True, the data will be loaded from several files + + */ + boolean LoadASCII(in SComponent theComponent, in TMPFile theStream, in string theURL, in boolean isMultiFile); /*! \brief Closing of the study This method Close is called by the StudyManager when closing a study. - + \param aSComponent The according %SComponent */ void Close (in SComponent aSComponent); //void Close ( in string aIORSComponent); - /*! \brief The type of the data + /*! Gets the type of the data - Returns the type of data produced by the Component in the study. + \return The type of data produced by the Component in the study. */ string ComponentDataType(); // Driver Transient -> persistent called for each object in study /*! - Transforms IOR into PersistentID of the object. It is called for each + Transforms IOR of a given %SObject into PersistentID. It is called for each object in the %study. +\note
In %SALOME the objects which are present in an active study are identified by an IOR, when this +study is saved these references are transformed into persintent IDs. + + \param theSObject The given %SObject. + \param IORString The IOR of the given %SObject. + \param isMultiFile If this parameter is True the study containing the given %SObject is stored in several files. + \param isASCII If this parameter is True the study containing the given %SObject is stored in ASCII format. + + \return The persistent ID of the given %SObject + */ string IORToLocalPersistentID (in SObject theSObject, in string IORString, @@ -997,6 +1155,17 @@ Activates the %UseCaseIterator. If allLevels is True the Iterator is /*! Transforms PersistentID into IOR of the object. It is called for each object in the %study. + + \note
In %SALOME the objects which are present in an saved study (file) are identified by a persistent ID, when this +study is open, these references are transformed into persintent IORs. + + \param theSObject The given %SObject. + \param IORString The IOR of the given %SObject. + \param isMultiFile If this parameter is True the study containing the given %SObject is stored in several files. + \param isASCII If this parameter is True the study containing the given %SObject is stored in ASCII format. + + \return The IOR of the given %SObject + */ string LocalPersistentIDToIOR (in SObject theSObject, in string aLocalPersistentID, @@ -1005,9 +1174,10 @@ Activates the %UseCaseIterator. If allLevels is True the Iterator is raises (SALOME::SALOME_Exception); // Publishing in the study -/*! \brief Publishing in the study +/*! Publishing in the study - Returns True if the given %Component can publish the %object in the %study. + \return True if the given %Component can publish a definite object with a given IOR in the %study. + \param theIOR The IOR of a definite object */ boolean CanPublishInStudy(in Object theIOR) raises (SALOME::SALOME_Exception); /*! \brief Publishing in the study @@ -1019,6 +1189,8 @@ Activates the %UseCaseIterator. If allLevels is True the Iterator is \param theObject The object which is published \param theName The name of the published object. If this parameter is empty, the name is generated automatically by the component. + + \return The published %SObject. */ SObject PublishInStudy(in Study theStudy, in SObject theSObject, in Object theObject, in string theName); @@ -1026,6 +1198,8 @@ Activates the %UseCaseIterator. If allLevels is True the Iterator is /*! Returns True, if the given %SObject can be copied to the clipboard. + + \param theObject The given %SObject which should be copied. */ boolean CanCopy(in SObject theObject); /*! diff --git a/idl/SALOMEDS_Attributes.idl b/idl/SALOMEDS_Attributes.idl index fca28960a..27f1f6dbd 100644 --- a/idl/SALOMEDS_Attributes.idl +++ b/idl/SALOMEDS_Attributes.idl @@ -42,18 +42,19 @@ module SALOMEDS /*! Sequence of string values */ typedef sequence StringSeq; -/*! \struct Color - This structure stores a set of elements defining the color based on RGB. +/*! \struct Color + This structure stores a set of elements defining the color based on RGB palette. These elements are + used as input parameters for methods necessary for color definition of different items. */ struct Color { /*! Red color -*/ +*/ double R; /*! Green color -*/ +*/ double G; /*! Blue color -*/ +*/ double B; }; //========================================================================== @@ -66,11 +67,13 @@ module SALOMEDS { /*! Returns the value of this attribute. +
See also an example of this method usage in batchmode of %SALOME application. */ double Value(); /*! Sets the value of this attribute. +
See also an example of this method usage in batchmode of %SALOME application. */ void SetValue(in double value); @@ -85,11 +88,13 @@ module SALOMEDS { /*! Returns the value of this attribute +
See also an example of this method usage in batchmode of %SALOME application. */ long Value(); /*! Sets the value of this attribute +
See also an example of this method usage in batchmode of %SALOME application. */ void SetValue(in long value); @@ -113,6 +118,7 @@ module SALOMEDS DoubleSeq CorbaSequence(); /*! Adds to the end of the sequence a real number. + \param value A real number added to the sequence.
See also an example of this method usage in batchmode of %SALOME application. @@ -121,22 +127,30 @@ module SALOMEDS /*! Removes a real number with a definite index from the sequence of real numbers stored in the Attribute. + + \param index The index of the given real number */ void Remove(in long index); /*! - Substitutes a real number with a definite index for another real number. + Substitutes a given real number with a definite index for another real number. + \param index The index of the given real number. + \param value The value of another real number. +
See also an example of this method usage in batchmode of %SALOME application. */ void ChangeValue(in long index, in double value); /*! - Returns a real number with a definite index + Returns a given real number with a definite index in the sequence of real numbers stored in the Attribute. + \param index The index of the given real number. +
See also an example of this method usage in batchmode of %SALOME application. */ double Value(in short index); /*! Returns the length of the sequence of real numbers stored in the Attribute. +
See also an example of this method usage in batchmode of %SALOME application. */ @@ -151,7 +165,7 @@ module SALOMEDS interface AttributeSequenceOfInteger : GenericAttribute { /*! - Initialization of the attribute with initial data. + Initialisation of the attribute with initial data. \param other Initially assigned sequence of integer numbers. */ void Assign (in LongSeq other); @@ -170,22 +184,30 @@ module SALOMEDS /*! Removes an integer number with a definite index from the sequence of integer numbers stored in the Attribute. + \param index The index of the given integer number. +
See also an example of this method usage in batchmode of %SALOME application. */ void Remove(in long index); /*! Substitutes an integer number with a definite index for another integer number. + \param index The index of the given integer number. + \param value The value of another integer number. + */ void ChangeValue(in long index, in long value); /*! - Returns an integer number with a definite index + Returns a given integer number with a definite index in the sequence of integer numbers stored in the Attribute. + \param index The index of the given integer number. +
See also an example of this method usage in batchmode of %SALOME application. */ long Value(in short index); /*! Returns the length of the sequence of integer numbers stored in the Attribute. +
See also an example of this method usage in batchmode of %SALOME application. */ @@ -204,11 +226,15 @@ module SALOMEDS { /*! Returns the value of this attribute +
See also an example of this method usage in batchmode of %SALOME application. */ string Value(); /*! Sets the value of this attribute + + \param value This parameter defines the value of this attribute. +
See also an example of this method usage in batchmode of %SALOME application. */ void SetValue(in string value); @@ -225,11 +251,14 @@ module SALOMEDS { /*! Returns the value of this attribute +
See also an example of this method usage in batchmode of %SALOME application. */ string Value(); /*! Sets the value of this attribute + \param value This string parameter defines the value of this attribute - a description of a %SObject. +
See also an example of this method usage in batchmode of %SALOME application. */ void SetValue(in string value); @@ -245,11 +274,14 @@ module SALOMEDS { /*! Returns the value of this attribute +
See also an example of this method usage in batchmode of %SALOME application. */ string Value(); /*! Sets the value of this attribute + \param value This parameter defines the value of this attribute - IOR of a %SObject. +
See also an example of this method usage in batchmode of %SALOME application. */ void SetValue(in string value); @@ -265,11 +297,14 @@ module SALOMEDS { /*! Returns the value of this attribute +
See also an example of this method usage in batchmode of %SALOME application. */ string Value(); /*! Sets the value of this attribute + \param value This parameter defines the value of this attribute. +
See also an example of this method usage in batchmode of %SALOME application. */ void SetValue(in string value); @@ -323,20 +358,24 @@ module SALOMEDS //========================================================================== /*! \brief Drawable flag Attribute. - This is a presentation attribute necessary for display of the study tree in the browser. - The item associated to SObject is created/displayed if TRUE. + This is a presentation attribute necessary for display of a study tree in the browser. + The item associated to a %SObject is created/displayed if TRUE. */ //========================================================================== interface AttributeDrawable : GenericAttribute { /*! Returns TRUE if the item is drawable (as it is by default) and FALSE if it isn't. +
See also an example of this method usage in batchmode of %SALOME application. */ boolean IsDrawable(); /*! -Sets the items to be drawable if value is TRUE (the default) or not to be selectable if valueis FALSE. +Sets the item to be drawable. + +\param value If the value of this boolean parameter is TRUE (default) the item will be drawable. +
See also an example of this method usage in batchmode of %SALOME application. */ @@ -354,12 +393,17 @@ Sets the items to be drawable if value is TRUE (the default) or not t { /*! Returns TRUE if the item is selectable (as it is by default) and FALSE if it isn't. + +
See also an example of this method usage in batchmode of %SALOME application. */ boolean IsSelectable(); /*! -Sets the items to be selectable if value is TRUE (the default) or not to be selectable if valueis FALSE. +Sets the item to be selectable + +\param value If the value of this parameter is TRUE (the default) the item will be set as selectable. +
See also an example of this method usage in batchmode of %SALOME application. */ @@ -378,13 +422,15 @@ Sets the items to be selectable if value is TRUE (the default) or not { /*! Returns TRUE if this item is expandable even when it has no children. +
See also an example of this method usage in batchmode of %SALOME application. */ boolean IsExpandable(); -/*! - Sets this item to be expandable even if it has no children if value is TRUE, and to be - expandable only if it has children if value is FALSE (the default). +/*! Sets this item to be expandable even if it has no children. + + \param value If the value of this boolean parameter is TRUE, this item will be set as expandable. +
See also an example of this method usage in batchmode of %SALOME application. */ @@ -403,13 +449,17 @@ Sets the items to be selectable if value is TRUE (the default) or not { /*! Returns TRUE if this item is open (its children are visible) and FALSE if it isn't. +
See also an example of this method usage in batchmode of %SALOME application. */ boolean IsOpened(); /*! - Sets this item to be open (its children are visible) if value is TRUE, and to be closed -(its children are not visible) if value is FALSE. + Sets this item to be open (its children are visible) + + \param value If the value of this boolean parameter is TRUE this item will be set as open, + and as closed if FALSE. +
See also an example of this method usage in batchmode of %SALOME application. */ @@ -425,12 +475,16 @@ Sets the items to be selectable if value is TRUE (the default) or not { /*! Returns the color of an item. +
See also an example of this method usage in batchmode of %SALOME application. */ Color TextColor(); /*! Sets the color of an item. + + \param value This parameter defines the color of the item. +
See also an example of this method usage in batchmode of %SALOME application. */ @@ -447,12 +501,17 @@ Sets the items to be selectable if value is TRUE (the default) or not { /*! Returns the highlight color of an item. + + +
See also an example of this method usage in batchmode of %SALOME application. */ Color TextHighlightColor(); /*! Sets the highlight color of an item. + \param value This parameter defines the highlight color of the item. +
See also an example of this method usage in batchmode of %SALOME application. */ @@ -467,17 +526,20 @@ Sets the items to be selectable if value is TRUE (the default) or not interface AttributePixMap : GenericAttribute { /*! - Returns True if there is an icon before the name of the item. + Returns True if there is an icon before the name of the given item. */ boolean HasPixMap(); /*! - Returns the name of the icon. + Returns the name of the icon in the format of a string. +
See also an example of this method usage in batchmode of %SALOME application. */ string GetPixMap(); /*! Sets the name of the icon. + \param value This string parameter defines the name of the icon. +
See also an example of this method usage in batchmode of %SALOME application. */ @@ -490,6 +552,7 @@ Sets the items to be selectable if value is TRUE (the default) or not A set of these attributes on the %SObjects of the %study forms an inner auxiliary tree whith its own structure and identifier. The quantity of such trees with different identifiers can be arbitrary. +
See also an example of usage of the methods of this interface in batchmode of %SALOME application. */ @@ -497,108 +560,112 @@ Sets the items to be selectable if value is TRUE (the default) or not interface AttributeTreeNode : GenericAttribute { /*! - Sets the father TreeNode to this TreeNode. + Assigns the father tree node to this tree node. */ void SetFather(in AttributeTreeNode value); /*! - Returns True if there is the father TreeNode of this TreeNode. + Returns True if there is a father tree node of this tree node. */ boolean HasFather(); /*! - Returns the father Treenode of this TreeNode. + Returns the father tree node of this tree node. */ AttributeTreeNode GetFather(); /*! - Sets the previous brother TreeNode to this treeNode. + Assigns the previous brother tree node to the given tree node. */ void SetPrevious(in AttributeTreeNode value); /*! - Returns True if there is the previous brother TreeNode of this TreeNode. + Returns True if there is the previous brother tree node of this tree node. */ boolean HasPrevious(); /*! - Returns the previous brother TreeNode of this TreeNode. + Returns the previous brother tree node of this tree node. */ AttributeTreeNode GetPrevious(); /*! - Sets the next brother TreeNode to this treeNode. + Sets the next brother tree node to this tree node. */ void SetNext(in AttributeTreeNode value); /*! - Returns True if there is the next brother TreeNode of this TreeNode. + Returns True if there is the next brother tree node of this tree node. */ boolean HasNext(); /*! - Returns the previous brother TreeNode of this TreeNode. + Returns the previous brother tree node of this tree node. */ AttributeTreeNode GetNext(); /*! - Sets the first child TreeNode to this treeNode. + Sets the first child tree node to this tree node. */ void SetFirst(in AttributeTreeNode value); /*! - Returns True if there is the first child TreeNode of this TreeNode. + Returns True if there is the first child tree node of this tree node. */ boolean HasFirst(); /*! - Returns the first child TreeNode of this TreeNode. + Returns the first child tree node of this tree node. */ AttributeTreeNode GetFirst(); /*! - Sets ID of the tree. TreeNodes of one tree have the same ID. + Sets ID of a tree. + \param value String parameter defining the ID of a tree. + \note
Tree nodes of one tree have the same ID. */ void SetTreeID(in string value); /*! - Gets ID of the tree. + Gets ID of a tree. + \return An ID of a tree in the format of a string. */ string GetTreeID(); /*! - Adds a child TreeNode to the end of the list of children of this Treenode. + Adds a child tree node to the end of the list of children of this tree node. */ void Append(in AttributeTreeNode value); /*! - Adds a child TreeNode to the beginning of the list of children of this Treenode. + Adds a child tree node to the beginning of the list of children of this tree node. */ void Prepend(in AttributeTreeNode value); /*! - Adds a brother TreeNode before this Treenode. - In this case the both TreeNodes will belong to the same father. + Adds a brother tree node before this tree node. + In this case the both tree nodes will belong to the same father. */ void InsertBefore(in AttributeTreeNode value); /*! - Adds a brother TreeNode after this Treenode. - In this case the both TreeNodes will belong to the same father. + Adds a brother tree node after this tree node. + In this case the both tree nodes will belong to the same father. */ void InsertAfter(in AttributeTreeNode value); /*! - Deletes a TreeNode. + Deletes a tree node. +
See also an example of this method usage in batchmode of %SALOME application. */ void Remove(); /*! - Returns the depth of the TreeNode in the - structure, it means the number of fathers of the given TreeNode. - (i.e.: the depth of the root TreeNode is 0). + Returns the depth of the tree node in the + structure, it means the number of fathers of the given tree node. + (i.e.: the depth of the root tree node is 0). */ long Depth(); /*! - Returns True if it is a root TreeNode. + Returns True if it is a root tree node. */ boolean IsRoot(); /*! - Returns True if this TreeNode is a descendant of the TreeNode. + Returns True if this tree node is a descendant of the tree node. */ boolean IsDescendant(in AttributeTreeNode value); /*! - Returns True if this TreeNode is the father of the TreeNode. + Returns True if this tree node is the father of the tree node. */ boolean IsFather(in AttributeTreeNode value); /*! - Returns True if this TreeNode is a child of the TreeNode. + Returns True if this tree node is a child of the tree node. */ boolean IsChild(in AttributeTreeNode value); /*! @@ -616,11 +683,15 @@ Sets the items to be selectable if value is TRUE (the default) or not { /*! Returns the value of this attribute. +
See also an example of this method usage in batchmode of %SALOME application. */ long Value(); /*! Sets the value of this attribute. + + \param value This parameter defines the local ID which will be set. +
See also an example of this method usage in batchmode of %SALOME application. */ void SetValue(in long value); @@ -636,11 +707,13 @@ Sets the items to be selectable if value is TRUE (the default) or not { /*! Returns the value of this attribute +
See also an example of this method usage in batchmode of %SALOME application. */ string Value(); /*! Sets the value of this attribute +
See also an example of this method usage in batchmode of %SALOME application. */ void SetValue(in string value); @@ -665,7 +738,7 @@ Sets the items to be selectable if value is TRUE (the default) or not */ void Add(in SObject anObject); /*! - Returns the list of %SObjects which refer to this %SObject. + Returns a list of %SObjects which refer to this %SObject. */ SALOMEDS::Study::ListOfSObject Get(); /*! @@ -681,6 +754,7 @@ Sets the items to be selectable if value is TRUE (the default) or not This attribute allows to store a table of integers (indexing from 1 like in CASCADE) and string titles of this table, of each row, of each column. +
See also an example of usage of these methods in batchmode of %SALOME application. */ @@ -758,24 +832,35 @@ Sets the items to be selectable if value is TRUE (the default) or not // operations with rows /*! Adds a row to the end of the table. + \param theData A sequence of long values which will be set as elements of the added row. */ void AddRow(in LongSeq theData) raises(IncorrectArgumentLength); /*! - Sets the values of all elements of the row. + Sets the elements of a definite row. + \param theRow The number of the row. + \param theData A sequence of long values which will be set as elements of this row. + */ void SetRow(in long theRow, in LongSeq theData) raises(IncorrectArgumentLength, IncorrectIndex); /*! - Returns the row of the table. + Gets the row of the table. + + \param theRow The number of the row. + \return A sequence of long values which are set as elements of this row. */ LongSeq GetRow(in long theRow) raises(IncorrectIndex); // operations with columns /*! Adds a column to the end of the table. + + \param theData A sequence of long values which will be set as elements of this column. */ void AddColumn(in LongSeq theData) raises(IncorrectArgumentLength); /*! Sets the values of all elements of the column. + + \param theData A sequence of long values which will be set as elements of this column. */ void SetColumn(in long theColumn, in LongSeq theData) raises(IncorrectArgumentLength, IncorrectIndex); /*! diff --git a/idl/SALOME_Component.idl b/idl/SALOME_Component.idl index 391112dfd..ad9be3b06 100644 --- a/idl/SALOME_Component.idl +++ b/idl/SALOME_Component.idl @@ -43,6 +43,8 @@ module Engines { /*! Initializes the %container with a definite name. + \param ContainerName Name of the container + \return an initialized container */ Container start_impl( in string ContainerName ) ; @@ -50,11 +52,13 @@ module Engines Loads into the container a new component, registers it and starts it's CORBA servant. \param nameToRegister Name of the component which will be registered in Registry (or Name Service) \param componentName Name of the constructed library of the %component + \return a loaded component */ Component load_impl(in string nameToRegister, in string componentName); /*! - Stops the component servant, and deletes all related objects + Stops the component servant, and deletes all related objects + \param component_i Component to be removed */ void remove_impl(in Component component_i); @@ -109,6 +113,8 @@ module Engines Container GetContainerRef() ; /*! This method is used by the %SUPERVISOR component. It sets the names of the graph and of the node. + \param aGraphName Name of graph + \param aNodeName Name of node */ void Names( in string aGraphName , in string aNodeName ) ; /*! diff --git a/idl/SALOME_Exception.idl b/idl/SALOME_Exception.idl index c310e9de4..fd6a224c4 100644 --- a/idl/SALOME_Exception.idl +++ b/idl/SALOME_Exception.idl @@ -65,7 +65,7 @@ The main exception in %SALOME application. */ exception SALOME_Exception { - ExceptionStruct details; + ExceptionStruct details; /*! ListOfServicesParameter; + /*! This struct contains fields completely defining each service. */ @@ -65,7 +72,7 @@ This struct contains fields completely defining each service. { string ServiceName; /*! ListOfDefInterface ; /*! -List of interfaces. +List of names of interfaces. */ typedef sequence ListOfInterfaces ; /*! @@ -123,12 +130,16 @@ List of pair GUI elements (component name, component icone) string what ; /*!If the specified interface doesn't exist, Notfound exception is thrown. \param interfacename Name of the interface \return List of services of the required interface @@ -199,13 +210,13 @@ Sets/gets the name of the component */ readonly attribute string componentname; -/*! +/*! Sets/gets the user name of the component */ readonly attribute string componentusername; /*! -Defines whether the component can be multistudy or not +Defines whether the component is multistudy or not */ readonly attribute boolean multistudy; diff --git a/idl/SALOME_Session.idl b/idl/SALOME_Session.idl index 9cce222ff..f42ccde7e 100644 --- a/idl/SALOME_Session.idl +++ b/idl/SALOME_Session.idl @@ -35,7 +35,9 @@ module SALOME This enumeration contains values defining the state of the session */ - enum SessionState {asleep, running} ; + enum SessionState {asleep, /*! Session is inactive */ + running /*! Session is running */ + } ; /*! \brief %Session State and Statistics @@ -80,7 +82,10 @@ module SALOME Launches GUI in the session */ void GetInterface(); - //***// VISU::VISU_Gen GetVisuGen(); + +/*! + Returns the Visu component +*/ Engines::Component GetVisuComponent(); /*! -- 2.39.2