]> SALOME platform Git repositories - modules/geom.git/commitdiff
Salome HOME
untabify
authoreap <eap@opencascade.com>
Tue, 10 Nov 2009 08:19:04 +0000 (08:19 +0000)
committereap <eap@opencascade.com>
Tue, 10 Nov 2009 08:19:04 +0000 (08:19 +0000)
src/GEOM/GEOM_Application.ixx
src/GEOM/GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx
src/GEOM/GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_0.cxx
src/GEOM/GEOM_Engine.cxx
src/GEOM/GEOM_Engine.hxx
src/GEOM/GEOM_Function.cxx
src/GEOM/GEOM_Object.cxx
src/GEOM/GEOM_Solver.cxx
src/GEOM/GEOM_SubShapeDriver.cxx

index 8a2c33ff7a40395d33a022455302e8fcddf4f461..3fbbfcaf15adafe54437cd9b28dd4f0b8906db9f 100644 (file)
@@ -47,10 +47,10 @@ Standard_EXPORT Handle_Standard_Type& GEOM_Application_Type_()
 
   static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,aType4,NULL};
   static Handle_Standard_Type _aType = new Standard_Type("GEOM_Application",
-                                                        sizeof(GEOM_Application),
-                                                        1,
-                                                        (Standard_Address)_Ancestors,
-                                                        (Standard_Address)NULL);
+                                                         sizeof(GEOM_Application),
+                                                         1,
+                                                         (Standard_Address)_Ancestors,
+                                                         (Standard_Address)NULL);
 
   return _aType;
 }
index f63d23b3b7b13d462813836f8930570bc5c71753..c91aa48234ab7ddea43f8fc5feb1f4ac923d75af 100644 (file)
@@ -77,7 +77,7 @@ Standard_EXPORT ~GEOM_DataMapNodeOfDataMapOfAsciiStringTransient();
  //
  Standard_EXPORT friend Handle_Standard_Type& GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_Type_();
  Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
- Standard_EXPORT Standard_Boolean             IsKind(const Handle(Standard_Type)&) const;
+ Standard_EXPORT Standard_Boolean              IsKind(const Handle(Standard_Type)&) const;
 
 protected:
 
index 7dbb47f54df715bbbd126010bb3fdf68590e7546..cf99e71de92413c1a3b684f550f0d0732eab1756 100644 (file)
@@ -54,10 +54,10 @@ Standard_EXPORT Handle_Standard_Type& GEOM_DataMapNodeOfDataMapOfAsciiStringTran
 
   static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
   static Handle_Standard_Type _aType = new Standard_Type("GEOM_DataMapNodeOfDataMapOfAsciiStringTransient",
-                                                        sizeof(GEOM_DataMapNodeOfDataMapOfAsciiStringTransient),
-                                                        1,
-                                                        (Standard_Address)_Ancestors,
-                                                        (Standard_Address)NULL);
+                                                         sizeof(GEOM_DataMapNodeOfDataMapOfAsciiStringTransient),
+                                                         1,
+                                                         (Standard_Address)_Ancestors,
+                                                         (Standard_Address)NULL);
 
   return _aType;
 }
index d4426ee6b0ac5cca04f50a6200126eda019fd8c6..e6da3ad15bddf34d4343ea906390ab0e6e7891a6 100644 (file)
@@ -111,7 +111,7 @@ bool ProcessFunction(Handle(GEOM_Function)&   theFunction,
                      TCollection_AsciiString& theScript,
                      TCollection_AsciiString& theAfterScript,
                      const TVariablesList&    theVariables,
-                    const bool               theIsPublished,
+                     const bool               theIsPublished,
                      TDF_LabelMap&            theProcessed,
                      std::set<std::string>&   theIgnoreObjs,
                      bool&                    theIsDumpCollected);
@@ -122,25 +122,25 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
 Handle(TColStd_HSequenceOfInteger) FindEntries(TCollection_AsciiString& theString);
 
 void ReplaceEntriesByNames (TCollection_AsciiString&                  theScript,
-                           Resource_DataMapOfAsciiStringAsciiString& theObjectNames,
-                           const bool                                theIsPublished,
-                           Resource_DataMapOfAsciiStringAsciiString& theEntryToBadName,
+                            Resource_DataMapOfAsciiStringAsciiString& theObjectNames,
+                            const bool                                theIsPublished,
+                            Resource_DataMapOfAsciiStringAsciiString& theEntryToBadName,
                             TColStd_SequenceOfAsciiString&            theObjListToPublish);
 
 void AddObjectColors (int                                             theDocID,
-                     TCollection_AsciiString&                        theScript,
-                     const Resource_DataMapOfAsciiStringAsciiString& theObjectNames);
+                      TCollection_AsciiString&                        theScript,
+                      const Resource_DataMapOfAsciiStringAsciiString& theObjectNames);
 
 void AddTextures (int theDocID, TCollection_AsciiString& theScript);
 
 void PublishObject (const TCollection_AsciiString&                  theEntry,
-                   const TCollection_AsciiString&                  theName,
-                   const Resource_DataMapOfAsciiStringAsciiString& theObjectNames,
-                   const Resource_DataMapOfAsciiStringAsciiString& theEntry2StEntry,
-                   const Resource_DataMapOfAsciiStringAsciiString& theStEntry2Entry,
-                   const Resource_DataMapOfAsciiStringAsciiString& theEntryToBadName,
-                   std::map< int, std::string >&                   theEntryToCommandMap,
-                   std::set<std::string>&                          theMapOfPublished);
+                    const TCollection_AsciiString&                  theName,
+                    const Resource_DataMapOfAsciiStringAsciiString& theObjectNames,
+                    const Resource_DataMapOfAsciiStringAsciiString& theEntry2StEntry,
+                    const Resource_DataMapOfAsciiStringAsciiString& theStEntry2Entry,
+                    const Resource_DataMapOfAsciiStringAsciiString& theEntryToBadName,
+                    std::map< int, std::string >&                   theEntryToCommandMap,
+                    std::set<std::string>&                          theMapOfPublished);
 
 //=======================================================================
 //function : GetTextureGUID
