#3483 adaptor from string to long and long to string

diff --git a/packages/std/src/bbstdGetVectorPointer.h b/packages/std/src/bbstdGetVectorPointer.h
index 931dc6675092a7598704a026a5f5b06dca8b5e42..7a6b60732cfb37b1a87737280dd6d373b92e8623 100644 (file)
--- a/packages/std/src/bbstdGetVectorPointer.h
+++ b/packages/std/src/bbstdGetVectorPointer.h
@@ -50,9 +50,12 @@ namespace bbstd
     BBTK_TEMPLATE_BLACK_BOX_INTERFACE(GetVectorPointer,bbtk::AtomicBlackBox,T);
     BBTK_DECLARE_INPUT(In,std::vector<T>);
     BBTK_DECLARE_OUTPUT(PVec,std::vector<T>*);
+    BBTK_DECLARE_OUTPUT(Vec,std::vector<T>);
     BBTK_PROCESS(DoIt);
     void DoIt();
        std::vector<T> vec;
+      
+      bool firsttime;
   };
   //=================================================================
 
@@ -69,6 +72,7 @@ namespace bbstd
 //  BBTK_TEMPLATE_INPUT(GetVectorPointer, ErrorValue, "ErrorValue",T);
 //  BBTK_TEMPLATE_OUTPUT(GetVectorPointer,Out,"Output",T);
   BBTK_TEMPLATE_OUTPUT(GetVectorPointer,PVec,"Output Pointer Vector",std::vector<T>*);
+BBTK_TEMPLATE_OUTPUT(GetVectorPointer,Vec,"Output Vector",std::vector<T>);
   BBTK_END_DESCRIBE_TEMPLATE_BLACK_BOX(GetVectorPointer);
   //=================================================================
 
@@ -76,8 +80,10 @@ namespace bbstd
   template <class T>
   void GetVectorPointer<T>::DoIt()
   {
-         vec = bbGetInputIn();
+      if (firsttime==true)       vec = bbGetInputIn();
+      firsttime=false;
          bbSetOutputPVec( &vec );
+      bbSetOutputVec( vec );
   }
   //=================================================================
 
@@ -85,7 +91,7 @@ namespace bbstd
   template <class T>
   void GetVectorPointer<T>::bbUserSetDefaultValues()
   {
-
+      firsttime=true;
   }
   //=================================================================
   //=================================================================  

diff --git a/packages/std/src/bbstdSharedMemory.cxx b/packages/std/src/bbstdSharedMemory.cxx
index 5dfd30a6a03ee5c167766c123cd576990320da54..ea3383e80f65d04e078790dae5171cca4ea8927b 100644 (file)
--- a/packages/std/src/bbstdSharedMemory.cxx
+++ b/packages/std/src/bbstdSharedMemory.cxx
@@ -60,7 +60,8 @@ namespace bbstd
            // Get the name of the input which changed
            std::string input_name = c->GetConnection()->GetBlackBoxToInput();
            // Set the output to the value of the input which changed
-           bbSetOutputOut( bbGetInput(input_name) );   
+           bbSetOutputOut( bbGetInput(input_name) );
+          printf("EED SharedMemory::bbSetStatusAndPropagate input_name:%s \n",input_name.c_str() );
          }
        // No more change allowed
        mCanSet = false;
@@ -86,8 +87,8 @@ namespace bbstd
        {
                firsttime = false;
            bbSetOutputOut( bbGetInputIn() );   
-       }
-  }
+       } // if firsttime
+}
 
   BBTK_ADD_BLACK_BOX_TO_PACKAGE(std,SharedMemory);
   BBTK_BLACK_BOX_IMPLEMENTATION(SharedMemory,bbtk::AtomicBlackBox);

diff --git a/packages/std/src/bbstdStringTo.cxx b/packages/std/src/bbstdStringTo.cxx
index 052b6b3bb3f79a0ef7f2483ed7f6c786937feae2..09de441616111e90457c5d55a1d67f89a2368dce 100644 (file)
--- a/packages/std/src/bbstdStringTo.cxx
+++ b/packages/std/src/bbstdStringTo.cxx
@@ -113,7 +113,12 @@ namespace bbstd
   {
     bbSetOutputOut( atof ( bbGetInputIn().c_str() ) );
   }
