-// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
+// 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.
+// 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
#include <TCollection_AsciiString.hxx>
#include <TopoDS_Solid.hxx>
+#include <cctype>
+
#ifdef _DEBUG_
static int MYDEBUG = 0;
//static int VARIABLE_DEBUG = 0;
bool SMESH_Gen_i::CanPublishInStudy(CORBA::Object_ptr theIOR)
{
if(MYDEBUG) MESSAGE("CanPublishInStudy - "<<!CORBA::is_nil(myCurrentStudy));
- if(CORBA::is_nil(myCurrentStudy))
+ if( GetCurrentStudyID() < 0 )
return false;
SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_narrow(theIOR);
const bool theSelectable = true)
{
SALOMEDS::SObject_wrap SO = SMESH_Gen_i::ObjectToSObject( theStudy, theIOR );
- SALOMEDS::StudyBuilder_var aStudyBuilder = theStudy->NewBuilder();
- if ( SO->_is_nil() ) {
- if ( theTag == 0 )
+ SALOMEDS::StudyBuilder_var aStudyBuilder = theStudy->NewBuilder();
+ SALOMEDS::UseCaseBuilder_wrap useCaseBuilder = theStudy->GetUseCaseBuilder();
+ SALOMEDS::SObject_wrap objAfter;
+ if ( SO->_is_nil() )
+ {
+ if ( theTag == 0 ) {
SO = aStudyBuilder->NewObject( theFatherObject );
+ }
else if ( !theFatherObject->FindSubObject( theTag, SO.inout() ))
+ {
SO = aStudyBuilder->NewObjectToTag( theFatherObject, theTag );
+
+ // define the next tag after given one in the data tree to insert SObject
+ std::string anEntry;
+ int last2Pnt_pos = -1;
+ int tagAfter = -1;
+ CORBA::String_var entry;
+ SALOMEDS::SObject_wrap curObj;
+ SALOMEDS::UseCaseIterator_wrap anUseCaseIter = useCaseBuilder->GetUseCaseIterator(theFatherObject);
+ for ( ; anUseCaseIter->More(); anUseCaseIter->Next() ) {
+ curObj = anUseCaseIter->Value();
+ entry = curObj->GetID();
+ anEntry = entry.in();
+ last2Pnt_pos = anEntry.rfind( ":" );
+ tagAfter = atoi( anEntry.substr( last2Pnt_pos+1 ).c_str() );
+ if ( tagAfter > theTag ) {
+ objAfter = curObj;
+ break;
+ }
+ }
+ }
}
SALOMEDS::GenericAttribute_wrap anAttr;
CORBA::String_var objStr = SMESH_Gen_i::GetORB()->object_to_string( theIOR );
SALOMEDS::AttributeIOR_wrap iorAttr = anAttr;
iorAttr->SetValue( objStr.in() );
+ // UnRegister() !!!
+ SALOME::GenericObj_var genObj = SALOME::GenericObj::_narrow( theIOR );
+ if ( !genObj->_is_nil() )
+ genObj->UnRegister();
}
if ( thePixMap ) {
anAttr = aStudyBuilder->FindOrCreateAttribute( SO, "AttributePixMap" );
selAttr->SetSelectable( false );
}
+ // add object to the use case tree
+ // (to support tree representation customization and drag-n-drop)
+ if ( !CORBA::is_nil( objAfter ) ) {
+ useCaseBuilder->InsertBefore( SO, objAfter ); // insert at given tag
+ } else if ( !useCaseBuilder->IsUseCaseNode( SO ) ) {
+ useCaseBuilder->AppendTo( theFatherObject, SO ); // append to the end of list
+ }
+
return SO._retn();
}
SALOMEDS::GenericAttribute_wrap anAttr =
aStudyBuilder->FindOrCreateAttribute( theSObject, "AttributeName" );
SALOMEDS::AttributeName_wrap aNameAttr = anAttr;
- if ( theName && strlen( theName ) != 0 )
- aNameAttr->SetValue( theName );
- else {
+ if ( theName && theName[0] ) {
+ std::string name( theName ); // trim trailing white spaces
+ for ( size_t i = name.size()-1; i > 0; --i )
+ if ( isspace( name[i] )) name[i] = '\0';
+ else break;
+ aNameAttr->SetValue( name.c_str() );
+ }
+ else
+ {
CORBA::String_var curName = aNameAttr->Value();
if ( strlen( curName.in() ) == 0 ) {
SMESH_Comment aName(theDefaultName);
//=======================================================================
//function : SetPixMap
-//purpose :
+//purpose :
//=======================================================================
void SMESH_Gen_i::SetPixMap(SALOMEDS::SObject_ptr theSObject,
theTag = tag;
}
if ( !theSObject->FindSubObject( theTag, aReferenceSO.inout() ))
+ {
aReferenceSO = aStudyBuilder->NewObjectToTag( theSObject, theTag );
+ // add reference to the use case tree
+ // (to support tree representation customization and drag-n-drop)
+ SALOMEDS::UseCaseBuilder_wrap useCaseBuilder = theStudy->GetUseCaseBuilder();
+ useCaseBuilder->AppendTo( aReferenceSO->GetFather(), aReferenceSO );
+ }
aStudyBuilder->Addreference( aReferenceSO, aToObjSO );
}
}
return SALOMEDS::SComponent::_nil();
if(MYDEBUG) MESSAGE("PublishComponent");
+ SALOMEDS::StudyBuilder_var aStudyBuilder = theStudy->NewBuilder();
+ SALOMEDS::UseCaseBuilder_wrap useCaseBuilder = theStudy->GetUseCaseBuilder();
+
CORBA::String_var compDataType = ComponentDataType();
SALOMEDS::SComponent_wrap father = theStudy->FindComponent( compDataType.in() );
- if ( !CORBA::is_nil( father ) )
+ if ( !CORBA::is_nil( father ) ) {
+ // check that the component is added to the use case browser
+ if ( !useCaseBuilder->IsUseCaseNode( father ) ) {
+ useCaseBuilder->SetRootCurrent();
+ useCaseBuilder->Append( father ); // component object is added as the top level item
+ }
return father._retn();
+ }
SALOME_ModuleCatalog::ModuleCatalog_var aCat =
SALOME_ModuleCatalog::ModuleCatalog::_narrow( GetNS()->Resolve("/Kernel/ModulCatalog") );
if ( CORBA::is_nil( aComp ) )
return father._retn();
- SALOMEDS::StudyBuilder_var aStudyBuilder = theStudy->NewBuilder();
SALOMEDS::GenericAttribute_wrap anAttr;
SALOMEDS::AttributePixMap_wrap aPixmap;
aPixmap->SetPixMap( "ICON_OBJBROWSER_SMESH" );
CORBA::String_var userName = aComp->componentusername();
SetName( father, userName.in(), "MESH" );
+ // add component to the use case tree
+ // (to support tree representation customization and drag-n-drop)
+ useCaseBuilder->SetRootCurrent();
+ useCaseBuilder->Append( father ); // component object is added as the top level item
if(MYDEBUG) MESSAGE("PublishComponent--END");
return father._retn();
return true;
}
-//=======================================================================
-//function : UpdateParameters
-//purpose :
-//=======================================================================
-void SMESH_Gen_i::UpdateParameters(/*CORBA::Object_ptr theObject,*/ const char* theParameters)
+//================================================================================
+/*!
+ * \brief Stores names of variables that WILL be passes as parameters when calling
+ * some method of a given object.
+ * \param [in] theObject - the object whose a method WILL be called with \a theParameters.
+ * \param [in] theParameters - a string contating parameters separated by ':'.
+ */
+//================================================================================
+
+void SMESH_Gen_i::UpdateParameters(CORBA::Object_ptr theObject, const char* theParameters)
{
SALOMEDS::Study_var aStudy = GetCurrentStudy();
if ( aStudy->_is_nil() )
return;
+
+ // find variable names within theParameters
+
+ myLastObj.clear();
myLastParameters.clear();
+ myLastParamIndex.clear(); /* vector holding indices of virables within the string
+ of all varibles used for theObject */
+ int nbVars = 0;
int pos = 0, prevPos = 0, len = strlen( theParameters );
if ( len == 0 ) return;
while ( pos <= len )
{
if ( prevPos < pos )
{
- string val(theParameters + prevPos, theParameters + pos );
+ string val( theParameters + prevPos, theParameters + pos );
if ( !aStudy->IsVariable( val.c_str() ))
val.clear();
myLastParameters.push_back( val );
+ nbVars += (! myLastParameters.back().empty() );
}
else
{
}
++pos;
}
- return;
-
- // OLD VARIANT
-
- // if(VARIABLE_DEBUG)
- // cout<<"UpdateParameters : "<<theParameters<<endl;
- // //SALOMEDS::Study_var aStudy = GetCurrentStudy();
- // if(aStudy->_is_nil() || CORBA::is_nil(theObject))
- // return;
-
- // SALOMEDS::SObject_wrap aSObj = ObjectToSObject(aStudy,theObject);
- // if(aSObj->_is_nil())
- // return;
-
- // SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder();
-
- // SALOMEDS::GenericAttribute_var aFindAttr;
- // bool hasAttr = aSObj->FindAttribute(aFindAttr, "AttributeString");
- // if(VARIABLE_DEBUG)
- // cout<<"Find Attribute "<<hasAttr<<endl;
-
- // SALOMEDS::GenericAttribute_var anAttr;
- // anAttr = aStudyBuilder->FindOrCreateAttribute( aSObj, "AttributeString");
- // SALOMEDS::AttributeString_var aStringAttr = SALOMEDS::AttributeString::_narrow(anAttr);
-
- // CORBA::String_var oldparVar = aStringAttr->Value();
- // CORBA::String_var inpparVar = ParseParameters(theParameters);
- // TCollection_AsciiString aNewParams;
- // TCollection_AsciiString aOldParameters(oldparVar.inout());
- // TCollection_AsciiString anInputParams(inpparVar.inout());
- // if(!hasAttr)
- // aNewParams = anInputParams;
- // else
- // {
- // int pos = aOldParameters.SearchFromEnd("|");
- // if(pos==-1) pos = 0;
- // TCollection_AsciiString previousParamFull(aOldParameters.Split(pos));
- // TCollection_AsciiString previousParam(previousParamFull);
- // TCollection_AsciiString theRepet("1");
- // pos = previousParam.SearchFromEnd(";*=");
- // if(pos >= 0)
- // {
- // theRepet = previousParam.Split(pos+2);
- // pos = pos-1;
- // if(pos==-1) pos = 0;
- // previousParam.Split(pos);
- // }
- // if(previousParam == anInputParams)
- // {
- // theRepet = theRepet.IntegerValue()+1;
- // aNewParams = aOldParameters + previousParam + ";*=" + theRepet;
- // }
- // else
- // {
- // aNewParams = aOldParameters + previousParamFull + "|" + anInputParams;
- // }
- // }
-
- // if(VARIABLE_DEBUG)
- // {
- // cout<<"Input Parameters : "<<anInputParams<<endl;
- // cout<<"Old Parameters : "<<aOldParameters<<endl;
- // cout<<"New Parameters : "<<aNewParams<<endl;
- // }
-
- // aStringAttr->SetValue( aNewParams.ToCString() );
+
+ if ( nbVars < 1 )
+ return;
+
+ // store
+ // (1) variable names in the string of all varibles used for theObject and
+ // (2) indices of found variables in myLastParamIndex.
+
+ // remember theObject
+ SALOMEDS::SObject_wrap aSObj = ObjectToSObject(aStudy,theObject);
+ if ( aSObj->_is_nil() )
+ return;
+ CORBA::String_var anObjEntry = aSObj->GetID();
+ myLastObj = anObjEntry.in();
+
+ // get a string of variable names
+ SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder();
+ SALOMEDS::GenericAttribute_wrap anAttr =
+ aStudyBuilder->FindOrCreateAttribute( aSObj, "AttributeString" );
+ SALOMEDS::AttributeString_wrap aStringAttr = anAttr;
+ CORBA::String_var oldVars = aStringAttr->Value();
+ std::string varStr = oldVars.in();
+
+ // add new variables and find indices of variables
+ for ( size_t i = 0; i < myLastParameters.size(); ++i )
+ {
+ int varIndex = -1;
+ if ( !myLastParameters[i].empty() )
+ {
+ // find index of myLastParameters[i] in varStr
+ int curIndex = 0;
+ bool varFound = false;
+ size_t pos = 0;
+ // varStr can be "A|B::C;*=2|D"
+ const std::string separators(":|;*=");
+ while ( pos < varStr.size() && !varFound )
+ {
+ // skip separators
+ while ( separators.find( varStr[ pos ]) != std::string::npos )
+ if ( ++pos >= varStr.size() )
+ break;
+ // skip repetition number following '='
+ if ( varStr[ pos-1 ] == '=' )
+ {
+ while ( '0' <= varStr[ pos ] && varStr[ pos ] <= '9' )
+ ++pos;
+ continue; // to skip next separator
+ }
+ // compare variable name
+ if ( pos < varStr.size() )
+ {
+ varFound = ( varStr.compare( pos, myLastParameters[i].size(), myLastParameters[i] ) == 0 &&
+ // same string begining but is length same?
+ ( pos + myLastParameters[i].size() >= varStr.size() ||
+ separators.find( varStr[ pos+1 ]) != std::string::npos ));
+ if ( varFound )
+ varIndex = curIndex;
+ else
+ pos = varStr.find_first_of( separators, pos ); // goto the next separator
+ ++curIndex;
+ }
+ }
+ // add new variable
+ if ( !varFound )
+ {
+ varStr += ":" + myLastParameters[i];
+ varIndex = curIndex;
+ }
+ }
+ myLastParamIndex.push_back( varIndex );
+ }
+ aStringAttr->SetValue( varStr.c_str() );
+}
+
+//================================================================================
+/*!
+ * \brief Return all variables used to create an object
+ * \param [in] theObjectEntry - an object entry in the current study
+ * \return std::vector< std::string > - all variable names (or values of removed variables)
+ */
+//================================================================================
+
+std::vector< std::string > SMESH_Gen_i::GetAllParameters(const std::string& theObjectEntry) const
+{
+ std::vector< std::string > varNames;
+ if ( myCurrentStudy->_is_nil() )
+ return varNames;
+
+ SALOMEDS::SObject_wrap aSObj = myCurrentStudy->FindObjectID( theObjectEntry.c_str() );
+ if ( myCurrentStudy->_is_nil() )
+ return varNames;
+
+ // get a string of variable names
+ SALOMEDS::StudyBuilder_var aStudyBuilder = myCurrentStudy->NewBuilder();
+ SALOMEDS::GenericAttribute_wrap anAttr =
+ aStudyBuilder->FindOrCreateAttribute( aSObj, "AttributeString" );
+ SALOMEDS::AttributeString_wrap aStringAttr = anAttr;
+ CORBA::String_var oldVars = aStringAttr->Value();
+ std::string varStr = oldVars.in();
+
+ // separate variables within varStr;
+ // varStr can be "A|B::C;*=2|D"
+ size_t pos = 0;
+ const std::string separators(":|;*=");
+ while ( pos < varStr.size() )
+ {
+ // skip separators
+ pos = varStr.find_first_not_of( separators, pos );
+ // while ( separators.find( varStr[ pos ]) != std::string::npos )
+ // if ( ++pos >= varStr.size() )
+ // break;
+ // skip repetition number following '='
+ if ( varStr[ pos-1 ] == '=' )
+ {
+ while ( '0' <= varStr[ pos ] && varStr[ pos ] <= '9' )
+ ++pos;
+ continue; // to skip next separator
+ }
+ // store variable name
+ if ( pos < varStr.size() )
+ {
+ size_t pos2 = varStr.find_first_of( separators, pos );
+ varNames.push_back( varStr.substr( pos, pos2 - pos));
+ pos = pos2;
+ }
+ }
+ return varNames;
}
//=======================================================================
//function : ParseParameters
//purpose : Replace variables by their values
//=======================================================================
-char* SMESH_Gen_i::ParseParameters(const char* theParameters)
-{
- //const char* aParameters = theParameters;
-// const char* aParameters = CORBA::string_dup(theParameters);
- TCollection_AsciiString anInputParams;
- SALOMEDS::Study_var aStudy = GetCurrentStudy();
- if( !aStudy->_is_nil() ) {
-// SALOMEDS::ListOfListOfStrings_var aSections = aStudy->ParseVariables(theParameters);
-// for(int j=0;j<aSections->length();j++) {
-// SALOMEDS::ListOfStrings aVars= aSections[j];
-// for(int i=0;i<aVars.length();i++ ) {
-// anInputParams += aStudy->IsVariable(aVars[i].in()) ?
-// TCollection_AsciiString(aVars[i].in()) : TCollection_AsciiString("");
-// if(i != aVars.length()-1)
-// anInputParams+=":";
+// char* SMESH_Gen_i::ParseParameters(const char* theParameters)
+// {
+// //const char* aParameters = theParameters;
+// // const char* aParameters = CORBA::string_dup(theParameters);
+// TCollection_AsciiString anInputParams;
+// SALOMEDS::Study_var aStudy = GetCurrentStudy();
+// if( !aStudy->_is_nil() ) {
+// // SALOMEDS::ListOfListOfStrings_var aSections = aStudy->ParseVariables(theParameters);
+// // for(int j=0;j<aSections->length();j++) {
+// // SALOMEDS::ListOfStrings aVars= aSections[j];
+// // for(int i=0;i<aVars.length();i++ ) {
+// // anInputParams += aStudy->IsVariable(aVars[i].in()) ?
+// // TCollection_AsciiString(aVars[i].in()) : TCollection_AsciiString("");
+// // if(i != aVars.length()-1)
+// // anInputParams+=":";
+// // }
+// // if(j!=aSections->length()-1)
+// // anInputParams+="|";
+// // }
+// TCollection_AsciiString paramStr( theParameters );
+// int beg = 0, end;
+// char sep, *pParams = (char*)paramStr.ToCString();
+// while ( beg < paramStr.Length() )
+// {
+// end = beg-1;
+// while ( ++end < paramStr.Length() )
+// if ( pParams[end] == ':' || pParams[end] == '|')
+// break;
+// if ( end < paramStr.Length())
+// {
+// sep = pParams[end];
+// pParams[end] = '\0';
// }
-// if(j!=aSections->length()-1)
-// anInputParams+="|";
+// if ( aStudy->IsVariable( pParams+beg ))
+// anInputParams += pParams+beg;
+// if ( end < paramStr.Length() )
+// anInputParams += sep;
+// else
+// break;
+// beg = end + 1;
// }
- TCollection_AsciiString paramStr( theParameters );
- static TCollection_AsciiString separators(":|");
- int beg = 0, end;
- char sep, *pParams = (char*)paramStr.ToCString();
- while ( beg < paramStr.Length() )
- {
- end = beg-1;
- while ( ++end < paramStr.Length() )
- if ( pParams[end] == ':' || pParams[end] == '|')
- break;
- if ( end < paramStr.Length())
- {
- sep = pParams[end];
- pParams[end] = '\0';
- }
- if ( aStudy->IsVariable( pParams+beg ))
- anInputParams += pParams+beg;
- if ( end < paramStr.Length() )
- anInputParams += sep;
- else
- break;
- beg = end + 1;
- }
- }
- return CORBA::string_dup(anInputParams.ToCString());
-}
+// }
+// return CORBA::string_dup(anInputParams.ToCString());
+// }
//=======================================================================
//function : GetParameters
{
CORBA::String_var aResult("");
- SALOMEDS::SObject_wrap aSObj = ObjectToSObject( myCurrentStudy,theObject);
+ SALOMEDS::SObject_wrap aSObj = ObjectToSObject( myCurrentStudy, theObject );
if ( !aSObj->_is_nil() )
{
SALOMEDS::GenericAttribute_wrap attr;
aResult = strAttr->Value();
}
}
-
- return CORBA::string_dup( aResult.in() );
+ return aResult._retn();
}