@@ -587,32 +587,32 @@ TCollection_AsciiString GEOM_Engine::DumpPython(int theDocID,
       bool isDumpCollected = false;
       TCollection_AsciiString aCurScript, anAfterScript;
       if (!ProcessFunction(aFunction, aCurScript, anAfterScript, theVariables,
-                          isPublished, aCheckedFuncMap, anIgnoreObjMap,
-                          isDumpCollected ))
+                           isPublished, aCheckedFuncMap, anIgnoreObjMap,
+                           isDumpCollected ))
         continue;
       // add function description before dump
       if (!aCurScript.IsEmpty())
         aFuncScript += aCurScript;
       if (isDumpCollected ) {
-       // Replace entries by the names
+        // Replace entries by the names
         ReplaceEntriesByNames( aFuncScript, theObjectNames,
                                isPublished, anEntryToBadName, aObjListToPublish );
-       
-       // publish collected objects
-       std::map< int, std::string > anEntryToCommandMap; // sort publishing commands by object entry
+        
+        // publish collected objects
+        std::map< int, std::string > anEntryToCommandMap; // sort publishing commands by object entry
         int i = 1, n = aObjListToPublish.Length();
-       for ( ; i <= n; i++ )
+        for ( ; i <= n; i++ )
         {
           const TCollection_AsciiString& aEntry = aObjListToPublish.Value(i);
-         if (!theObjectNames.IsBound( aEntry ))
+          if (!theObjectNames.IsBound( aEntry ))
             continue;
-         PublishObject( aEntry, theObjectNames.Find(aEntry),
-                       theObjectNames, aEntry2StEntry, aStEntry2Entry,
-                       anEntryToBadName, anEntryToCommandMap, anIgnoreObjMap );
+          PublishObject( aEntry, theObjectNames.Find(aEntry),
+                        theObjectNames, aEntry2StEntry, aStEntry2Entry,
+                        anEntryToBadName, anEntryToCommandMap, anIgnoreObjMap );
         }
-       // add publishing commands to the script
-       std::map< int, std::string >::iterator anEntryToCommand = anEntryToCommandMap.begin();
-       for ( ; anEntryToCommand != anEntryToCommandMap.end(); ++anEntryToCommand )
+        // add publishing commands to the script
+        std::map< int, std::string >::iterator anEntryToCommand = anEntryToCommandMap.begin();
+        for ( ; anEntryToCommand != anEntryToCommandMap.end(); ++anEntryToCommand )
           aFuncScript += (char*)anEntryToCommand->second.c_str();
         
         // PTv, 0020001 add result objects from RestoreSubShapes into ignore list,
@@ -630,9 +630,9 @@ TCollection_AsciiString GEOM_Engine::DumpPython(int theDocID,
           }
         }
 
-       aObjListToPublish.Clear();
-       aScript += aFuncScript;
-       aFuncScript.Clear();
+        aObjListToPublish.Clear();
+        aScript += aFuncScript;
+        aFuncScript.Clear();
       }
       aFuncScript += anAfterScript;
     }
@@ -661,8 +661,8 @@ TCollection_AsciiString GEOM_Engine::DumpPython(int theDocID,
         continue; // should not be dumped
       const TCollection_AsciiString& aName = anEntryToNameIt.Value();
       PublishObject( aEntry, aName, theObjectNames,
-                   aEntry2StEntry, aStEntry2Entry,
-                   anEntryToBadName, anEntryToCommandMap, anIgnoreObjMap );
+                    aEntry2StEntry, aStEntry2Entry,
+                    anEntryToBadName, anEntryToCommandMap, anIgnoreObjMap );
     }
     // add publishing commands to the script
     std::map< int, std::string >::iterator anEntryToCommand = anEntryToCommandMap.begin();
