#3522 javascript ComplexBoxes

diff --git a/kernel/appli/bbs2cpp/bbs2.cxx b/kernel/appli/bbs2cpp/bbs2.cxx
index 2b881d25ac5bf9d82e1745b3c1fccaf2ede4c15b..e206442f51d5dc3aab7d38077498b1bc8f1310f8 100644 (file)
--- a/kernel/appli/bbs2cpp/bbs2.cxx
+++ b/kernel/appli/bbs2cpp/bbs2.cxx
@@ -120,20 +120,21 @@ int main(int argc, char* argv[])
                I->InterpretFile(argv[1]);
             std::vector<std::string> javascriptBBTK=  ((bbtk::InterpreterJavaScript*)(I.get()))->javascriptBBTK  ;
             FILE *ff=fopen(file.c_str(),"w+");
-            fprintf(ff,"import * as bbtk from './bbtk.js' \n" );
 //clean this code
+//            fprintf(ff,"import * as bbtk from './bbtk.js' \n" );
 //            fprintf(ff,"export  class %s{\n",fileBase.c_str() );
-            fprintf(ff,"    Run(){\n" );
+//            fprintf(ff,"    Run(){\n" );
 //clean this code
 //            fprintf(ff,"        let mCBjs  = new bbtk.ComplexBlackBox('%s')\n",fileBase.c_str());
             int i,size=javascriptBBTK.size();
             for (i=0; i<size;i++)
             {
-                fprintf(ff,"        mCBjs.%s\n", javascriptBBTK[i].c_str() );
+                //              fprintf(ff,"        mCBjs.%s\n", javascriptBBTK[i].c_str() );
+                fprintf(ff,"%s\n", javascriptBBTK[i].c_str() );
             }// for i
-            fprintf(ff,"        mCBjs.Execute()\n" );
-            fprintf(ff,"    } \n" );
-            fprintf(ff,"} \n" );
+//          fprintf(ff,"        mCBjs.Execute()\n" );
+//            fprintf(ff,"    } \n" );
+//            fprintf(ff,"} \n" );
             fclose(ff);
         } catch (bbtk::Exception e) {
             e.Print();

diff --git a/kernel/src/bbtkInterpreterJavaScript.cxx b/kernel/src/bbtkInterpreterJavaScript.cxx
index 1927b2de196d182baad37a9a24ee7a1f30dbf099..eed5a948c1f907f8aac987507305bc60234c8d6c 100644 (file)
--- a/kernel/src/bbtkInterpreterJavaScript.cxx
+++ b/kernel/src/bbtkInterpreterJavaScript.cxx
@@ -77,9 +77,9 @@ namespace bbtk
   {
       int pos = boxType.find( std::string(":") );
       std::string boxTypeTmp=boxType;
-      boxTypeTmp.replace(pos,1,"_");
+      boxTypeTmp.replace(pos,1,".");
       // ex:   mCB.New( bbtkBlackBox.std_ConcatString("Box10") )
-      std::string  code("New( new bbtk."+boxTypeTmp+"('"+boxName+"') )");
+      std::string  code("       this.New( new bbtk.bb"+boxTypeTmp+"('"+boxName+"') )");
       this->javascriptBBTK.push_back(code);
   }
   //=========================================================================
@@ -93,7 +93,7 @@ namespace bbtk
       const std::string &input)                        // virtual
   {
       //ex: mCB.Connection( "Box10" , "Out", "Box11", "In")
-      std::string  code("Connection('"+boxfrom+"','"+output+"','"+boxto+"','"+input+"')");
+      std::string  code("       this.Connection('"+boxfrom+"','"+output+"','"+boxto+"','"+input+"')");
       this->javascriptBBTK.push_back(code);
   }
   //=========================================================================