-  
+
+  template <> void StringTo<long> ::DoIt()
+  {
+    bbSetOutputOut( (long)atoi ( bbGetInputIn().c_str() ) );
+  }
+
   //====================================================================
   
   //====================================================================
@@ -128,6 +133,7 @@ namespace bbstd
   BBTK_ADD_TEMPLATE_BLACK_BOX_TO_PACKAGE(std,StringTo,uint32_t);
   BBTK_ADD_TEMPLATE_BLACK_BOX_TO_PACKAGE(std,StringTo,float);
   BBTK_ADD_TEMPLATE_BLACK_BOX_TO_PACKAGE(std,StringTo,double);
+  BBTK_ADD_TEMPLATE_BLACK_BOX_TO_PACKAGE(std,StringTo,long);
   BBTK_ADD_TEMPLATE_BLACK_BOX_TO_PACKAGE(std,StringTo,Void);
   //====================================================================
   

diff --git a/packages/std/src/bbstdToString.cxx b/packages/std/src/bbstdToString.cxx
index ee386efcd2a97f76a844783a412ab8c6a480f27c..5b2f13ffbb6ba8d98a343250a789685bfc970f00 100644 (file)
--- a/packages/std/src/bbstdToString.cxx
+++ b/packages/std/src/bbstdToString.cxx
@@ -67,6 +67,7 @@ namespace bbstd
   BBTK_ADD_TEMPLATE_BLACK_BOX_TO_PACKAGE(std,ToString,uint32_t);
   BBTK_ADD_TEMPLATE_BLACK_BOX_TO_PACKAGE(std,ToString,float);
   BBTK_ADD_TEMPLATE_BLACK_BOX_TO_PACKAGE(std,ToString,double);
+  BBTK_ADD_TEMPLATE_BLACK_BOX_TO_PACKAGE(std,ToString,long);
   //====================================================================
   
 

diff --git a/packages/wx/src/bbwxComboBox.cxx b/packages/wx/src/bbwxComboBox.cxx
index fe33889c4566fd674672e0e2d6522f308b550337..d081d32affe7010c778dd36bc96602e1188304e1 100644 (file)
--- a/packages/wx/src/bbwxComboBox.cxx
+++ b/packages/wx/src/bbwxComboBox.cxx
@@ -4,7 +4,6 @@
 #include "bbwxComboBox.h"
 #include "bbwxPackage.h"
 
-
 #include <vector>
 #include <string>
 
@@ -58,8 +57,7 @@ namespace bbwx
                        int typeForm,
                        int sizeX, 
                        int sizeY
-               )
-    :
+               ) :
     wxPanel( parent, -1,wxDefaultPosition ) ,
     mBox(box),
     mTypeForm(typeForm)

diff --git a/packages/wx/src/bbwxSlider.cxx b/packages/wx/src/bbwxSlider.cxx
index 0db2b07fbcd3c436a0872a7a56efa418840d34fb..eae91e794ff77795a26638d626b99b3e201452b5 100644 (file)
--- a/packages/wx/src/bbwxSlider.cxx
+++ b/packages/wx/src/bbwxSlider.cxx
@@ -151,6 +151,10 @@ namespace bbwx
        wxorientation   = wxSL_VERTICAL;
       }
     
+      
+    wxSize  sizeSliderWidget(25,25);
+//  int  widthSliderWidget = wxDefaultSize;
+      
     //---------------------------------------------------------------------
     // 1) Creation of the components of the widget
     // Any top level sub-widget must have the panel returned by panel
@@ -158,7 +162,7 @@ namespace bbwx
     mwxSlider = new wxSlider( panel, 
                              -1, 0 , 0, 500 , 
                              wxDefaultPosition, 
-                             wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator);
+                  sizeSliderWidget, wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator);
 
 
     //    mwxSlider->SetInitialSize(wxSize(sizeX,sizeY));