@@ -733,8 +733,8 @@ Handle(TColStd_HSequenceOfAsciiString) GEOM_Engine::GetAllDumpNames() const
 #define TEXTURE_LABEL_DATA     5
 
 int GEOM_Engine::addTexture(int theDocID, int theWidth, int theHeight, 
-                           const Handle(TDataStd_HArray1OfByte)& theTexture,
-                           const TCollection_AsciiString& theFileName)
+                            const Handle(TDataStd_HArray1OfByte)& theTexture,
+                            const TCollection_AsciiString& theFileName)
 {
   Handle(TDocStd_Document) aDoc = GetDocument(theDocID);
   Handle(TDataStd_TreeNode) aRoot = TDataStd_TreeNode::Set(aDoc->Main());
@@ -771,16 +771,16 @@ int GEOM_Engine::addTexture(int theDocID, int theWidth, int theHeight,
 
   Handle(TDataStd_ByteArray) anAttr =
     TDataStd_ByteArray::Set(aChild.FindChild(TEXTURE_LABEL_DATA), 
-                           theTexture.IsNull() ? 0 : theTexture->Lower(),
-                           theTexture.IsNull() ? 0 : theTexture->Upper());
+                            theTexture.IsNull() ? 0 : theTexture->Lower(),
+                            theTexture.IsNull() ? 0 : theTexture->Upper());
   anAttr->ChangeArray(theTexture);
 
   return aTextureID;
 }
 
 Handle(TDataStd_HArray1OfByte) GEOM_Engine::getTexture(int theDocID, int theTextureID,
-                                                      int& theWidth, int& theHeight,
-                                                      TCollection_AsciiString& theFileName)
+                                                       int& theWidth, int& theHeight,
+                                                       TCollection_AsciiString& theFileName)
 {
   Handle(TDataStd_HArray1OfByte) anArray;
   theWidth = theHeight = 0;
@@ -795,24 +795,24 @@ Handle(TDataStd_HArray1OfByte) GEOM_Engine::getTexture(int theDocID, int theText
       TDF_Label anIDLabel = aTextureLabel.FindChild(TEXTURE_LABEL_ID, Standard_False);
       Handle(TDataStd_Integer) anIdAttr;
       if(!anIDLabel.IsNull() && anIDLabel.FindAttribute(TDataStd_Integer::GetID(), anIdAttr) && 
-        anIdAttr->Get() == theTextureID) {
-       TDF_Label aFileLabel   = aTextureLabel.FindChild(TEXTURE_LABEL_FILE,    Standard_False);
-       TDF_Label aWidthLabel  = aTextureLabel.FindChild(TEXTURE_LABEL_WIDTH,   Standard_False);
-       TDF_Label aHeightLabel = aTextureLabel.FindChild(TEXTURE_LABEL_HEIGHT,  Standard_False);
-       TDF_Label aDataLabel   = aTextureLabel.FindChild(TEXTURE_LABEL_DATA,    Standard_False);
-       Handle(TDataStd_Integer) aWidthAttr, aHeightAttr;
-       Handle(TDataStd_ByteArray) aTextureAttr;
-       Handle(TDataStd_Comment) aFileAttr;
-       if (!aWidthLabel.IsNull()  && aWidthLabel.FindAttribute(TDataStd_Integer::GetID(),  aWidthAttr) &&
-           !aHeightLabel.IsNull() && aHeightLabel.FindAttribute(TDataStd_Integer::GetID(), aHeightAttr) &&
-           !aDataLabel.IsNull()   && aDataLabel.FindAttribute(TDataStd_ByteArray::GetID(), aTextureAttr)) {
-         theWidth = aWidthAttr->Get();
-         theHeight = aHeightAttr->Get();
-         anArray = aTextureAttr->InternalArray();
-       }
-       if (!aFileLabel.IsNull() && aFileLabel.FindAttribute(TDataStd_Comment::GetID(), aFileAttr))
-         theFileName = aFileAttr->Get();
-       found = true;
+         anIdAttr->Get() == theTextureID) {
+        TDF_Label aFileLabel   = aTextureLabel.FindChild(TEXTURE_LABEL_FILE,    Standard_False);
+        TDF_Label aWidthLabel  = aTextureLabel.FindChild(TEXTURE_LABEL_WIDTH,   Standard_False);
+        TDF_Label aHeightLabel = aTextureLabel.FindChild(TEXTURE_LABEL_HEIGHT,  Standard_False);
+        TDF_Label aDataLabel   = aTextureLabel.FindChild(TEXTURE_LABEL_DATA,    Standard_False);
+        Handle(TDataStd_Integer) aWidthAttr, aHeightAttr;
+        Handle(TDataStd_ByteArray) aTextureAttr;
+        Handle(TDataStd_Comment) aFileAttr;
+        if (!aWidthLabel.IsNull()  && aWidthLabel.FindAttribute(TDataStd_Integer::GetID(),  aWidthAttr) &&
+            !aHeightLabel.IsNull() && aHeightLabel.FindAttribute(TDataStd_Integer::GetID(), aHeightAttr) &&
+            !aDataLabel.IsNull()   && aDataLabel.FindAttribute(TDataStd_ByteArray::GetID(), aTextureAttr)) {
+          theWidth = aWidthAttr->Get();
+          theHeight = aHeightAttr->Get();
+          anArray = aTextureAttr->InternalArray();
+        }
+        if (!aFileLabel.IsNull() && aFileLabel.FindAttribute(TDataStd_Comment::GetID(), aFileAttr))
+          theFileName = aFileAttr->Get();
+        found = true;
       }
     }
   }