@@ -101,12 +101,17 @@ namespace bbtk
   //=========================================================================
   void InterpreterJavaScript::commandInput(const std::string &name,const std::string &box,const std::string &input,const std::string  &help)
   {
+      std::string  code("       this.DECLARE_INPUT('"+name+"','"+box+"."+input+"')");
+      this->javascriptBBTK.push_back(code);
+
   }
   //=========================================================================
 
   //=========================================================================
   void InterpreterJavaScript::commandOutput(const std::string &name,const std::string &box,const std::string &output,const std::string  &help)
   {
+      std::string  code("       this.DECLARE_OUTPUT('"+name+"','"+box+"."+output+"')");
+      this->javascriptBBTK.push_back(code);
   }
   //=========================================================================
 
@@ -116,7 +121,7 @@ namespace bbtk
   void InterpreterJavaScript::commandSet(const std::string &box,const std::string &input,const std::string &value) // virtual
   {
       //ex:     mCB.Set("Box10","In2","/hola.mhd")
-      std::string  code("Set('"+box+"','"+input+"','"+value+"')");
+      std::string  code("       this.Set('"+box+"','"+input+"','"+value+"')");
       this->javascriptBBTK.push_back(code);
   }
   //=========================================================================
@@ -125,6 +130,35 @@ namespace bbtk
   //=========================================================================
   void InterpreterJavaScript::commandDefine(const std::string &name,const std::string &pack,const std::string &scriptfilename) // virtual
   {
+      //            fprintf(ff,"import * as bbtk from './bbtk.js' \n" );
+
+      
+      
+          
+      this->javascriptBBTK.push_back(" ");
+      this->javascriptBBTK.push_back("import * as bbtk from '/bbtk/bbtk.js' ");
+      this->javascriptBBTK.push_back(" ");
+//      this->javascriptBBTK.push_back("export class "+pack+"_"+name+" extends bbtk.bbkernel.ComplexBlackBox {");
+      this->javascriptBBTK.push_back("export class "+name+" extends bbtk.bbkernel.ComplexBlackBox {");
+      this->javascriptBBTK.push_back(" ");
+      this->javascriptBBTK.push_back("    constructor(nameBox) {");
+      this->javascriptBBTK.push_back("        super(nameBox)");
+      this->javascriptBBTK.push_back("        this.Init()");
+      this->javascriptBBTK.push_back("    }");
+      this->javascriptBBTK.push_back(" ");
+      this->javascriptBBTK.push_back("    async Init() {");
+/*
+      this->javascriptBBTK.push_back(" ");
+      this->javascriptBBTK.push_back("from bbtk.bbtkBlackBox import *");
+      this->javascriptBBTK.push_back(" ");
+      this->javascriptBBTK.push_back("class "+pack+"_"+name+"(ComplexBlackBox):");
+      this->javascriptBBTK.push_back(" ");
+      this->javascriptBBTK.push_back("    def __init__(self, nameBox):");
+      this->javascriptBBTK.push_back("        super().__init__(nameBox)");
+      this->javascriptBBTK.push_back("        self.Init()");
+      this->javascriptBBTK.push_back(" ");
+      this->javascriptBBTK.push_back("    def Init(self):");
+*/
   }
   //=========================================================================
 
@@ -132,6 +166,8 @@ namespace bbtk
   //=========================================================================
   void InterpreterJavaScript::commandEndDefine() // virtual
   {
+      this->javascriptBBTK.push_back("    } // Init ");
+      this->javascriptBBTK.push_back("} // class");
   }
   //=========================================================================
 
@@ -140,7 +176,7 @@ namespace bbtk
   void InterpreterJavaScript::commandExec(const std::string &word) // virtual
   {
       //Ex:     mCB.AddToExecutableLst("Box13")
-      std::string  code("AddToExecutableLst('"+word+"')");
+      std::string  code("       this.AddToExecutableLst('"+word+"')");
       this->javascriptBBTK.push_back(code);
   }
   //=========================================================================

