X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkComplexBlackBoxDescriptor.cxx;h=0e1114d52383c1480eb50ca410ba084ff1aa0746;hb=ba235cfa6ce74178ab468c01af002af0ab3a7d82;hp=e421055a8e2c5c65f136566801765cacbe528f6c;hpb=6c5d7746e8e4cb0b5d6e164b917008a7137910fb;p=bbtk.git

diff --git a/kernel/src/bbtkComplexBlackBoxDescriptor.cxx b/kernel/src/bbtkComplexBlackBoxDescriptor.cxx
index e421055..0e1114d 100644
--- a/kernel/src/bbtkComplexBlackBoxDescriptor.cxx
+++ b/kernel/src/bbtkComplexBlackBoxDescriptor.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkComplexBlackBoxDescriptor.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/04/08 06:59:30 $
-  Version:   $Revision: 1.13 $
+  Date:      $Date: 2008/05/14 10:26:29 $
+  Version:   $Revision: 1.16 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -28,19 +28,30 @@
 
 namespace bbtk
 {
-  
+   //=======================================================================
+  /// 
+  ComplexBlackBoxDescriptor::Pointer 
+  ComplexBlackBoxDescriptor::New(const std::string& name)
+  {
+    bbtkDebugMessage("object",1,"##> ComplexBlackBoxDescriptor::New(\""<<name<<"\")"<<std::endl);
+    ComplexBlackBoxDescriptor::Pointer p = 
+      MakePointer(new ComplexBlackBoxDescriptor(name));
+    bbtkDebugMessage("object",1,"<## ComplexBlackBoxDescriptor::New(\""<<name<<"\")"<<std::endl);
+    return p;
+  }
+  //=======================================================================
 
   //=======================================================================
   /// Default ctor
   ComplexBlackBoxDescriptor::ComplexBlackBoxDescriptor(const std::string& name)
-    : BlackBoxDescriptor(),
-      mFactory(0)
   {
-    bbtkDebugMessageInc("Kernel",9,"ComplexBlackBoxDescriptor::ComplexBlackBoxDescriptor(\""<<name<<"\")"<<std::endl);
+    bbtkDebugMessage("object",2,"==> ComplexBlackBoxDescriptor::ComplexBlackBoxDescriptor(\""<<name<<"\")"<<std::endl);
     SetTypeName(name);
     AddToCategory("complex box");
-    mPrototype = new ComplexBlackBox(name+std::string("Prototype"),this);
-    bbtkDebugDecTab("Kernel",9);
+    mPrototype = ComplexBlackBox::New(name+std::string("Prototype"),
+				      MakePointer(this,true));
+    mPrototype->SetAsPrototype();
+    bbtkDebugMessage("object",2,"<== ComplexBlackBoxDescriptor::ComplexBlackBoxDescriptor(\""<<name<<"\")"<<std::endl);
   }
   //=======================================================================
 
@@ -50,22 +61,28 @@ namespace bbtk
   /// Default dtor
   ComplexBlackBoxDescriptor::~ComplexBlackBoxDescriptor()
   {
-    bbtkDebugMessageInc("Kernel",9,"ComplexBlackBoxDescriptor::~ComplexBlackBoxDescriptor(\""<<GetTypeName()<<"\")"<<std::endl);
-
-    delete mPrototype;
-
-    bbtkDebugDecTab("Kernel",9);
+    bbtkDebugMessage("object",2,"==> ComplexBlackBoxDescriptor::~ComplexBlackBoxDescriptor(\""<<GetTypeName()<<"\")"<<std::endl);
+    //    mPrototype->Delete();
+    mPrototype.reset();
+    bbtkDebugMessage("object",2,"<== ComplexBlackBoxDescriptor::~ComplexBlackBoxDescriptor(\""<<GetTypeName()<<"\")"<<std::endl);
   }
   //=======================================================================
 
+  //=========================================================================
+  /// Check
+  void ComplexBlackBoxDescriptor::Check(bool recursive) const
+  {
+    mPrototype->Check(recursive);
+  }
+  //=========================================================================
 
   //=======================================================================
   /// Creates an instance of name <name> of the ComplexBlackBox of which this is the descriptor 
-  BlackBox* ComplexBlackBoxDescriptor::CreateInstance(const std::string& name)
+  BlackBox::Pointer 
+  ComplexBlackBoxDescriptor::NewBlackBox(const std::string& name)
   {
-    //bbtkError("ComplexBlackBoxDescriptor::CreateInstance not implemented");
     bbtkDebugMessageInc("Kernel",5,
-			"ComplexBlackBoxDescriptor::CreateInstance(\""
+			"ComplexBlackBoxDescriptor::NewBlackBox(\""
 			<<name<<"\") ["
 			<<GetTypeName()<<"]"<<std::endl);
     
@@ -75,7 +92,14 @@ namespace bbtk
   }
   //=======================================================================
 
-
+  /*
+  //=======================================================================
+  /// Release
+  void ComplexBlackBoxDescriptor::Release(bool release_package)
+  {
+  }
+  //=======================================================================
+  */
 
   //=======================================================================
   /// Adds a black box to the complex box
@@ -89,7 +113,7 @@ namespace bbtk
 			<<GetTypeName()<<"]"<<std::endl);
     
     // 