@@ -832,7 +832,7 @@ std::list<int> GEOM_Engine::getAllTextures(int theDocID)
       TDF_Label anIDLabel = aTextureLabel.FindChild(TEXTURE_LABEL_ID, Standard_False);
       Handle(TDataStd_Integer) anIdAttr;
       if(!anIDLabel.IsNull() && anIDLabel.FindAttribute(TDataStd_Integer::GetID(), anIdAttr))
-       id_list.push_back((int)anIdAttr->Get());
+        id_list.push_back((int)anIdAttr->Get());
     }
   }
   return id_list;
@@ -851,7 +851,7 @@ bool ProcessFunction(Handle(GEOM_Function)&     theFunction,
                      TCollection_AsciiString&   theScript,
                      TCollection_AsciiString&   theAfterScript,
                      const TVariablesList&      theVariables,
-                    const bool                 theIsPublished,
+                     const bool                 theIsPublished,
                      TDF_LabelMap&              theProcessed,
                      std::set<std::string>&     theIgnoreObjs,
                      bool&                      theIsDumpCollected)
@@ -1029,14 +1029,14 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
     int aNbEntries = 1;
     if( anEntry.Value( 1 ) == O_SQR_BRACKET && anEntry.Value( anEntry.Length() ) == C_SQR_BRACKET ) {
       while(anEntry.Location(aNbEntries,COMMA,1,anEntry.Length()))
-       aNbEntries++;
+        aNbEntries++;
       TCollection_AsciiString aSeparator(COMMA);
       anEntry = anEntry.Token(aSeparator.ToCString(),1);
       anEntry.Remove( 1, 1 );
       anEntry.RightAdjust();
       anEntry.LeftAdjust();
       if(MYDEBUG)
-       cout<<"Sub-entry : '" <<anEntry<<"'"<<endl;
+        cout<<"Sub-entry : '" <<anEntry<<"'"<<endl;
     }
     
     //Find variables used for object construction
@@ -1047,7 +1047,7 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
 
     if(!aStates) {
       if(MYDEBUG)
-       cout<<"Valiables list empty!!!"<<endl;
+        cout<<"Valiables list empty!!!"<<endl;
       aCommandIndex++;
       continue;
     }
@@ -1057,7 +1057,7 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
     if(MYDEBUG) {
       cout<<"Variables from SObject:"<<endl;
       for (int i = 0; i < aVariables.size();i++)
-       cout<<"\t Variable["<<i<<"] = "<<aVariables[i].myVariable<<endl;
+        cout<<"\t Variable["<<i<<"] = "<<aVariables[i].myVariable<<endl;
     }
 
     //Calculate total number of parameters
@@ -1079,136 +1079,136 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
       //Replace first parameter (bettwen '(' character and first ',' character)
       if(i == aFirstParam)
       {
-       aStartPos = aCommand.Location(O_BRACKET, 1, aCommand.Length()) + 1;
-       if(aTotalNbParams - aNbEntries > 0 )
-         aEndPos = aCommand.Location(aFirstParam, COMMA, 1, aCommand.Length());
-       else
-         aEndPos = aCommand.Location(C_BRACKET, 1, aCommand.Length()); 
+        aStartPos = aCommand.Location(O_BRACKET, 1, aCommand.Length()) + 1;
+        if(aTotalNbParams - aNbEntries > 0 )
+          aEndPos = aCommand.Location(aFirstParam, COMMA, 1, aCommand.Length());
+        else
+          aEndPos = aCommand.Location(C_BRACKET, 1, aCommand.Length()); 
       }
       //Replace last parameter (bettwen ',' character and ')' character)
       else if(i == aTotalNbParams)
       {
-       aStartPos = aCommand.Location(i-1, COMMA, 1, aCommand.Length()) + 2;
-       aEndPos = aCommand.Location(C_BRACKET, 1, aCommand.Length());
+        aStartPos = aCommand.Location(i-1, COMMA, 1, aCommand.Length()) + 2;
+        aEndPos = aCommand.Location(C_BRACKET, 1, aCommand.Length());
       }
       //Replace other parameters (bettwen two ',' characters)
       else if(i != aFirstParam && i != aTotalNbParams )
       {
-       aStartPos = aCommand.Location(i-1, COMMA, 1, aCommand.Length()) + 2;
-       aEndPos = aCommand.Location(i, COMMA, 1, aCommand.Length());
+        aStartPos = aCommand.Location(i-1, COMMA, 1, aCommand.Length()) + 2;
+        aEndPos = aCommand.Location(i, COMMA, 1, aCommand.Length());
       }
 
       if( aCommand.Value( aStartPos ) == O_SQR_BRACKET )
-       aStartPos++;
+        aStartPos++;
       if( aCommand.Value( aEndPos-1 ) == C_SQR_BRACKET )
-       aEndPos--;
+        aEndPos--;
       if ( aStartPos == aEndPos )
         continue; // PAL20889: for "[]"
 
       if(MYDEBUG) 
-       cout<<"aStartPos = "<<aStartPos<<", aEndPos = "<<aEndPos<<endl;
+        cout<<"aStartPos = "<<aStartPos<<", aEndPos = "<<aEndPos<<endl;
 
       aVar = aCommand.SubString(aStartPos, aEndPos-1);
       aVar.RightAdjust();
       aVar.LeftAdjust();
     
       if(MYDEBUG) 