diff --git a/kernel/src/bbtkInterpreterPython.cxx b/kernel/src/bbtkInterpreterPython.cxx
index 593b672a1cd68a12a4db83f7a9cbfacba494ef35..e47966f702ddb1b47bd749a2db731752291dcd1a 100644 (file)
--- a/kernel/src/bbtkInterpreterPython.cxx
+++ b/kernel/src/bbtkInterpreterPython.cxx
@@ -122,7 +122,6 @@ namespace bbtk
   //=========================================================================
   void InterpreterPython::commandDefine(const std::string &name,const std::string &pack,const std::string &scriptfilename) // virtual
   {
-
       this->pythonBBTK.push_back(" ");
       this->pythonBBTK.push_back("from bbtk.bbtkBlackBox import *");
       this->pythonBBTK.push_back(" ");
@@ -133,7 +132,6 @@ namespace bbtk
       this->pythonBBTK.push_back("        self.Init()");
       this->pythonBBTK.push_back(" ");
       this->pythonBBTK.push_back("    def Init(self):");
-      
   }
   //=========================================================================
 

diff --git a/packages/std/src/bbstdGetVectorElement.h b/packages/std/src/bbstdGetVectorElement.h
index 64353a68d28bca87142c2a67dff74126e6a89c44..452b43c7ea9f1eb3a1b90d11cadbb8b2e48dba77 100644 (file)
--- a/packages/std/src/bbstdGetVectorElement.h
+++ b/packages/std/src/bbstdGetVectorElement.h
@@ -63,7 +63,7 @@ namespace bbstd
   BBTK_NAME("Get"+bbtk::HumanTypeName<std::vector<T> >()+"Element");
   BBTK_AUTHOR("info-dev@creatis.insa-lyon.fr");
  // BBTK_DEFAULT_ADAPTOR();
-  BBTK_DESCRIPTION("(C++,Python) Gets the i-th element from the input vector ("+bbtk::TypeName<std::vector<T> >());
+  BBTK_DESCRIPTION("(C++,Python,JavaScript) Gets the i-th element from the input vector ("+bbtk::TypeName<std::vector<T> >());
   typedef std::vector<T> Tvector;
   BBTK_TEMPLATE_INPUT(GetVectorElement, In,"Input",Tvector);
   BBTK_TEMPLATE_INPUT(GetVectorElement, I, "iElement (default 0)",int);  

diff --git a/packages/std/src/bbstdMagicBox.h b/packages/std/src/bbstdMagicBox.h
index 20c964f72f4178e5d8d5a8013aaffc3598bded2b..05435d54949b21c216eeb4e77960978ca3247041 100644 (file)
--- a/packages/std/src/bbstdMagicBox.h
+++ b/packages/std/src/bbstdMagicBox.h
@@ -107,7 +107,7 @@ namespace bbstd
   BBTK_NAME("MagicBox");
   BBTK_AUTHOR("laurent.guigues@creatis.insa-lyon.fr");
   BBTK_CATEGORY("misc");
