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

diff --git a/kernel/src/bbtkWtBlackBox.cxx b/kernel/src/bbtkWtBlackBox.cxx
index 93ef127..70d8ff0 100644
--- a/kernel/src/bbtkWtBlackBox.cxx
+++ b/kernel/src/bbtkWtBlackBox.cxx
@@ -1,3 +1,4 @@
+
 /*
  # ---------------------------------------------------------------------
  #
@@ -52,82 +53,126 @@
 //#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;
 		WtBlackBox::Pointer b;
-		Wt::WString title;		
+		WtBlackBox *pbox;	
+		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
   //=========================================================================
 	// Application WT deployed
   //==================================================================
  
-
- 
  class WtWFrame : public Wt::WApplication
   {
   public:
-    WtWFrame(
-			const Wt::WEnvironment& env			
-	    );
-    ~WtWFrame();
-
-	
+    WtWFrame( const Wt::WEnvironment& env );
+    ~WtWFrame();	
+    WtBlackBox::WeakPointer mBox; 
+  };	
 	
-	WtBlackBox::WeakPointer mBox; 
 
+	WtWFrame::WtWFrame( const Wt::WEnvironment& env ):Wt::WApplication(env)
+  	{  
+		//std::cout<<"Adding JavaScript --  DELETE ME -- bbtkWtBlackBox.cxx"<<std::endl;
+		//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");
 
+	//this->require("http://get.goXTK.com/xtk.js");
+	this->require( "resourcesXTK/xtk.js" );
+		
+	//	this->require("http://get.goXTK.com/xtk_edge.js");
+//	this->require("http://get.goXTK.com/xtk_xdat.gui.js");
+	this->require( "resourcesXTK/xtk_xdat.gui.js" );
 
-	WtWFrame::WtWFrame(
-			const Wt::WEnvironment& env
-		   )
-    : 
-    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->useStyleSheet("css/demo.css");
-		jScriptLine = "";
+  this->useStyleSheet("resourcesXTK/styleWT.css"); 
+	//	std::cout<<"Cargado------------           "<<loadedJS<<std::endl;
 		mBox = myWtData.b;
+
+//EED -->
 		if(!myWtData.parent)
-			{
-				std::cout<<"        SIN PADRE "<<std::endl;
-				if(myWtData.parent == 0){std::cout<<"        PARENT 0 "<<std::endl;}
-				if(myWtData.parent == NULL){std::cout<<"        PARENT NULL "<<std::endl;}
-				myWtData.parent = new Wt::WContainerWidget();
-				std::cout<<"Parent created --  DELETE ME -- bbtkWtBlackBox.cxx"<<std::endl;
-			}
-
-		Wt::WContainerWidget *myCont = new Wt::WContainerWidget(myWtData.parent);
-		myCont->setMinimumSize(800,500);
-		std::cout<<"Creando WebWIDGET DELETE ME ---- bbtkWtBlackBox.cxx.................50%"<<std::endl;
-		myWtData.b->bbUserCreateWidget(myCont);
-		root()->addWidget(myWtData.parent);
+		{
+			std::cout<<"        SIN PADRE "<<std::endl;
+			if(myWtData.parent == 0){std::cout<<"        PARENT 0 "<<std::endl;}
+			if(myWtData.parent == NULL){std::cout<<"        PARENT NULL "<<std::endl;}
+			myWtData.parent = new Wt::WContainerWidget();
+			std::cout<<"Parent created --  DELETE ME -- bbtkWtBlackBox.cxx"<<std::endl;
+		}
+
+//EED2019-08-20		
+//Wt::WContainerWidget *myContainer = new Wt::WContainerWidget( myWtData.parent );
+		Wt::WContainerWidget *myContainer = new Wt::WContainerWidget(  );
+printf("EED (WT) WtWFrame  warnning 2019 A  parent ?? \n");
+
+		myContainer->setMinimumSize(800,500);
+		std::cout<<"Creando WebWIDGET DELETE ME ---- bbtkWtBlackBox.cxx.......50%"<<std::endl;
+		myWtData.b->bbUserCreateWidget(myContainer);
+
+//EED2019-08-20		
+//		root()->addWidget(myWtData.parent);
+printf("EED (WT) WtWFrame  warnning 2019 B  parent ?? \n");
+
 		//bbmWindow = myCont;
-		std::cout<<"Creando WebWIDGET DELETE ME ---- bbtkWtBlackBox.cxx.................80%"<<std::endl;
-		this->doJavaScript(jScriptLine); 
+		this->refresh();
+		//jss = WtBlackBox::jScript;
+		std::cout<<"Creando WebWIDGET DELETE ME ---- bbtkWtBlackBox.cxx........80%"<<std::endl;
+		std::cout<<"Creando WebWIDGET DELETE ME SCRIPT : ---"<<bbtk::jScript<<"......80%"<<std::endl;
+		//this->doJavaScript(bbtk::jScript); 
+
+//EED
+       myWtData.pbox->bbwtUpdateInputs();
+//       myWtData.pbox->bbwtProcess();
 
 
   }
@@ -147,11 +192,16 @@ namespace bbtk
     }
 
 
- 
-   
-	Wt::WApplication *createApplication(const Wt::WEnvironment& env)
+//EED2019-08-20 
+//	Wt::WApplication *createApplication(const Wt::WEnvironment& env)
+   std::unique_ptr<Wt::WApplication> createApplication(const Wt::WEnvironment& env)
+
 	{
-			return new WtWFrame(env);			
+printf("EED (WT) createApplication  warnning 2019 \n");
+//EED2019-08-20 
+//			return new WtWFrame(env);			
+			return std::make_unique<WtWFrame>(env);
+
 	}
 
 
@@ -215,7 +265,7 @@ namespace bbtk
     Layout();
   }
   //==================================================================
-  //==================================================================
+  //===========================organise=======================================
   WxDialog::~WxDialog() 
     { 
       bbtkDebugMessage("widget",9,"WxDialog::~WxDialog()"<<std::endl);
@@ -244,6 +294,16 @@ 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";
+  	int WtBlackBox::wtServerData::argc 				= 0;
+  	char **WtBlackBox::wtServerData::argv 			= NULL;
 
   //=========================================================================
   //=========================================================================
@@ -257,9 +317,8 @@ namespace bbtk
   //=========================================================================
   void WtBlackBox::bbUserInitializeProcessing()
   {
-
   }
-  //================================================================http://intranet-if.insa-lyon.fr/temps/5IF39.html==    
+  //==================================================================    
 
   //=========================================================================
   void WtBlackBox::bbUserFinalizeProcessing()
@@ -275,7 +334,7 @@ namespace bbtk
   void WtBlackBox::bbCreateDialogWindow()
   {
 	  bbtkBlackBoxDebugMessage("widget",3,
-		     "==> WtBlackBox::bbCreateDialogWindow() - No Dialog must be created, it is a web app"
+			 "==> WtBlackBox::bbCreateDialogWindow() - No Dialog must be created, it is a web app"
 		     <<std::endl);
 
   } 
@@ -287,30 +346,47 @@ namespace bbtk
   /// Callback for creating a Frame window 
 	void WtBlackBox::bbCreateFrameWindow()
 	{
-
 		bbtkBlackBoxDebugMessage("widget",3,
 			"==> WtBlackBox::bbCreateFrameWindow() - parent = "
 			<<WWt::GetTopWindow()
 			<<std::endl);
-
 		//Setting necessary data for Wt server deployment
 		myWtData.parent = WWt::GetTopWindow();
-		myWtData.b = GetThisPointer<WtBlackBox>();
-		myWtData.title = std2wt( bbGetInputWinTitle()  
-			     + " - bbtk (c) CREATIS");
+		myWtData.b      = GetThisPointer<WtBlackBox>();
+		myWtData.title  = std2wt( bbGetInputWinTitle() + " - bbtk (c) CREATIS");
+		myWtData.pbox	= this;
+		
+		//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 = 3;
+		std::cout<<" ---  PUERTO  :"<<WtBlackBox::wtServerData::port<<std::endl;
+*/
+
+/*		
+char  *argv[2] =  {"./bbiWeb.wt","client"};
+int argc=2;
+*/
 