-       cout<<"Variable: '"<< aVar <<"'"<<endl;
+        cout<<"Variable: '"<< aVar <<"'"<<endl;
 
       // specific case for sketcher
       if(aVar.Location( TCollection_AsciiString("Sketcher:"), 1, aVar.Length() ) != 0) {
-       Standard_Integer aNbSections = 1;
-       while( aVar.Location( aNbSections, ':', 1, aVar.Length() ) )
-         aNbSections++;
-       aNbSections--;
-
-       int aStartSectionPos = 0, aEndSectionPos = 0;
-       TCollection_AsciiString aSection, aReplacedSection;
-       for(Standard_Integer aSectionIndex = 1; aSectionIndex <= aNbSections; aSectionIndex++) {
-         aStartSectionPos = aVar.Location( aSectionIndex, ':', 1, aVar.Length() ) + 1;
-         if( aSectionIndex != aNbSections )
-           aEndSectionPos = aVar.Location( aSectionIndex + 1, ':', 1, aVar.Length() );
-         else
-           aEndSectionPos = aVar.Length();
-
-         aSection = aVar.SubString(aStartSectionPos, aEndSectionPos-1);
-         if(MYDEBUG) 
-           cout<<"aSection: "<<aSection<<endl;
-
-         Standard_Integer aNbParams = 1;
-         while( aSection.Location( aNbParams, ' ', 1, aSection.Length() ) )
-           aNbParams++;
-         aNbParams--;
-
-         int aStartParamPos = 0, aEndParamPos = 0;
-         TCollection_AsciiString aParameter, aReplacedParameter;
-         for(Standard_Integer aParamIndex = 1; aParamIndex <= aNbParams; aParamIndex++) {
-           aStartParamPos = aSection.Location( aParamIndex, ' ', 1, aSection.Length() ) + 1;
-           if( aParamIndex != aNbParams )
-             aEndParamPos = aSection.Location( aParamIndex + 1, ' ', 1, aSection.Length() );
-           else
-             aEndParamPos = aSection.Length() + 1;
-
-           aParameter = aSection.SubString(aStartParamPos, aEndParamPos-1);
-           if(MYDEBUG) 
-             cout<<"aParameter: "<<aParameter<<endl;
-
-           if(iVar >= aVariables.size())
-             continue;
-
-           aReplacedParameter = aVariables[iVar].myVariable;
-           if(aReplacedParameter.IsEmpty()) {
-             iVar++;
-             continue;
-           }
-
-           if(aVariables[iVar].isVariable) {
-             aReplacedParameter.InsertBefore(1,"'");
-             aReplacedParameter.InsertAfter(aReplacedParameter.Length(),"'");
-           }
-
-           if(MYDEBUG) 
-             cout<<"aSection before : "<<aSection<<endl;
-           aSection.Remove(aStartParamPos, aEndParamPos - aStartParamPos);
-           aSection.Insert(aStartParamPos, aReplacedParameter);
-           if(MYDEBUG) 
-             cout<<"aSection after  : "<<aSection<<endl<<endl;
-           iVar++;
-         }
-         if(MYDEBUG) 
-           cout<<"aVar before : "<<aVar<<endl;
-         aVar.Remove(aStartSectionPos, aEndSectionPos - aStartSectionPos);
-         aVar.Insert(aStartSectionPos, aSection);
-         if(MYDEBUG) 
-           cout<<"aVar after  : "<<aVar<<endl<<endl;
-       }
-
-       if(MYDEBUG) 
-         cout<<"aCommand before : "<<aCommand<<endl;
-       aCommand.Remove(aStartPos, aEndPos - aStartPos);
-       aCommand.Insert(aStartPos, aVar);
-       if(MYDEBUG) 
-         cout<<"aCommand after  : "<<aCommand<<endl;
-
-       break;
+        Standard_Integer aNbSections = 1;
+        while( aVar.Location( aNbSections, ':', 1, aVar.Length() ) )
+          aNbSections++;
+        aNbSections--;
+
+        int aStartSectionPos = 0, aEndSectionPos = 0;
+        TCollection_AsciiString aSection, aReplacedSection;
+        for(Standard_Integer aSectionIndex = 1; aSectionIndex <= aNbSections; aSectionIndex++) {
+          aStartSectionPos = aVar.Location( aSectionIndex, ':', 1, aVar.Length() ) + 1;
+          if( aSectionIndex != aNbSections )
+            aEndSectionPos = aVar.Location( aSectionIndex + 1, ':', 1, aVar.Length() );
+          else
+            aEndSectionPos = aVar.Length();
+
+          aSection = aVar.SubString(aStartSectionPos, aEndSectionPos-1);
+          if(MYDEBUG) 
+            cout<<"aSection: "<<aSection<<endl;
+
+          Standard_Integer aNbParams = 1;
+          while( aSection.Location( aNbParams, ' ', 1, aSection.Length() ) )
+            aNbParams++;
+          aNbParams--;
+
+          int aStartParamPos = 0, aEndParamPos = 0;
+          TCollection_AsciiString aParameter, aReplacedParameter;
+          for(Standard_Integer aParamIndex = 1; aParamIndex <= aNbParams; aParamIndex++) {
+            aStartParamPos = aSection.Location( aParamIndex, ' ', 1, aSection.Length() ) + 1;
+            if( aParamIndex != aNbParams )
+              aEndParamPos = aSection.Location( aParamIndex + 1, ' ', 1, aSection.Length() );
+            else
+              aEndParamPos = aSection.Length() + 1;
+
+            aParameter = aSection.SubString(aStartParamPos, aEndParamPos-1);
+            if(MYDEBUG) 
+              cout<<"aParameter: "<<aParameter<<endl;
+
+            if(iVar >= aVariables.size())
+              continue;
+
+            aReplacedParameter = aVariables[iVar].myVariable;
+            if(aReplacedParameter.IsEmpty()) {
+              iVar++;
+              continue;
+            }
+
+            if(aVariables[iVar].isVariable) {
+              aReplacedParameter.InsertBefore(1,"'");
+              aReplacedParameter.InsertAfter(aReplacedParameter.Length(),"'");
+            }
+
+            if(MYDEBUG) 
+              cout<<"aSection before : "<<aSection<<endl;
+            aSection.Remove(aStartParamPos, aEndParamPos - aStartParamPos);
+            aSection.Insert(aStartParamPos, aReplacedParameter);
+            if(MYDEBUG) 
+              cout<<"aSection after  : "<<aSection<<endl<<endl;
+            iVar++;
+          }
+          if(MYDEBUG) 
+            cout<<"aVar before : "<<aVar<<endl;
+          aVar.Remove(aStartSectionPos, aEndSectionPos - aStartSectionPos);
+          aVar.Insert(aStartSectionPos, aSection);
+          if(MYDEBUG) 
+            cout<<"aVar after  : "<<aVar<<endl<<endl;
+        }
+
+        if(MYDEBUG) 
+          cout<<"aCommand before : "<<aCommand<<endl;
+        aCommand.Remove(aStartPos, aEndPos - aStartPos);
+        aCommand.Insert(aStartPos, aVar);
+        if(MYDEBUG) 
+          cout<<"aCommand after  : "<<aCommand<<endl;
+
+        break;
       } // end of specific case for sketcher
 
       //If parameter is entry or 'None', skip it
       if(theVariables.find(aVar) != theVariables.end() || aVar.Search(":") != -1 || aVar == PY_NULL)
