re indent

diff --git a/kernel/src/bbtkBlackBox.cxx b/kernel/src/bbtkBlackBox.cxx
index dc496cb8955ec63695b1f4129187d03ed525b2b5..dfdf6e5df63861b3c353e71d6e289b6e20ffdedd 100644 (file)
--- a/kernel/src/bbtkBlackBox.cxx
+++ b/kernel/src/bbtkBlackBox.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkBlackBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2011/07/02 08:00:34 $
-  Version:   $Revision: 1.53 $
+  Date:      $Date: 2011/07/22 17:42:50 $
+  Version:   $Revision: 1.54 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -349,7 +349,6 @@ namespace bbtk
   //=========================================================================
   bool BlackBox::bbCanReact() const 
   { 
-
     return ( bbGlobalGetSomeBoxExecuting() 
 #ifdef USE_WXWIDGETS
             || Wx::IsSomeWindowAlive() 
@@ -454,9 +453,9 @@ namespace bbtk
          }
        }                                                               
     
-         
-    if ( ( bbBoxProcessModeIsReactive()  || (c==bbGetInputConnectorMap().find("BoxExecute")->second))
-        && (bbCanReact() ) )
+    if (  ( bbBoxProcessModeIsReactive()
+          || (c==bbGetInputConnectorMap().find("BoxExecute")->second))
+          && (bbCanReact() ) )
       {
        bbtkBlackBoxDebugMessage("change",2,
                         "-> Execution triggered by Reactive mode or BoxExecute input change"<<std::endl);
@@ -477,7 +476,6 @@ namespace bbtk
                             <<reaction<<")"
                             <<"]"<<std::endl);
 
-         
     OutputConnectorMapType::iterator i;
     for ( i  = bbGetOutputConnectorMap().begin(); 
          i != bbGetOutputConnectorMap().end(); ++i) 
@@ -493,19 +491,15 @@ namespace bbtk
            //    }
       } // for
 
-    if (reaction) 
-       { 
-               bbGlobalProcessExecutionList();
-       }  
+    if (reaction) bbGlobalProcessExecutionList();
 
     bbtkBlackBoxDebugMessage("change",5,
                             "<= BlackBox::bbSignalOutputModification()"
                             <<std::endl);
   }  
   //=========================================================================   
-       
-       
-       
+
+
   //=========================================================================  
   void BlackBox::bbSignalOutputModification(const std::string& output,
                                            bool reaction)
@@ -1156,8 +1150,8 @@ namespace bbtk
           const BlackBoxOutputDescriptor* id = bbGetDescriptor()->GetOutputDescriptor(ii->first); 
           tempStrTypeName=id->GetTypeName();
           SubsBrackets(tempStrTypeName);
-           std::string Name(ii->first);
-           SubsBrackets(Name);
+          std::string Name(ii->first);
+          SubsBrackets(Name);
           labelStr=labelStr+"<"+ii->first.c_str()+"> " + valueStr + Name.c_str() + "  ["+tempStrTypeName+"]";
        }
        labelStr = labelStr+ "      } }" ;