-    if (mFactory == 0) 
+    if (!GetFactory()) 
       { 
 	bbtkError("ComplexBlackBoxDescriptor::Add : no factory set");
       }
@@ -100,13 +124,23 @@ namespace bbtk
 	bbtkError("a black box \""<<name<<"\" already exists");
       }
     // ok : create new one
-    mPrototype->bbAddBlackBox ( mFactory->NewBlackBox(type,name) );
+    mPrototype->bbAddBlackBox ( GetFactory()->NewBlackBox(type,name) );
 
     bbtkDebugDecTab("Kernel",5);
   }
   //=======================================================================
+  
+  //=======================================================================
+  /// Removes a black box from the complex box
+  void ComplexBlackBoxDescriptor::Remove( const std::string& name, 
+					  bool remove_connections)
+  {    
+    mPrototype->bbRemoveBlackBox(name,remove_connections);
+  }
+  //=======================================================================
+
 
- //=======================================================================
+  //=======================================================================
   /// Adds a black box to the execution list 
   void ComplexBlackBoxDescriptor::AddToExecutionList ( const std::string& box)
   {
@@ -115,7 +149,7 @@ namespace bbtk
 			<<box<<"\" ["
 			<<GetTypeName()<<"]"<<std::endl);
     // Verify that the box exists
-    BlackBox* b = mPrototype->bbUnsafeGetBlackBox( box ); 
+    BlackBox::Pointer b = mPrototype->bbUnsafeGetBlackBox( box ); 
     if ( !b ) 
       {
 	bbtkError("the black box \""<<box<<"\" does not exist");
@@ -142,25 +176,26 @@ namespace bbtk
 			<<"\") ["
 			<<GetTypeName()<<"]"<<std::endl);
   // 
-    if (mFactory == 0) 
+    if (!GetFactory()) 
       { 
 	bbtkError("ComplexBlackBoxDescriptor::Connect : no factory set");
       }
     
 
   // Verify that a box with the same name does not exist already
-    BlackBox* bbfrom = mPrototype->bbGetBlackBox( from );
+    BlackBox::Pointer bbfrom = mPrototype->bbGetBlackBox( from );
     if ( !bbfrom ) 
       {
 	bbtkError("the black box \""<<from<<"\" does not exist");
       }
-    BlackBox* bbto = mPrototype->bbGetBlackBox( to );
+    BlackBox::Pointer bbto = mPrototype->bbGetBlackBox( to );
     if ( !bbto ) 
       {
 	bbtkError("the black box \""<<to<<"\" does not exist");
       }
     
-    Connection* c = mFactory->NewConnection( bbfrom, output, bbto, input );
+    Connection::Pointer c 
+      = GetFactory()->NewConnection( bbfrom, output, bbto, input );
 
     mPrototype->bbAddConnection(c);
 
@@ -183,7 +218,7 @@ namespace bbtk
 			<<"\") ["
 			<<GetTypeName()<<"]"<<std::endl);
 
-    BlackBox* bb = mPrototype->bbGetBlackBox( box );
+    BlackBox::Pointer bb = mPrototype->bbGetBlackBox( box );
     if ( !bb ) 
       {
 	bbtkError("the black box \""<<box<<"\" does not exist");
@@ -225,7 +260,7 @@ namespace bbtk
 			<<"\") ["
 			<<GetTypeName()<<"]"<<std::endl);
 