-		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"};
-		int argc = 7;
 	/*	if(Wt::WServer::instance()->isRunning())
 		{
 			std::cout<<"Checking the existence of a Server deployed  -DELETE THIS MESSAGE bbtkWTBlackBox.cxx"<<std::endl;
 			Wt::WServer::instance()->stop();
 		}
 	*/
-		std::cout<<"Deploying Server -- Definition of server parameters by default  -DELETE THIS MESSAGE bbtkWTBlackBox.cxx"<<std::endl;
-		Wt::WRun(argc,argv,&createApplication);	
-	}
+
+		std::cout<<"EED WtBlackBox::bbCreateFrameWindow  Deploying Server -- Definition of server parameters by default  -DELETE THIS MESSAGE bbtkWTBlackBox.cxx"<<std::endl;
+
+//		Wt::WRun(argc,argv,&createApplication);	
+
+		Wt::WRun(WtBlackBox::wtServerData::argc,WtBlackBox::wtServerData::argv, &createApplication);
+   }
 
   //==================================================================    
 
@@ -319,9 +395,9 @@ namespace bbtk
   {
     bbtkBlackBoxDebugMessage("widget",9,"==> WtBlackBox::bbSetWindow("<<w<<")"<<std::endl);
     if ((bbmWindow != 0)&&(w!=0)) 
-      { 
-	std::cout << "ERRRRRRRROOOOR"<<std::endl; 
-      }
+    { 
+		std::cout << "ERRRRRRRROOOOR"<<std::endl; 
+    }
     bbmWindow = w;
   }
 