@@ -1217,23 +1211,23 @@ namespace bbtk
      
     if (this->bbGetDescriptor()->GetPackage()) 
       {
-       bbtkBlackBoxMessage("help",1,"Black Box '"<<bbGetName()<<"' <"<<
+            bbtkBlackBoxMessage("help",1,"Black Box '"<<bbGetName()<<"' <"<<
                    this->bbGetDescriptor()->GetPackage()->GetName()
                    <<"::"<<this->bbGetDescriptor()->GetTypeName()<<">"<<std::endl);
       }
     else 
       {
-       bbtkBlackBoxMessage("help",1,"Black Box <::"<<this->bbGetDescriptor()->GetTypeName()<<">"<<std::endl);
+            bbtkBlackBoxMessage("help",1,"Black Box <::"<<this->bbGetDescriptor()->GetTypeName()<<">"<<std::endl);
       }
     /*
     if (bbIsUpToDate())
       {
-       bbtkBlackBoxMessage("help",1,"Up-to-date ["<<mMaxInputChangeTime<<","
+            bbtkBlackBoxMessage("help",1,"Up-to-date ["<<mMaxInputChangeTime<<","
                    <<mMinOutputChangeTime<<"]"<<std::endl);
       }
     else 
       {
-       bbtkBlackBoxMessage("help",1,"Out-of-date ["<<mMaxInputChangeTime<<","
+            bbtkBlackBoxMessage("help",1,"Out-of-date ["<<mMaxInputChangeTime<<","
                    <<mMinOutputChangeTime<<"]"<<std::endl);
       }
     */
@@ -1250,47 +1244,49 @@ namespace bbtk
     unsigned int valuelmax = 0;
     //   unsigned int connlmax = 0;
     for ( i = mInputConnectorMap.begin(); i != mInputConnectorMap.end(); ++i ) 
-      {
-       iname.push_back(i->first);
-       if (iname.back().size()>namelmax) namelmax = iname.back().size();
-       ivalue.push_back(bbGetInputAsString(i->first));
-       if (ivalue.back().size()>valuelmax) valuelmax = ivalue.back().size();
-       std::string s("");
-       Connection* con = i->second->GetConnection();
-       if (con!=0){
-         s = con->GetOriginalBlackBoxFrom()->bbGetName();
-         s += ".";
-         s += con->GetOriginalBlackBoxFromOutput();
-       }  // if con
-       iconn.push_back(s);
-       istatus.push_back(GetIOStatusString(i->second->GetStatus()));
-      }
+    {
+          iname.push_back(i->first);
+          if (iname.back().size()>namelmax) namelmax = iname.back().size();
+          ivalue.push_back(bbGetInputAsString(i->first));
+          if (ivalue.back().size()>valuelmax) valuelmax = ivalue.back().size();
+          std::string s("");
+          Connection* con = i->second->GetConnection();
+          if (con!=0){
+             s = con->GetOriginalBlackBoxFrom()->bbGetName();
+             s += ".";
+             s += con->GetOriginalBlackBoxFromOutput();
+          }  // if con
+          iconn.push_back(s);
+          istatus.push_back(GetIOStatusString(i->second->GetStatus()));
+    }
     OutputConnectorMapType::iterator o;
     std::vector<std::string> oname;
     std::vector<std::string> ovalue;
     std::vector<std::vector<std::string> > oconn;
     std::vector<std::string> ostatus;
     for ( o = mOutputConnectorMap.begin(); o != mOutputConnectorMap.end(); ++o ) 
-      {
-       oname.push_back(o->first);
-       if (oname.back().size()>namelmax) namelmax = oname.back().size();
-       ovalue.push_back(bbGetOutputAsString(o->first));
-       if (ovalue.back().size()>valuelmax) valuelmax = ovalue.back().size();
-       std::vector<std::string> ss;
-       const std::vector<Connection*>& con 
-         = o->second->GetConnectionVector();
-       std::vector<Connection*>::const_iterator c;
-       for (c=con.begin();c!=con.end();++c) 
-         {
-           std::string s;
-           s = (*c)->GetOriginalBlackBoxTo()->bbGetName();
-           s += ".";
-           s += (*c)->GetOriginalBlackBoxToInput();
-           ss.push_back(s);
-       }  // if con
-       oconn.push_back(ss);
-       ostatus.push_back(GetIOStatusString(o->second->GetStatus()));
-      }
+    {
+          oname.push_back(o->first);
+          if (oname.back().size()>namelmax)
+          namelmax = oname.back().size();
+          ovalue.push_back(bbGetOutputAsString(o->first));
+          if (ovalue.back().size()>valuelmax) 
+          valuelmax = ovalue.back().size();
+          std::vector<std::string> ss;
+          const std::vector<Connection*>& con 
+                                   = o->second->GetConnectionVector();
+          std::vector<Connection*>::const_iterator c;
+          for (c=con.begin();c!=con.end();++c) 
+          {
+              std::string s;
+              s = (*c)->GetOriginalBlackBoxTo()->bbGetName();
+              s += ".";
+              s += (*c)->GetOriginalBlackBoxToInput();
+              ss.push_back(s);
+           }  // if con
+           oconn.push_back(ss);
+           ostatus.push_back(GetIOStatusString(o->second->GetStatus()));
+    }
 
     if (iname.size()) 
       bbtkBlackBoxMessage("help",1," * Inputs : "<<std::endl);
@@ -1299,53 +1295,52 @@ namespace bbtk
 
     std::vector<std::string>::iterator i1,i2,i3,i4;
     for (i1=iname.begin(),i2=ivalue.begin(),i3=iconn.begin(),i4=istatus.begin();
-        i1!=iname.end(),i2!=ivalue.end(),i3!=iconn.end(),i4!=istatus.end();
-        ++i1,++i2,++i3,++i4)
-      {
-       std::string name(*i1);
-       name += "'";
-       name.append(1+namelmax-name.size(),' ');
-       std::string value(*i2);
-       value += "'";
-       value.append(1+valuelmax-value.size(),' ');
-       if (i3->size()) 
-         bbtkBlackBoxMessage("help",1,"    '"<<name<<" = '"<<value<<" <-- '"
-                     <<*i3<<"'");
-       else 
-         bbtkBlackBoxMessage("help",1,"    '"<<name<<" = '"<<value);
-       bbtkBlackBoxMessage("help",1," ["<<*i4<<"]"<<std::endl);
-      }
+            i1!=iname.end(),i2!=ivalue.end(),i3!=iconn.end(),i4!=istatus.end();
+          ++i1,++i2,++i3,++i4)
+     {
+           std::string name(*i1);
+           name += "'";
+           name.append(1+namelmax-name.size(),' ');
+           std::string value(*i2);
+           value += "'";
+           value.append(1+valuelmax-value.size(),' ');
+           if (i3->size()) 
+             bbtkBlackBoxMessage("help",1,"    '"<<name<<" = '"<<value<<" <-- '" <<*i3<<"'");
+           else 
+             bbtkBlackBoxMessage("help",1,"    '"<<name<<" = '"<<value);
+           bbtkBlackBoxMessage("help",1," ["<<*i4<<"]"<<std::endl);
+     }
 
     if (oname.size()) 