-    BlackBox* bb = mPrototype->bbGetBlackBox( box );
+    BlackBox::Pointer bb = mPrototype->bbGetBlackBox( box );
     if ( !bb ) 
       {
 	bbtkError("the black box \""<<box<<"\" does not exist");
@@ -300,7 +335,7 @@ namespace bbtk
 
 
     std::string descr = GetDescription();
-    Utilities::html_format(descr);
+    //Utilities::html_format(descr);
     
     std::string author = GetAuthor();
     Utilities::html_format(author);
@@ -342,16 +377,16 @@ namespace bbtk
     {
 	   (s) << "<TR><TD style='vertical-align: top;'><b> Uses </b></TD><TD style='vertical-align: top;'> : </TD><TD style='vertical-align: top;'>  ";
 
-	   std::set<BlackBoxDescriptor*> pdeps;
+	   std::set<BlackBoxDescriptor::Pointer> pdeps;
 	   ComplexBlackBox::BlackBoxMapType::const_iterator b;
 	   for ( b = B.begin(); b != B.end(); ++b ) 
 	   {
-	      BlackBoxDescriptor* d = b->second->bbGetDescriptor();
+	     BlackBoxDescriptor::Pointer d = b->second->bbGetDescriptor();
 	      if (pdeps.find(d) != pdeps.end()) 
             continue;
 	      pdeps.insert(d);
 
-	      Package* p = d->GetPackage();
+	      Package::Pointer p = d->GetPackage();
 	    
 	      std::string name = b->second->bbGetTypeName();
 
@@ -400,7 +435,7 @@ namespace bbtk
 	Utilities::html_format(type);
 	
 	std::string descr(in->second->GetDescription());
-	Utilities::html_format(descr);
+	//Utilities::html_format(descr);
 
 	(s) << "<TR><TD style='vertical-align: top;'><B><PRE> "<<name<<" </PRE></B></TD>"
 	  << "<TD style='vertical-align: top;'><I><PRE> "<<type<<" </PRE></I></TD>"
@@ -433,7 +468,7 @@ namespace bbtk
 	Utilities::html_format(type);
 	
 	std::string descr(o->second->GetDescription());
-	Utilities::html_format(descr);
+	//Utilities::html_format(descr);
 	
 	(s) << "<TR><TD style='vertical-align: top;'><B><PRE> "<<name<<" </PRE></B></TD>"
 	  << "<TD style='vertical-align: top;'><I><PRE> "<<type<<" </PRE></I></TD>"
@@ -466,12 +501,15 @@ namespace bbtk
     InputDescriptorMapType::const_iterator i;
     unsigned int namelmax = 0;
     unsigned int typelmax = 0;
+    unsigned int natlmax = 0;
     for ( i = mInput.begin();  i != mInput.end(); ++i ) 
     {
 	   if (i->second->GetName().size()>namelmax) 
 	     namelmax = i->second->GetName().size();
 	   if (i->second->GetTypeName().size()>typelmax) 
 	     typelmax = i->second->GetTypeName().size();
+	   if (i->second->GetNature().size()>natlmax) 
+	     natlmax = i->second->GetNature().size();
     }
     OutputDescriptorMapType::const_iterator o;
     if (full) 
@@ -482,6 +520,8 @@ namespace bbtk
 	       namelmax = o->second->GetName().size();
 	    if (o->second->GetTypeName().size()>typelmax) 
 	       typelmax = o->second->GetTypeName().size();
+	   if (o->second->GetNature().size()>natlmax) 
+	     natlmax = o->second->GetNature().size();
 	   }
     }
     //
@@ -494,10 +534,14 @@ namespace bbtk
 	   std::string type(i->second->GetTypeName());
 	   type += ">";
 	   type.append(1+typelmax-type.size(),' ');
+	   std::string nature(i->second->GetNature());
+	   nature += "]";
+	   nature.append(1+natlmax-nature.size(),' ');
 	   bbtkMessage("Help",1,
-		    "    '"<<name
-		    <<" <"<<type
-		    <<" : "<<i->second->GetDescription()<<std::endl);
+		       "    '"<<name
+		       <<" <"<<type
+		       <<" ["<<nature
+		       <<" : "<<i->second->GetDescription()<<std::endl);
     }
     if (full) 
     {
@@ -513,9 +557,13 @@ namespace bbtk
 	     std::string type(o->second->GetTypeName());
 	     type += ">";
 	     type.append(1+typelmax-type.size(),' ');
+	     std::string nature(o->second->GetNature());
+	     nature += "]";
+	     nature.append(1+natlmax-nature.size(),' ');
 	     bbtkMessage("Help",1,
-			 "    '"<<name
+		       "    '"<<name
 			 <<" <"<<type
+			 <<" ["<<nature
 			 <<" : "<<o->second->GetDescription()<<std::endl);
 	   }
     }
@@ -542,7 +590,43 @@ namespace bbtk
   }   
   //=======================================================================
 
-
-
+  //==========================================================================
+  std::string ComplexBlackBoxDescriptor::GetObjectName() const
+  {
+    return std::string("ComplexBlackBoxDescriptor '")+GetFullTypeName()
+      +std::string("'");
+  }
+  //==========================================================================
+  //=======================================================================
+  std::string ComplexBlackBoxDescriptor::GetObjectInfo() const
+  {
+    std::string i;
+    return i;     
+  }
+  //=======================================================================
+ //==========================================================================
+size_t  ComplexBlackBoxDescriptor::GetObjectSize() const 
+{
+  size_t s = Superclass::GetObjectSize();
+  s += ComplexBlackBoxDescriptor::GetObjectInternalSize();
+  return s;
+  }
+  //==========================================================================
+  //==========================================================================
+size_t  ComplexBlackBoxDescriptor::GetObjectInternalSize() const 
+{
+  size_t s = sizeof(ComplexBlackBoxDescriptor);
+  return s;
+  }
+  //==========================================================================
+  //==========================================================================
+  size_t  ComplexBlackBoxDescriptor::GetObjectRecursiveSize() const 
+  {
+    size_t s = Superclass::GetObjectRecursiveSize();
+    s += ComplexBlackBoxDescriptor::GetObjectInternalSize();
+    s += mPrototype->GetObjectRecursiveSize();
+    return s;
+  }
+  //==========================================================================
 
 }