@@ -333,21 +409,22 @@ namespace bbtk
   void WtBlackBox::bbShowWindow()
   {
     if ((bbmWindow) && (!bbIsShown()))
-      {
-	bbtkBlackBoxDebugMessage("widget",3,"==> WtBlackBox::bbShowWindow()"
-			 <<std::endl);
- 	if (bbGetInputWinDialog()) 
-	  {
-	  //  ((WxDialog*)bbmWindow)->ShowModal();
-	  }
-	else
-	  {
-		// There is not such a thing like show becouse it is a webapp
-	   // bbGetWindow()->Show();
-	  //  WWt::CreateWtAppIfNeeded();
-	    bbSetShown(true);
-	  } 
-      }
+    {
+		bbtkBlackBoxDebugMessage("widget",3,"==> WtBlackBox::bbShowWindow()"
+				 <<std::endl);
+	 	if (bbGetInputWinDialog()) 
+		{
+		  //  ((WxDialog*)bbmWindow)->ShowModal();
+		} else {
+			// There is not such a thing like show becouse it is a webapp
+		   // bbGetWindow()->Show();
+		  //  WWt::CreateWtAppIfNeeded();
+			Wt::WRun(WtBlackBox::wtServerData::argc,
+		                     WtBlackBox::wtServerData::argv,
+		                     &createApplication);	
+			bbSetShown(true);
+		}  // if Dialog
+    } // if Window Show
   }
   //==================================================================    
 
@@ -356,20 +433,33 @@ namespace bbtk
   {
     bbtkBlackBoxDebugMessage("widget",3,"==> WtBlackBox::bbDestroyWindow("<<bbmWindow<<")"<<std::endl);
     if (bbGetWindow()!=NULL) 
-      {
-	//       wxWindow* w = bbGetWindow();
-	//bbSetWindow(0);
-	// WE SHOULD DESTROY THE WINDOW WITH THE Close METHOD
-	// HOWEVER I
-	//w->Close(true);
-	//
-	delete bbGetWindow();
-	bbSetShown(false);
-      }
+    {
+		//       wxWindow* w = bbGetWindow();
+		//bbSetWindow(0);
+		// WE SHOULD DESTROY THE WINDOW WITH THE Close METHOD
+		// HOWEVER I
+		//w->Close(true);
+		//
+		delete bbGetWindow();
+		bbSetShown(false);
+    }
     bbtkBlackBoxDebugMessage("widget",3,"<== WtBlackBox::bbDestroyWindow("<<bbmWindow<<")"<<std::endl);
-
   }
-  //==================================================================    
+
+
+//==================================================================    
+	void WtBlackBox::bbwtUpdateInputs()
+	{
+		BlackBox::bbUpdateInputs();
+	}
+
+//==================================================================    
+	void WtBlackBox::bbwtProcess()
+	{
+		BlackBox::bbProcess();
+	}
+
+
 
 }//namespace bbtk