-      bbtkBlackBoxMessage("help",1," * Outputs : "<<std::endl);
+       bbtkBlackBoxMessage("help",1," * Outputs : "<<std::endl);
     else 
-      bbtkBlackBoxMessage("help",1," * No outputs"<<std::endl);
+       bbtkBlackBoxMessage("help",1," * No outputs"<<std::endl);
 
     std::vector<std::vector<std::string> >::iterator i5;
 
     for (i1=oname.begin(),i2=ovalue.begin(),i5=oconn.begin(),i4=ostatus.begin();
-        i1!=oname.end(),i2!=ovalue.end(),i5!=oconn.end(),i4!=ostatus.end();
-        ++i1,++i2,++i4,++i5)
-      {
-       std::string name(*i1);
-       name += "'";
-       name.append(1+namelmax-name.size(),' ');
-       std::string value(*i2);
-       value += "'";
-       value.append(1+valuelmax-value.size(),' ');
-       if (!(*i5).size())
-         bbtkBlackBoxMessage("help",1,"    '"<<name<<" = '"<<value);
-       else 
-         {
-           std::string pref = "    '"+name+" = '"+value;
-           for (i3=i5->begin();i3!=i5->end();++i3)
-             {
-               bbtkBlackBoxMessage("help",1,pref<<" --> '"<<*i3<<"'");
-               pref.replace(0,pref.size(),pref.size(),' ');
-             }
-         }
-       bbtkBlackBoxMessage("help",1," ["<<*i4<<"]"<<std::endl);
-      }
+            i1!=oname.end(),i2!=ovalue.end(),i5!=oconn.end(),i4!=ostatus.end();
+          ++i1,++i2,++i4,++i5)
+    {
+           std::string name(*i1);
+           name += "'";
+           name.append(1+namelmax-name.size(),' ');
+           std::string value(*i2);
+           value += "'";
+           value.append(1+valuelmax-value.size(),' ');
+           if (!(*i5).size())
+             bbtkBlackBoxMessage("help",1,"    '"<<name<<" = '"<<value);
+           else 
+           {
+              std::string pref = "    '"+name+" = '"+value;
+              for (i3=i5->begin();i3!=i5->end();++i3)
+              {
+                     bbtkBlackBoxMessage("help",1,pref<<" --> '"<<*i3<<"'");
+                     pref.replace(0,pref.size(),pref.size(),' ');
+              }
+           }
+           bbtkBlackBoxMessage("help",1," ["<<*i4<<"]"<<std::endl);
+    }
 
    }
   //=========================================================================