-  BBTK_DESCRIPTION("(C++,Python) Takes *any kind* of data and copies it to its output. Is a magic box as any box output can be plugged into it and its output can be plugged into any other box input (dynamic type checking, see below), hence it can be put between **any** two boxes. Type matching between its output and the input of the box(es) to which it is connected is made at *run-time*. The pipeline will be executed if the data types : i) match exactly ii) can be transformed by an adaptor iii) are related pointers, i.e. if the output pointer can be upcasted (static_cast) or downcasted (dynamic_cast) to an input type pointer (see the bbtk::any output connection rule in the guide for details). Important uses of the MagicBox are : 1) performing run-time pointer cast, either upward or backward an object hierarchy 2) perform data adaptation (adaptor creation) at run-time vs. pipeline creation time.");
+  BBTK_DESCRIPTION("(C++,Python,JavaScript) Takes *any kind* of data and copies it to its output. Is a magic box as any box output can be plugged into it and its output can be plugged into any other box input (dynamic type checking, see below), hence it can be put between **any** two boxes. Type matching between its output and the input of the box(es) to which it is connected is made at *run-time*. The pipeline will be executed if the data types : i) match exactly ii) can be transformed by an adaptor iii) are related pointers, i.e. if the output pointer can be upcasted (static_cast) or downcasted (dynamic_cast) to an input type pointer (see the bbtk::any output connection rule in the guide for details). Important uses of the MagicBox are : 1) performing run-time pointer cast, either upward or backward an object hierarchy 2) perform data adaptation (adaptor creation) at run-time vs. pipeline creation time.");
  
  AddInputDescriptor
   (new bbtk::AtomicBlackBoxInputDescriptor

diff --git a/packages/std/src/bbstdMultipleInputs.xml b/packages/std/src/bbstdMultipleInputs.xml
index 2d01e057559df5f8e1f194cbd1dafcd855881588..df2a9ef2affab8d6e2232dadc9ba71281899dad1 100644 (file)
--- a/packages/std/src/bbstdMultipleInputs.xml
+++ b/packages/std/src/bbstdMultipleInputs.xml
@@ -3,7 +3,7 @@
 <blackbox name="MultipleInputs">
 
   <author>laurent.guigues@creatis.insa-lyon.fr</author>
-  <description>(C++,Python) This box has multiple Void inputs and one Void output. Hence it relays any input modification to its output. It is usefull to plug different BoxChange outputs into the same BoxExecute input.</description>
+  <description>(C++,Python,JavaScript) This box has multiple Void inputs and one Void output. Hence it relays any input modification to its output. It is usefull to plug different BoxChange outputs into the same BoxExecute input.</description>
   <category>misc</category>
 
   <input name="In1"  type="bbtk::Void" description="Input 1"/>

diff --git a/packages/std/src/bbstdSplitFilePathVector.h b/packages/std/src/bbstdSplitFilePathVector.h
index 8e71238bc76e16faffb8af2b708ac6659875ed97..631d8742ffadf10f877863e23c6385b60c8194b7 100644 (file)
--- a/packages/std/src/bbstdSplitFilePathVector.h
+++ b/packages/std/src/bbstdSplitFilePathVector.h
@@ -34,7 +34,7 @@ class bbstd_EXPORT SplitFilePathVector
 BBTK_BEGIN_DESCRIBE_BLACK_BOX(SplitFilePathVector,bbtk::AtomicBlackBox);
   BBTK_NAME("SplitFilePathVector");
   BBTK_AUTHOR("Info-Dev");
-  BBTK_DESCRIPTION("No Description.");
+  BBTK_DESCRIPTION("(C++,JavaScript) No Description.");
   BBTK_CATEGORY("empty");
 
   BBTK_INPUT(SplitFilePathVector,In,"PathFileName",std::vector<std::string>,"");

diff --git a/packages/toolsbbtk/bbs/boxes/imageVtkPropertiesWidget.bbg b/packages/toolsbbtk/bbs/boxes/imageVtkPropertiesWidget.bbg
index b35d0ba05430309305edbfbb259015ae98263d5d..e64277729cb8283dc02ac7b7776404b0e7df94fa 100644 (file)
--- a/packages/toolsbbtk/bbs/boxes/imageVtkPropertiesWidget.bbg
+++ b/packages/toolsbbtk/bbs/boxes/imageVtkPropertiesWidget.bbg
@@ -5,7 +5,7 @@
 
 APP_START
 CATEGORY:<VOID>
-DESCRIPTION:(C++,Python) Description ??
+DESCRIPTION:(C++,Python,JavaScript) Description ??
 AUTHOR:Author ??
 EXPORTFORMAT:0
 COMPLEXBOX:TRUE

diff --git a/packages/toolsbbtk/bbs/boxes/imageVtkPropertiesWidget.bbs b/packages/toolsbbtk/bbs/boxes/imageVtkPropertiesWidget.bbs
index bfcf1e44053356b0065cd23986ddf6f7edd0cd79..91a09a8245b3f2a7b3bf00f4149ebc2a7b995af2 100644 (file)
--- a/packages/toolsbbtk/bbs/boxes/imageVtkPropertiesWidget.bbs
+++ b/packages/toolsbbtk/bbs/boxes/imageVtkPropertiesWidget.bbs
@@ -12,7 +12,7 @@ include std
 define ImageVtkPropertiesWidget toolsbbtk
 
 author "Author ??"
-description "(C++,Python) Description ??"
+description "(C++,Python,JavaScript) Description ??"
 
 category "<VOID>"
 

diff --git a/packages/vtk/src/bbvtkGetVectorElement.h b/packages/vtk/src/bbvtkGetVectorElement.h
index d8dd729c6bd7be6171ba0e77c88c83a0379807f8..6a766dc4a85efdc9003d536f1b9473eed3f68602 100644 (file)
--- a/packages/vtk/src/bbvtkGetVectorElement.h
+++ b/packages/vtk/src/bbvtkGetVectorElement.h
@@ -85,7 +85,7 @@ namespace bbvtk
 //   BBTK_NAME("GetVectorVtkImageDataElement");
   BBTK_AUTHOR("info-dev@creatis.insa-lyon.fr");
  // BBTK_DEFAULT_ADAPTOR();
-  BBTK_DESCRIPTION("Gets the i-th element from the input vector ("+bbtk::TypeName<std::vector<T> >());
+  BBTK_DESCRIPTION("(C++,JavaScript) Gets the i-th element from the input vector ("+bbtk::TypeName<std::vector<T> >());
   typedef std::vector<T> Tvector;
   BBTK_TEMPLATE_INPUT(GetVectorElement, In,"(default NULL) Input",Tvector);
   BBTK_TEMPLATE_INPUT(GetVectorElement, I, "iElement (default 0)",int);

diff --git a/packages/vtk/src/bbvtkImageVtkProperties.h b/packages/vtk/src/bbvtkImageVtkProperties.h
index 23d43eafd2f045cbadb772855ba7aa2f1dba235a..815beba2b8c5c838870987879230f8ccf623761a 100644 (file)
--- a/packages/vtk/src/bbvtkImageVtkProperties.h
+++ b/packages/vtk/src/bbvtkImageVtkProperties.h
@@ -68,7 +68,7 @@ class bbvtk_EXPORT ImageVtkProperties
 BBTK_BEGIN_DESCRIBE_BLACK_BOX(ImageVtkProperties,bbtk::AtomicBlackBox);
  BBTK_NAME("ImageVtkProperties");
  BBTK_AUTHOR("Info-Dev Creatis");
- BBTK_DESCRIPTION("(C++,Python) Image information Dim, Spc, Type, MinMax");
+ BBTK_DESCRIPTION("(C++,Python,JavaScript) Image information Dim, Spc, Type, MinMax");
  BBTK_CATEGORY("filter");
  BBTK_INPUT(ImageVtkProperties,In,"Input image (vtk)",vtkImageData*,"");
  BBTK_OUTPUT(ImageVtkProperties,Origin,"Origin", std::vector<double>  ,"");

diff --git a/packages/vtk/src/bbvtkMarchingCubes.cxx b/packages/vtk/src/bbvtkMarchingCubes.cxx
index c82ca61b7d19ca42edbf29bcc7ff15889080ba6e..3e4c117cbfb190889f59635676da928301a39735 100644 (file)
--- a/packages/vtk/src/bbvtkMarchingCubes.cxx
+++ b/packages/vtk/src/bbvtkMarchingCubes.cxx
@@ -46,11 +46,9 @@
 
 namespace bbvtk
 {
-
    BBTK_ADD_BLACK_BOX_TO_PACKAGE(vtk,MarchingCubes)
    BBTK_BLACK_BOX_IMPLEMENTATION(MarchingCubes,bbtk::AtomicBlackBox);
 
-
        void MarchingCubes::Process()
        {
             if (bbGetInputActive()==true)
@@ -71,29 +69,25 @@ namespace bbvtk
                 bbGetVtkObject()->Update();
             } // Active
        }
-       
        //-----------------------------------------------------------------     
        void MarchingCubes::bbUserSetDefaultValues()
        {
-                BBTK_VTK_SET_DEFAULT_VALUES();
+        BBTK_VTK_SET_DEFAULT_VALUES();
                bbSetInputActive(true);
                bbSetInputValue(400);
                bbSetInputComputeNormalsOn(true);
                bbSetInputComputeScalarsOn(true);
        }
-       
-       //-----------------------------------------------------------------     
+       //-----------------------------------------------------------------
        void MarchingCubes::bbUserInitializeProcessing()
        {
                BBTK_VTK_INITIALIZE_PROCESSING();
        }
-       
        //-----------------------------------------------------------------     
        void MarchingCubes::bbUserFinalizeProcessing()
        {
                BBTK_VTK_FINALIZE_PROCESSING();
        }       
-       
 } // EO namespace bbvtk
 #endif //_USE_VTK_
 

