From 5d1ed845326cc292279254b1e8667cdf3c4311fc Mon Sep 17 00:00:00 2001
From: Felipe Gonzalez <gonzalez@ei-ed-345.creatis.insa-lyon.fr>
Date: Wed, 8 Jul 2015 14:51:33 +0200
Subject: [PATCH] #2498 BBTK Feature New Norma lwt-version kernel

---
 kernel/src/bbtkWtBlackBox.cxx | 44 +++++++++++++++++++++++++++++------
 kernel/src/bbtkWtBlackBox.h   | 22 ++++++++++++++++--
 2 files changed, 57 insertions(+), 9 deletions(-)

diff --git a/kernel/src/bbtkWtBlackBox.cxx b/kernel/src/bbtkWtBlackBox.cxx
index d94fa51..be52409 100644
--- a/kernel/src/bbtkWtBlackBox.cxx
+++ b/kernel/src/bbtkWtBlackBox.cxx
@@ -72,6 +72,14 @@ namespace bbtk
   //=========================================================================
 
 	// For the very first contruction of the application
+/*	struct wtServerData
+	{
+	  std::string docRoot;
+	  std::string port;
+	  std::string address;
+	
+	};
+	*/
 	struct wtData
 	{
 		Wt::WContainerWidget *parent;
@@ -86,7 +94,7 @@ namespace bbtk
 */
 //	static bbtk::jScript* js  = new bbtk::jScript();
 	static wtData myWtData;
-	static bool loadedJS;
+//	static wtServerData loadedJS;
 	//static std::string* jss;
 	
 	
@@ -140,7 +148,7 @@ namespace bbtk
   this->useStyleSheet("style.css");
   
 
-		std::cout<<"Cargado------------           "<<loadedJS<<std::endl;
+	//	std::cout<<"Cargado------------           "<<loadedJS<<std::endl;
 
 		mBox = myWtData.b;
 		if(!myWtData.parent)
@@ -250,7 +258,7 @@ namespace bbtk
     Layout();
   }
   //==================================================================
-  //==================================================================
+  //===========================organise=======================================
   WxDialog::~WxDialog() 
     { 
       bbtkDebugMessage("widget",9,"WxDialog::~WxDialog()"<<std::endl);
@@ -280,7 +288,13 @@ namespace bbtk
   //=========================================================================
   BBTK_BLACK_BOX_IMPLEMENTATION(WtBlackBox,WidgetBlackBox<Wt::WContainerWidget>);
 	
+	//std::string WtBlackBox::wtServerData::docRoot = "/home/gonzalez/Documents/pruebaResources";
+	//std::string WtBlackBox::wtServerData::docRoot = "/usr/local/share/wtResources";
+  //std::string WtBlackBox::wtServerData::port    = "8081";
 
+	std::string WtBlackBox::wtServerData::docRoot = "<void>";
+	std::string WtBlackBox::wtServerData::port    = "<void>";
+  std::string WtBlackBox::wtServerData::address = "0.0.0.0";
 	
   //=========================================================================
   //=========================================================================
@@ -288,6 +302,11 @@ namespace bbtk
   {
     bbtkBlackBoxDebugMessage("widget",5,"WtBlackBox::bbUserSetDefaultValues()"<<std::endl);
     bbmWindow = 0;
+  /*  WtBlackBox::serData.docRoot = "/home/gonzalez/Documents/pruebaResources";
+    WtBlackBox::serData.address = "0.0.0.0";
+    WtBlackBox::serData.port    = "8080";*/
+    
+
   }
   //=========================================================================
 
@@ -332,13 +351,24 @@ namespace bbtk
 
 		//Setting necessary data for Wt server deployment
 		myWtData.parent = WWt::GetTopWindow();
-		myWtData.b = GetThisPointer<WtBlackBox>();
-		myWtData.title = std2wt( bbGetInputWinTitle()  
+		myWtData.b      = GetThisPointer<WtBlackBox>();
+		myWtData.title  = std2wt( bbGetInputWinTitle()  
 			     + " - bbtk (c) CREATIS");
 
-		std::cout<<"Creating Container WT -- Definition of server parameters by default  -DELETE THIS MESSAGE bbtkWTBlackBox.cxx"<<std::endl;
-		char  *argv[7] =  {"./WtTest","--docroot","/home/gonzalez/Documents/pruebaResources","--http-address","0.0.0.0","--http-port","8080"};
+
+
+    
+
+		
+		//char  *argv[7] =  {"./WtTest","--docroot","/home/gonzalez/Documents/pruebaResources","--http-address","0.0.0.0","--http-port","8080"};
+		//int argc = 7;
+		
+		
+			char  *argv[7] =  {"./WtTest","--docroot",(char*)WtBlackBox::wtServerData::docRoot.c_str(),"--http-address",(char*)WtBlackBox::wtServerData::address.c_str(),"--http-port",(char*)WtBlackBox::wtServerData::port.c_str()};
 		int argc = 7;
+		
+		std::cout<<" ---  PUERTO  :"<<WtBlackBox::wtServerData::port<<std::endl;
+		
 	/*	if(Wt::WServer::instance()->isRunning())
 		{
 			std::cout<<"Checking the existence of a Server deployed  -DELETE THIS MESSAGE bbtkWTBlackBox.cxx"<<std::endl;
diff --git a/kernel/src/bbtkWtBlackBox.h b/kernel/src/bbtkWtBlackBox.h
index 310a854..844d9d4 100644
--- a/kernel/src/bbtkWtBlackBox.h
+++ b/kernel/src/bbtkWtBlackBox.h
@@ -73,6 +73,12 @@ namespace bbtk
 //EED 10/06/2009 /*BBTK_EXPORT*/
   class BBTK_EXPORT WtBlackBox : public bbtk::WidgetBlackBox<Wt::WContainerWidget>
   { 
+  
+ 
+
+  
+  
+  
   public:
     BBTK_BLACK_BOX_INTERFACE(WtBlackBox,bbtk::WidgetBlackBox<Wt::WContainerWidget>);
     
@@ -80,6 +86,18 @@ namespace bbtk
     //  protected:
     
   public:
+  
+     struct wtServerData
+	   {
+	      /*std::string docRoot;
+	      std::string port;
+	      std::string address;
+	    */
+	      static std::string docRoot  ;
+	      static std::string port     ;
+	      static std::string address  ;
+	    };
+  
   /*	static std::string* jScript;
     static void changeJScript(std::string newJScript){jScript=newJScript;};
     static std::string getJScript(){return jScript;};*/
@@ -94,8 +112,8 @@ namespace bbtk
     /// ** Must be defined ** in toolkit specific descendants 
     virtual void bbCreateFrameWindow();
     //==================================================================    
-
-     
+    //staticwtServerData serData;
+   // static void setServerInformation(std::string nDocRoot, std::string nPort, std::string nAddress);
     //==================================================================    
     Wt::WContainerWidget* bbGetWindow() { return bbmWindow; }
     void bbSetWindow(Wt::WContainerWidget*) ;
-- 
2.44.0