diff --git a/kernel/src/bbtkInterpreterVirtual.cxx b/kernel/src/bbtkInterpreterVirtual.cxx
index aa9e3cca9f05b5f97347e19fcd2af4f585364d4d..49d951f6c90164be8b59e3e4b091c1cdde3fa271 100644 (file)
--- a/kernel/src/bbtkInterpreterVirtual.cxx
+++ b/kernel/src/bbtkInterpreterVirtual.cxx
@@ -1282,7 +1282,6 @@ namespace bbtk
     std::string upath;
     pkgname = Utilities::ExtractScriptName(name,upath);
 
-         
     bbtkMessage("interpreter",3,
                "package name:[" << pkgname
                 << "] path:[" << upath << "]" << std::endl);
@@ -1957,8 +1956,7 @@ void InterpreterVirtual::SwitchToStream( std::stringstream* stream )
     ter.c_cc[VTIME]=0;
     tcsetattr(0,TCSANOW,&ter);
 #endif
-    
-         
+
     mCommandLine = true;
     bool again = true;
     // bool insideComment = false; // for multiline comment  

diff --git a/packages/std/src/bbstdGetVectorElement.h b/packages/std/src/bbstdGetVectorElement.h
index d85ad988e6bd06aaf964d845e0ba2ec4e3e2d1ba..2eacfc26797a485b86e95db328c752295558bf72 100644 (file)
--- a/packages/std/src/bbstdGetVectorElement.h
+++ b/packages/std/src/bbstdGetVectorElement.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbstdGetVectorElement.h,v $
   Language:  C++
-  Date:      $Date: 2011/07/02 08:00:35 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2011/07/22 17:42:51 $
+  Version:   $Revision: 1.8 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -41,14 +41,14 @@ namespace bbstd
   // BlackBox declaration
   template <class T>
   class bbstd_EXPORT GetVectorElement : public bbtk::AtomicBlackBox
-  {  
+  {
     BBTK_TEMPLATE_BLACK_BOX_INTERFACE(GetVectorElement,bbtk::AtomicBlackBox,T);
     BBTK_DECLARE_INPUT(In,std::vector<T>);
-    BBTK_DECLARE_INPUT(I,int);    
-       BBTK_DECLARE_INPUT(ErrorValue,T);    
+    BBTK_DECLARE_INPUT(I,int);
+       BBTK_DECLARE_INPUT(ErrorValue,T);
     BBTK_DECLARE_OUTPUT(Out,T);
     BBTK_PROCESS(DoIt);
-    void DoIt(); 
+    void DoIt();
   };
   //=================================================================
 
@@ -62,7 +62,7 @@ namespace bbstd
   typedef std::vector<T> Tvector;
   BBTK_TEMPLATE_INPUT(GetVectorElement, In,"Input",Tvector);
   BBTK_TEMPLATE_INPUT(GetVectorElement, I, "Input",int);  
-  BBTK_TEMPLATE_INPUT(GetVectorElement, ErrorValue, "ErrorValue",T);   
+  BBTK_TEMPLATE_INPUT(GetVectorElement, ErrorValue, "ErrorValue",T);
   BBTK_TEMPLATE_OUTPUT(GetVectorElement,Out,"Output",T);
   BBTK_END_DESCRIBE_TEMPLATE_BLACK_BOX(GetVectorElement);
   //=================================================================
@@ -76,7 +76,7 @@ namespace bbstd
                  bbSetOutputOut( bbGetInputIn()[bbGetInputI()] );
          } else {
                  bbSetOutputOut( bbGetInputErrorValue() );
-         }             
+         }
   }
   //=================================================================
 