-       continue;
+        continue;
 
       if(iVar >= aVariables.size())
-       continue;
+        continue;
 
       aReplacedVar = aVariables[iVar].myVariable;
       if(aReplacedVar.IsEmpty()) {
-       iVar++;
-       continue;
+        iVar++;
+        continue;
       }
 
       if(aVariables[iVar].isVariable) {
-       aReplacedVar.InsertBefore(1,"\"");
-       aReplacedVar.InsertAfter(aReplacedVar.Length(),"\"");
+        aReplacedVar.InsertBefore(1,"\"");
+        aReplacedVar.InsertAfter(aReplacedVar.Length(),"\"");
       }
 
       aCommand.Remove(aStartPos, aEndPos - aStartPos);
@@ -1234,9 +1234,9 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
  */
 //=============================================================================
 void ReplaceEntriesByNames (TCollection_AsciiString&                  theScript,
-                           Resource_DataMapOfAsciiStringAsciiString& theObjectNames,
-                           const bool                                theIsPublished,
-                           Resource_DataMapOfAsciiStringAsciiString& theEntryToBadName,
+                            Resource_DataMapOfAsciiStringAsciiString& theObjectNames,
+                            const bool                                theIsPublished,
+                            Resource_DataMapOfAsciiStringAsciiString& theEntryToBadName,
                             TColStd_SequenceOfAsciiString&            theObjListToPublish)
 {
   Handle(TColStd_HSequenceOfInteger) aSeq = FindEntries(theScript);
@@ -1307,8 +1307,8 @@ void ReplaceEntriesByNames (TCollection_AsciiString&                  theScript,
  */
 //=============================================================================
 void AddObjectColors (int                                             theDocID,
-                     TCollection_AsciiString&                        theScript,
-                     const Resource_DataMapOfAsciiStringAsciiString& theObjectNames)
+                      TCollection_AsciiString&                        theScript,
+                      const Resource_DataMapOfAsciiStringAsciiString& theObjectNames)
 {
   GEOM_Engine* engine = GEOM_Engine::GetEngine();
   Handle(TDocStd_Document) aDoc = engine->GetDocument(theDocID);
@@ -1390,11 +1390,11 @@ void AddObjectColors (int                                             theDocID,
     else if (aMarkerType == Aspect_TOM_USERDEFINED) {
       int aMarkerTextureID = obj->GetMarkerTexture();
       if (aMarkerTextureID >= 0) {
-       TCollection_AsciiString aCommand( "\n\t" );
-       aCommand += aName + ".SetMarkerTexture(texture_map[";
-       aCommand += aMarkerTextureID;
-       aCommand += "])";
-       theScript += aCommand.ToCString();
+        TCollection_AsciiString aCommand( "\n\t" );
+        aCommand += aName + ".SetMarkerTexture(texture_map[";
+        aCommand += aMarkerTextureID;
+        aCommand += "])";
+        theScript += aCommand.ToCString();
       }
     }
   }
@@ -1408,7 +1408,7 @@ static TCollection_AsciiString pack_data(const Handle(TDataStd_HArray1OfByte)& a
       Standard_Byte byte = aData->Value(i);
       TCollection_AsciiString strByte = "";
       for (int j = 0; j < 8; j++)
-       strByte.Prepend((byte & (1<<j)) ? "1" : "0");
+        strByte.Prepend((byte & (1<<j)) ? "1" : "0");
       stream += strByte;
     }
   }
@@ -1430,20 +1430,20 @@ void AddTextures (int theDocID, TCollection_AsciiString& theScript)
       TCollection_AsciiString aFileName;
       Handle(TDataStd_HArray1OfByte) aTexture = engine->getTexture(theDocID, *it, aWidth, aHeight, aFileName);
       if (aWidth > 0 && aHeight > 0 && !aTexture.IsNull() && aTexture->Length() > 0 ) {
-       TCollection_AsciiString aCommand = "\n\t";
-       aCommand += "texture_map["; aCommand += *it; aCommand += "] = ";
-       if (aFileName != "" ) {
-         aCommand += "geompy.LoadTexture(\"";
-         aCommand += aFileName.ToCString();
-         aCommand += "\")";
-       }
-       else {
-         aCommand += "geompy.AddTexture(";
-         aCommand += aWidth; aCommand += ", "; aCommand += aHeight; aCommand += ", \"";
-         aCommand += pack_data(aTexture);
-         aCommand += "\")";
-       }
-       theScript += aCommand;
+        TCollection_AsciiString aCommand = "\n\t";
+        aCommand += "texture_map["; aCommand += *it; aCommand += "] = ";
+        if (aFileName != "" ) {
+          aCommand += "geompy.LoadTexture(\"";
+          aCommand += aFileName.ToCString();
+          aCommand += "\")";
+        }
+        else {
+          aCommand += "geompy.AddTexture(";
+          aCommand += aWidth; aCommand += ", "; aCommand += aHeight; aCommand += ", \"";
+          aCommand += pack_data(aTexture);
+          aCommand += "\")";
+        }
+        theScript += aCommand;
       }
     }
     theScript += "\n";
