X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWtBlackBox.cxx;h=be524097ae1bc18de78a24626346eb011adbdf4d;hb=5d1ed845326cc292279254b1e8667cdf3c4311fc;hp=93ef1274417e92a2d95a68159ab270e96dd84bfe;hpb=1b7876d34a9cfbb96464c860fb671ccf375e343a;p=bbtk.git

diff --git a/kernel/src/bbtkWtBlackBox.cxx b/kernel/src/bbtkWtBlackBox.cxx
index 93ef127..be52409 100644
--- a/kernel/src/bbtkWtBlackBox.cxx
+++ b/kernel/src/bbtkWtBlackBox.cxx
@@ -52,15 +52,34 @@
 //#include "bbtkData.h"
 //#include "bbtkFactory.h"
 
-static std::string jScriptLine;
+
+
 
 namespace bbtk
 {
+
+ 
+/*	
+	class jScript
+	{
+		public:
+			jScript();
+			std::string jScriptLine;
+	};
+*/
   //=========================================================================
   // wtData structure
   //=========================================================================
 
 	// For the very first contruction of the application
+/*	struct wtServerData
+	{
+	  std::string docRoot;
+	  std::string port;
+	  std::string address;
+	
+	};
+	*/
 	struct wtData
 	{
 		Wt::WContainerWidget *parent;
@@ -68,13 +87,24 @@ namespace bbtk
 		Wt::WString title;		
 	};
 
+/*	jScript::jScript()
+	{
+		jScriptLine = "";
+	}
+*/
+//	static bbtk::jScript* js  = new bbtk::jScript();
 	static wtData myWtData;
+//	static wtServerData loadedJS;
+	//static std::string* jss;
+	
+	
 
   //=========================================================================
   // javaScript Line
   //=========================================================================
 	//Contains all the JS statements needed for the bbwt.
 	
+	
   //=========================================================================
   // WxFrame
   //=========================================================================
@@ -90,14 +120,14 @@ namespace bbtk
 			const Wt::WEnvironment& env			
 	    );
     ~WtWFrame();
-
+		
 	
 	
 	WtBlackBox::WeakPointer mBox; 
-
+	
 
   };	
-
+	
 
 	WtWFrame::WtWFrame(
 			const Wt::WEnvironment& env
@@ -106,10 +136,20 @@ namespace bbtk
     Wt::WApplication(env)
   {  
 		//std::cout<<"Adding JavaScript --  DELETE ME -- bbtkWtBlackBox.cxx"<<std::endl;
-		this->require("js/xtk.js");
-		//this->require("js/demo/demo2.js");
+		//this->require("/home/gonzalez/Documents/CREATOOLS/wt_library/wt/bbtk_wt_PKG/src/js/xtk.js");
+
+		//this->require("http://get.goXTK.com/xtk.js");
 		//this->useStyleSheet("css/demo.css");
-		jScriptLine = "";
+		
+	//	this->require("http://get.goXTK.com/xtk_edge.js");
+	this->require("http://get.goXTK.com/xtk_xdat.gui.js");
+	this->require("xtk.js");
+	//this->require("xtk_xdat.gui.js");
+  this->useStyleSheet("style.css");
+  
+
+	//	std::cout<<"Cargado------------           "<<loadedJS<<std::endl;
+
 		mBox = myWtData.b;
 		if(!myWtData.parent)
 			{
@@ -126,8 +166,11 @@ namespace bbtk
 		myWtData.b->bbUserCreateWidget(myCont);
 		root()->addWidget(myWtData.parent);
 		//bbmWindow = myCont;
+		this->refresh();
+		//jss = WtBlackBox::jScript;
 		std::cout<<"Creando WebWIDGET DELETE ME ---- bbtkWtBlackBox.cxx.................80%"<<std::endl;
-		this->doJavaScript(jScriptLine); 
+		std::cout<<"Creando WebWIDGET DELETE ME SCRIPT : ---"<<bbtk::jScript<<".................80%"<<std::endl;
+		//this->doJavaScript(bbtk::jScript); 
 
 
   }
@@ -215,7 +258,7 @@ namespace bbtk
     Layout();
   }
   //==================================================================
-  //==================================================================
+  //===========================organise=======================================
   WxDialog::~WxDialog() 
     { 
       bbtkDebugMessage("widget",9,"WxDialog::~WxDialog()"<<std::endl);
@@ -244,13 +287,26 @@ 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";
+	
   //=========================================================================
   //=========================================================================
   void WtBlackBox::bbUserSetDefaultValues()
   {
     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";*/
+    
+
   }
   //=========================================================================
 
@@ -295,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;