diff --git a/packages/vtk/src/bbvtkGetVectorElement.h b/packages/vtk/src/bbvtkGetVectorElement.h
index 6993b5cb8fad82ec833f2905618b70a021fb238b..f8b29c29c5e98b898289f70d238525f5f1e70061 100644 (file)
--- a/packages/vtk/src/bbvtkGetVectorElement.h
+++ b/packages/vtk/src/bbvtkGetVectorElement.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbvtkGetVectorElement.h,v $
   Language:  C++
-  Date:      $Date: 2011/07/02 08:00:36 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2011/07/22 17:42:57 $
+  Version:   $Revision: 1.3 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -45,10 +45,10 @@ namespace bbvtk
     BBTK_TEMPLATE_BLACK_BOX_INTERFACE(GetVectorElement,bbtk::AtomicBlackBox,T);
     BBTK_DECLARE_INPUT(In,std::vector<T>);
     BBTK_DECLARE_INPUT(I,int);
-    BBTK_DECLARE_INPUT(ErrorValue,T);    
+    BBTK_DECLARE_INPUT(ErrorValue,T);
     BBTK_DECLARE_OUTPUT(Out,T);
     BBTK_PROCESS(DoIt);
-    void DoIt(); 
+    void DoIt();
   };
   //=================================================================
 
@@ -78,7 +78,7 @@ namespace bbvtk
          } else
          {
                  bbSetOutputOut( bbGetInputErrorValue() );
-         }             
+         }
   }
   //=================================================================
 

diff --git a/packages/vtk/src/bbvtkMagnitud.cxx b/packages/vtk/src/bbvtkMagnitud.cxx
index cc4a2a288362ea70f9f2a5af3e3c9af8bcc6fa0d..07926acdf65d37b8270692a90bd75f2168855cf7 100644 (file)
--- a/packages/vtk/src/bbvtkMagnitud.cxx
+++ b/packages/vtk/src/bbvtkMagnitud.cxx
@@ -26,8 +26,7 @@ void Magnitud::Process()
 //    * TYPE is the C++ type of the input/output
 //      (the one provided in the attribute 'type' of the tag 'input')
 
-       
-       // ---------- 
+// ---------- 
  if (bbGetInputIn()!=NULL) {
    vGreenToRedLut->SetHueRange(0.6667,0.0);
    vGreenToRedLut->Build();
@@ -316,13 +315,13 @@ void Magnitud::Process()
    //temp->GetData( vMultipleContourMapper->GetOutput() );
    //bbSetOutputOutTest( temp );
 
-        
+
  } // if
-        
+
 } // process
-       
-       
-       
+
+
+
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
 //===== 

diff --git a/packages/vtk/src/bbvtkStructuredPointsReader.cxx b/packages/vtk/src/bbvtkStructuredPointsReader.cxx
index 21bfd47e81c5d91c943294c467f015b1e8f7be5d..74f6d6bf3b73cd7dd0a570a010551ebb835f4e58 100644 (file)
--- a/packages/vtk/src/bbvtkStructuredPointsReader.cxx
+++ b/packages/vtk/src/bbvtkStructuredPointsReader.cxx
@@ -26,10 +26,10 @@ void StructuredPointsReader::Process()
 //    * TYPE is the C++ type of the input/output
 //      (the one provided in the attribute 'type' of the tag 'input')
 
-        //warning: comparison with string literal results in unspecified behaviour
+    //warning: comparison with string literal results in unspecified behaviour
        //if ( bbGetInputIn().c_str()!="")
-        std::string empty("");  // JPR
-        if ( bbGetInputIn().c_str()!=empty)
+    std::string empty("");  // JPR
+    if ( bbGetInputIn().c_str()!=empty)
        {
                spr -> SetFileName( bbGetInputIn().c_str() );
                sp = spr->GetOutput();