diff --git a/packages/wx/src/bbwxLayoutLine.h b/packages/wx/src/bbwxLayoutLine.h
index e4889b440f98a221c669547aa5dd13ef391ec274..1992f32eab0f73cfc4e5e8c1c4a8a2ede65c510c 100644 (file)
--- a/packages/wx/src/bbwxLayoutLine.h
+++ b/packages/wx/src/bbwxLayoutLine.h
@@ -100,7 +100,7 @@ namespace bbwx
   BBTK_BEGIN_DESCRIBE_BLACK_BOX(LayoutLine,bbtk::WxBlackBox);
   BBTK_NAME("LayoutLine");
   BBTK_AUTHOR("eduardo.davila@creatis.insa-lyon.fr");
-  BBTK_DESCRIPTION("(C++,Python) LayoutLine widget (wxBoxSizer)");
+  BBTK_DESCRIPTION("(C++,Python,JavaScript) LayoutLine widget (wxBoxSizer)");
   // Already inserted for any WxBlackBox  BBTK_CATEGORY("widget");  
   BBTK_INPUT(LayoutLine,Widget1,"widget 1",wxWindow*,"");
   BBTK_INPUT(LayoutLine,Widget2,"widget 2",wxWindow*,"");

diff --git a/packages/wx/src/bbwxOutputText.xml b/packages/wx/src/bbwxOutputText.xml
index 97c47049702bccf07b2d90b6b49cdb74c6a3b0ba..5b6b0167ace2d17b9dd42d8914d5ee70a990dd0f 100644 (file)
--- a/packages/wx/src/bbwxOutputText.xml
+++ b/packages/wx/src/bbwxOutputText.xml
@@ -3,7 +3,7 @@
 <blackbox name="OutputText" widget>
 
   <author>laurent.guigues at creatis.insa-lyon.fr</author>
