From: eduardo.davila@creatis.insa-lyon.fr <eduardo.davila@creatis.insa-lyon.fr>
Date: Fri, 10 Nov 2023 15:57:43 +0000 (+0100)
Subject: #3512 clean bbs2 python version
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=7a86b21a88862240b2b56d165433cbcbb50ab316;p=bbtk.git

#3512 clean bbs2 python version
---

diff --git a/kernel/appli/bbs2cpp/bbs2.cxx b/kernel/appli/bbs2cpp/bbs2.cxx
index 25c1290..184b48c 100644
--- a/kernel/appli/bbs2cpp/bbs2.cxx
+++ b/kernel/appli/bbs2cpp/bbs2.cxx
@@ -97,18 +97,18 @@ int main(int argc, char* argv[])
              fprintf(ff,"\n" );
              fprintf(ff,"from bbtk.bbtkBlackBox import *\n" );
              fprintf(ff,"\n" );
-             fprintf(ff,"class %s:\n",fileBase.c_str() );
+             fprintf(ff,"class %s(ComplexBlackBox):\n",fileBase.c_str() );
              fprintf(ff,"\n" );
-             fprintf(ff,"    def __init__(self):\n" );
-             fprintf(ff,"        self.mCBpy  =  ComplexBlackBox('%s')\n",file.c_str() );
+             fprintf(ff,"    def __init__(self, nameBox):\n" );
+             fprintf(ff,"        super().__init__(nameBox)\n" );
              fprintf(ff,"\n" );
              fprintf(ff,"    def Run(self):\n" );
              int i,size=pythonBBTK.size();
              for (i=0; i<size;i++)
              {
-                 fprintf(ff,"        self.mCBpy.%s\n", pythonBBTK[i].c_str() );
+                 fprintf(ff,"        self.%s\n", pythonBBTK[i].c_str() );
              }// for i
-             fprintf(ff,"        self.mCBpy.Execute()\n" );
+             fprintf(ff,"        self.Execute()\n" );
              fclose(ff);
          } catch (bbtk::Exception e) {
              e.Print();
diff --git a/kernel/src/bbtkComplexBlackBox.cxx b/kernel/src/bbtkComplexBlackBox.cxx
index 0e823e0..c07ba9f 100644
--- a/kernel/src/bbtkComplexBlackBox.cxx
+++ b/kernel/src/bbtkComplexBlackBox.cxx
@@ -53,12 +53,9 @@ namespace bbtk
   ComplexBlackBox::Pointer ComplexBlackBox::New(const std::string& name,
 						ComplexBlackBoxDescriptor::Pointer desc)
   {
-    bbtkDebugMessage("object",1,"##> ComplexBlackBox::New('"<<name<<"','"<<
-		     desc->GetTypeName()<<"')" <<bbtkendl);
-    ComplexBlackBox::Pointer p = 
-      MakeBlackBoxPointer(new ComplexBlackBox(name,desc));
-    bbtkDebugMessage("object",2,"<## ComplexBlackBox::New('"<<name<<"','"<<
-		     desc->GetTypeName()<<"')" <<bbtkendl);
+    bbtkDebugMessage("object",1,"##> ComplexBlackBox::New('"<<name<<"','"<< desc->GetTypeName()<<"')" <<bbtkendl);
+    ComplexBlackBox::Pointer p = MakeBlackBoxPointer(new ComplexBlackBox(name,desc));
+    bbtkDebugMessage("object",2,"<## ComplexBlackBox::New('"<<name<<"','"<< desc->GetTypeName()<<"')" <<bbtkendl);
     return p;
   }
   //==========================================================================
diff --git a/kernel/src/bbtkInterpreterPython.cxx b/kernel/src/bbtkInterpreterPython.cxx
index f13ded8..e0daa2c 100644
--- a/kernel/src/bbtkInterpreterPython.cxx
+++ b/kernel/src/bbtkInterpreterPython.cxx
@@ -96,6 +96,8 @@ namespace bbtk
   //=========================================================================
   void InterpreterPython::commandInput(const std::string &name,const std::string &box,const std::string &input,const std::string  &help)
   {
+      std::string  code("DECLARE_INPUT('"+name+"','"+box+"."+input+"')");
+      this->pythonBBTK.push_back(code);
   }
   //=========================================================================