#2536 BBTK Feature New Normal wt-version Package

diff --git a/kernel/appli/bbi/bbi.cxx b/kernel/appli/bbi/bbi.cxx
index af2b7fe15e7f67a6484f399b65520c58371a07d3..c7bb3254b5c478b7c0201b0d5c04fa7899c57b0f 100644 (file)
--- a/kernel/appli/bbi/bbi.cxx
+++ b/kernel/appli/bbi/bbi.cxx
@@ -91,7 +91,7 @@ void WxProcessCmdLine::Process(wxCmdLineParser& parser)
   debug = ( parser.Found(_T("d")) );  
   quiet = ( parser.Found(_T("q")) );
   help = ( parser.Found(_T("h")) );
-  graphical_dialog = ( parser.Found(_T("g")) );
+  graphical_dialog = ( parser.Found(_T("wxcommandlineg")) );
   text_dialog = ( parser.Found(_T("t")) );
   no_console = ( parser.Found(_T("N")) );
   
@@ -178,6 +178,9 @@ bool wxBBIApp::OnCmdLineParsed(wxCmdLineParser& parser)
 // main frame
 bool wxBBIApp::OnInit( )
 {
+//Borrame
+//FILE *ff; ff = fopen ("/tmp/wt.log","a+"); fprintf(ff,"EED wxBBIApp::OnInit\n"); fclose(ff);
+
   //      std::cout << "OnInit"<<std::endl;
   wxApp::OnInit();
 #ifdef __WXGTK__
@@ -190,6 +193,11 @@ bool wxBBIApp::OnInit( )
   if (cmd.debug) bbtk::MessageManager::SetMessageLevel("all",9);
   
 
+//Borrame
+//printf ("EED bbi wxBBIApp::OnInit .....................\n");
+cmd.input_file.push_back("/home/davila/Borrame/testwt.bbs");
+
+
   bbtk::WxGUIConsole *I = new bbtk::WxGUIConsole(0,_T("bbi"),wxSize(800,600));
   SetTopWindow(I);  
   if (cmd.console) I->Show(true);
@@ -257,6 +265,10 @@ IMPLEMENT_APP(wxBBIApp);
 //  you need to use the linker option "/subsystem:console" and the following code:
 int main(int argc, char* argv[])
 {
+
+//Borrame
+//FILE *ff; ff = fopen ("/tmp/wt.log","a+"); fprintf(ff,"EED main C\n"); fclose(ff);
+
     return WinMain(::GetModuleHandle(NULL), NULL, ::GetCommandLine(), SW_SHOWNORMAL);
 }
 
@@ -270,6 +282,10 @@ IMPLEMENT_APP_NO_MAIN(wxBBIApp);
 
 int main(int argc, char* argv[])
 {      
+
+//Borrame
+//FILE *ff; ff = fopen ("/tmp/wt.log","a+"); fprintf(ff,"EED main A\n"); fclose(ff);
+
   wxMessageOutput::Set( new wxMessageOutputBest );
 
   wxCmdLineParser parser(cmdLineDesc,argc,argv);
@@ -448,6 +464,8 @@ int main(int argc, char* argv[])
   std::cout << "BBI (Black Box Interpreter) - bbtk "
             << bbtk::GetVersion()<< " - (c) Creatis 2007"
             << std::endl;
+//Borrame
+//FILE *ff; ff = fopen ("/tmp/wt.log","a+"); fprintf(ff,"EED main B\n"); fclose(ff);
 
   bbtk::Interpreter::Pointer I = bbtk::Interpreter::New();
   if (argc==1) 

diff --git a/kernel/src/bbtkWtBlackBox.cxx b/kernel/src/bbtkWtBlackBox.cxx
index 3c7d8378ce8eb1df6977ab8038afbfcab4c0230a..a8bec6700c043ec4a18f371bc41b04be9edd83f7 100644 (file)
--- a/kernel/src/bbtkWtBlackBox.cxx
+++ b/kernel/src/bbtkWtBlackBox.cxx
@@ -143,10 +143,12 @@ namespace bbtk
                //this->useStyleSheet("css/demo.css");
                
        //      this->require("http://get.goXTK.com/xtk_edge.js");
-       this->require("http://get.goXTK.com/xtk_xdat.gui.js");
+//     this->require("http://get.goXTK.com/xtk_xdat.gui.js");
+       this->require("xtk_xdat.gui.js");
+
        //this->require("http://get.goXTK.com/xtk.js");
        this->require("xtk.js");
-       //this->require("xtk_xdat.gui.js");
+
   this->useStyleSheet("styleWT.css"); 
   
 

diff --git a/packages/vtk/src/bbvtkPolyDataWriter.xml b/packages/vtk/src/bbvtkPolyDataWriter.xml
index 71e0a5d686a118276c6723aa24ba4a2ccd2472c5..43787670b45d8cfbb570b2a61eb15979502f8b95 100644 (file)
--- a/packages/vtk/src/bbvtkPolyDataWriter.xml
+++ b/packages/vtk/src/bbvtkPolyDataWriter.xml
@@ -14,6 +14,9 @@
 <input name="In" type="vtkPolyData*" description="Input mesh" />
  
  <process><PRE>
+
+     printf("EED PolyDataWriter::Process() %s\n", bbGetInputFilename().c_str());
+
    vtkPolyDataWriter* w = vtkPolyDataWriter::New();
    bbGetInputIn()->Update();
    w->SetInput(bbGetInputIn());