@@ -1456,13 +1456,13 @@ void AddTextures (int theDocID, TCollection_AsciiString& theScript)
  */
 //=============================================================================
 void PublishObject (const TCollection_AsciiString&                  theEntry,
-                   const TCollection_AsciiString&                  theName,
-                   const Resource_DataMapOfAsciiStringAsciiString& theObjectNames,
-                   const Resource_DataMapOfAsciiStringAsciiString& theEntry2StEntry,
-                   const Resource_DataMapOfAsciiStringAsciiString& theStEntry2Entry,
-                   const Resource_DataMapOfAsciiStringAsciiString& theEntryToBadName,
-                   std::map< int, std::string >&                   theEntryToCommandMap,
-                   std::set<std::string>&                          theMapOfPublished)
+                    const TCollection_AsciiString&                  theName,
+                    const Resource_DataMapOfAsciiStringAsciiString& theObjectNames,
+                    const Resource_DataMapOfAsciiStringAsciiString& theEntry2StEntry,
+                    const Resource_DataMapOfAsciiStringAsciiString& theStEntry2Entry,
+                    const Resource_DataMapOfAsciiStringAsciiString& theEntryToBadName,
+                    std::map< int, std::string >&                   theEntryToCommandMap,
+                    std::set<std::string>&                          theMapOfPublished)
 {
   if ( !theEntry2StEntry.IsBound( theEntry ))
     return; // was not published
index df007beec62f94ab5f23bb17a8d4c523e67aed4d..25b661d1554ee8a2388409e4510267a01fa374b5 100644 (file)
@@ -119,26 +119,26 @@ class GEOM_Engine
 
   //Adds a new sub shape object of the MainShape object
   Standard_EXPORT Handle(GEOM_Object) AddSubShape(Handle(GEOM_Object) theMainShape, 
-                                 Handle(TColStd_HArray1OfInteger) theIndices,
-                                 bool isStandaloneOperation = false);
+                                  Handle(TColStd_HArray1OfInteger) theIndices,
+                                  bool isStandaloneOperation = false);
 
   Standard_EXPORT TCollection_AsciiString DumpPython(int theDocID, 
-                                    Resource_DataMapOfAsciiStringAsciiString& theObjectNames,
+                                     Resource_DataMapOfAsciiStringAsciiString& theObjectNames,
                                      TVariablesList theVariables,
-                                    bool isPublished, 
-                                    bool& aValidScript);
+                                     bool isPublished, 
+                                     bool& aValidScript);
 
   Standard_EXPORT const char* GetDumpName (const char* theStudyEntry) const;
 
   Standard_EXPORT Handle(TColStd_HSequenceOfAsciiString) GetAllDumpNames() const;
 
   Standard_EXPORT int addTexture(int theDocID, int theWidth, int theHeight,
-                                const Handle(TDataStd_HArray1OfByte)& theTexture,
-                                const TCollection_AsciiString& theFileName = "");
+                                 const Handle(TDataStd_HArray1OfByte)& theTexture,
+                                 const TCollection_AsciiString& theFileName = "");
 
   Standard_EXPORT Handle(TDataStd_HArray1OfByte) getTexture(int theDocID, int theTextureID,
-                                                           int& theWidth, int& theHeight,
-                                                           TCollection_AsciiString& theFileName);
+                                                            int& theWidth, int& theHeight,
+                                                            TCollection_AsciiString& theFileName);
 
   Standard_EXPORT std::list<int> getAllTextures(int theDocID);
 