-  <description>(C++,Python) Text zone to be inserted into a window (wxStaticText)</description>
+  <description>(C++,Python,JavaScript) Text zone to be inserted into a window (wxStaticText)</description>
   <category></category>
 
   <input name="Title" type="std::string" description="Title prepended to the text"/>

diff --git a/packages/wx/src/bbwxSlider.h b/packages/wx/src/bbwxSlider.h
index d5cc04df31489d4c60f88e8c54184a7e53ab8d97..37d5c2b3893b393849fdf8a73edb13e65f61d25c 100644 (file)
--- a/packages/wx/src/bbwxSlider.h
+++ b/packages/wx/src/bbwxSlider.h
@@ -99,7 +99,7 @@ namespace bbwx
   BBTK_NAME("Slider");
   BBTK_AUTHOR("eduardo.davila@creatis.insa-lyon.fr");
   // Already inserted for any WxBlackBox  BBTK_CATEGORY("widget");
-  BBTK_DESCRIPTION("(C++,Python) Slider widget (wxSlider)");
+  BBTK_DESCRIPTION("(C++,Python,JavaScript) Slider widget (wxSlider)");
   BBTK_INPUT(Slider,In,               "Initial position of the slider (default 0)",                          int,         "");
   BBTK_INPUT(Slider,Min,              "Minimum value of the slider (default 0)",                             int,         "");
   BBTK_INPUT(Slider,Max,              "Maximum value of the slider (default 500)",                           int,         "");