index d10bd9daf3f5b817f017d3b82e13fd54fcc90127..d9d1c321e45ab97b46f4f35912c8855fec5e3989 100644 (file)
@@ -727,10 +727,10 @@ Standard_EXPORT Handle_Standard_Type& GEOM_Function_Type_()
 
   static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,NULL};
   static Handle_Standard_Type _aType = new Standard_Type("GEOM_Function",
-                                                        sizeof(GEOM_Function),
-                                                        1,
-                                                        (Standard_Address)_Ancestors,
-                                                        (Standard_Address)NULL);
+                                                         sizeof(GEOM_Function),
+                                                         1,
+                                                         (Standard_Address)_Ancestors,
+                                                         (Standard_Address)NULL);
 
   return _aType;
 }
index dcfd41056ebf3d4a77fb4942ae530d88f011b89c..fc2170a8612e7ca8c488741c3a90da6023f3ada3 100644 (file)
@@ -455,7 +455,7 @@ int GEOM_Object::GetMarkerTexture()
       TDF_Label aTypeLabel = aMarkerLabel.FindChild(MARKER_LABEL_ID, Standard_False);
       Handle(TDataStd_Integer) anIdAttr;
       if (!aTypeLabel.IsNull() && aTypeLabel.FindAttribute(TDataStd_Integer::GetID(), anIdAttr))
-       anId = anIdAttr->Get();
+        anId = anIdAttr->Get();
     }
   }
   return anId;
@@ -671,10 +671,10 @@ Standard_EXPORT Handle_Standard_Type& GEOM_Object_Type_()
 
   static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,NULL};
   static Handle_Standard_Type _aType = new Standard_Type("GEOM_Object",
-                                                        sizeof(GEOM_Object),
-                                                        1,
-                                                        (Standard_Address)_Ancestors,
-                                                        (Standard_Address)NULL);
+                                                         sizeof(GEOM_Object),
+                                                         1,
+                                                         (Standard_Address)_Ancestors,
+                                                         (Standard_Address)NULL);
   return _aType;
 }
 
index 4967c088b67db1b19c77c65d9b9111bd019069c5..f38f1e622dccf65a09a9f40f19efcb52b9c87fd4 100644 (file)
@@ -60,11 +60,11 @@ bool GEOM_Solver::ComputeFunction(Handle(GEOM_Function) theFunction)
       
   Handle(TFunction_Driver) aDriver;
   if(!TFunction_DriverTable::Get()->FindDriver(aGUID, aDriver)) return false;
-         
+          
   aDriver->Init(theFunction->GetEntry());
-           
+            
   TFunction_Logbook aLog;
   if(aDriver->Execute(aLog) == 0) return false;
-               
+                
   return true;     
 }
index 12d62e5a1cf5e0e25f0e33d2c58e3b69eb0fbe18..39aa38208ba24a06de8066fcac33b49b7b90c496 100644 (file)
@@ -101,11 +101,11 @@ Standard_Integer GEOM_SubShapeDriver::Execute(TFunction_Logbook& log) const
       B.MakeCompound(aCompound);
 
       for (int i = anIndices->Lower(); i<= anIndices->Upper(); i++) {
-       if (aMapOfShapes.Extent() < anIndices->Value(i))
-         Standard_NullObject::Raise("GEOM_SubShapeDriver::Execute: Index is out of range");
-       TopoDS_Shape aSubShape = aMapOfShapes.FindKey(anIndices->Value(i));
-       if (aSubShape.IsNull()) continue;
-       B.Add(aCompound,aSubShape);
+        if (aMapOfShapes.Extent() < anIndices->Value(i))
+          Standard_NullObject::Raise("GEOM_SubShapeDriver::Execute: Index is out of range");
+        TopoDS_Shape aSubShape = aMapOfShapes.FindKey(anIndices->Value(i));
+        if (aSubShape.IsNull()) continue;
+        B.Add(aCompound,aSubShape);
       }
 
       aShape = aCompound;
@@ -145,10 +145,10 @@ Standard_EXPORT Handle_Standard_Type& GEOM_SubShapeDriver_Type_()
 
   static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
   static Handle_Standard_Type _aType = new Standard_Type("GEOM_SubShapeDriver",
-                                                        sizeof(GEOM_SubShapeDriver),
-                                                        1,
-                                                        (Standard_Address)_Ancestors,
-                                                        (Standard_Address)NULL);
+                                                         sizeof(GEOM_SubShapeDriver),
+                                                         1,
+                                                         (Standard_Address)_Ancestors,
+                                                         (Standard_Address)NULL);
 
   return _aType;
 }