DFCH: bbtkSystemTools class has been created and implemented

[bbtk.git] / kernel / src / bbtkWxGUIScriptingInterface.cxx

diff --git a/kernel/src/bbtkWxGUIScriptingInterface.cxx b/kernel/src/bbtkWxGUIScriptingInterface.cxx
index 327d79eb56f2c98d966b2f9a461104fd25be23d2..4c4854574e473fc8a168724975f6bb4f5ad729b4 100644 (file)
--- a/kernel/src/bbtkWxGUIScriptingInterface.cxx
+++ b/kernel/src/bbtkWxGUIScriptingInterface.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxGUIScriptingInterface.cxx,v $
   Language:  C++
-  Date:      $Date: 2010/01/14 13:17:27 $
-  Version:   $Revision: 1.41 $
+  Date:      $Date: 2011/03/21 11:18:00 $
+  Version:   $Revision: 1.45 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -110,13 +110,13 @@ namespace bbtk
     menuAbout->Append( ID_Menu_About, _T("&About...") );
 
     wxMenu *menuTools = new wxMenu;
-    menuTools->Append( ID_Menu_CreatePackage, _T("Create &package") );
+    menuTools->Append( ID_Menu_CreatePackage,  _T("Create &package") );
     menuTools->Append( ID_Menu_CreateBlackBox, _T("Create &black box") );
-    menuTools->Append( ID_Menu_PlugPackage, _T("&Plug package") );
+    menuTools->Append( ID_Menu_PlugPackage,    _T("&Plug package") );
     menuTools->AppendSeparator();
     menuTools->Append( ID_Menu_RegeneratePackageDoc,_T("Regenerate package &doc") );
     menuTools->Append( ID_Menu_RegenerateBoxesLists,_T("Regenerate boxes &lists") );
-    menuTools->Append( ID_Menu_RegenerateAll,_T("Regenerate &all") );
+    menuTools->Append( ID_Menu_RegenerateAll,       _T("Regenerate &all") );
     menuTools->AppendSeparator();
     menuTools->Append( ID_Menu_ShowImageGraph, _T("&Show last graph") );
 
@@ -281,8 +281,7 @@ namespace bbtk
                           style,
                           1000, 0, -1, wxDefaultPosition, wxDefaultSize,
                           wxSIMPLE_BORDER|wxSTAY_ON_TOP);
-       
-    
+
     if (ConfigurationFile::GetInstance().DotBbtkIsNew())
       {
 
@@ -441,7 +440,12 @@ namespace bbtk
          std::string filename = dir + separator + "tmp_bbtk.bbs";
          mWxGUITextEditor->GetCurrentPage()->SaveFile(filename);
        
-               std::string command = "\"";
+       std::string command = "\"";
+
+#ifdef WIN32
+       command += "\"";
+#endif
+
          command += ConfigurationFile::GetInstance().Get_bin_path();
 #ifdef MACOSX
          command += separator + "bbi.app/Contents/MacOS/bbi\" ";
@@ -449,6 +453,11 @@ namespace bbtk
          command += separator + "bbi\" ";
 #endif
          command += "\""+filename + "\"";
+
+#ifdef WIN32
+       command += "\"";
+#endif
+
          command += " & ";
          
          printf ("EED WxGUIScriptingInterface::WxGUITextEditorRunBBI %s \n" , command.c_str() );
@@ -496,7 +505,7 @@ namespace bbtk
   {
     m_mgr.Update();
     Refresh();
-    wxMessageBox(_T("  bbStudio\nThe Black Box Toolkit Development Studio\n(c) CREATIS-LRMN 2008\n\n http://www.creatis.insa-lyon.fr/creatools"),
+    wxMessageBox(_T("  bbStudio\nThe Black Box Toolkit Development Studio\n(c) CREATIS-LRMN 2008\n\n http://www.creatis.insa-lyon.fr/site/en/CreaTools_home"),
                  _T("About ..."), wxOK | wxICON_INFORMATION,
                  this);
   }
@@ -563,7 +572,6 @@ namespace bbtk
     command = "include toolsbbtk/appli/GUICreatePackage";
     bbtkMessage("Debug",1,"Executing : '"<<command<<"'"<<std::endl);
        mWxGUICommand->SendCommand(command);
-
   }
   //================================================================
 
@@ -596,8 +604,7 @@ namespace bbtk
       doc_path += bbtk::ConfigurationFile::GetInstance().Get_file_separator();
          
          std::string pack_name("User");
-         std::string pack_path = doc_path + pack_name;
-         
+         std::string pack_path = doc_path + pack_name;   
          
 #if defined(WIN32)
     std::string strappli="start ";
@@ -607,8 +614,7 @@ namespace bbtk
   #else
       std::string strappli="gnome-open ";        
   #endif
-#endif
-         
+#endif   
          std::string strcommand = strappli +pack_path+"/workspace_workspacePrototype.png";
     // std::cout << "system: " << strcommand << std::endl;
     system ( strcommand.c_str() );
@@ -659,9 +665,6 @@ namespace bbtk
        err +=  bbtk::std2wx(command) + _T("'");
        wxMessageBox(err,_T("Regenerate package doc"),wxOK | wxICON_ERROR);      
       }
-
-
-
   }
 
 
@@ -698,6 +701,7 @@ namespace bbtk
        command += " -q";
        bbtkMessage("debug",1,"Executing system command '"<<command<<"'"<<std::endl);
 
+std::cout << "==========================================================================================================" << command.c_str() << std::endl;
     if ( ! system ( command.c_str() ) )
       {
        SetStatusText( _T("Done !"));
@@ -761,13 +765,11 @@ namespace bbtk
        f >> pname;
        f.close();
        
-       
        bbtk::ConfigurationFile::GetInstance().AddPackagePathsAndWrite( path );
        
        DoRegeneratePackageDoc(pname);
        DoRegenerateBoxesLists();
-
-         }     
+      }        
   }
   //================================================================
 
@@ -803,9 +805,9 @@ namespace bbtk
   {
     size_t s = target.length();
     if ((s>3) && (target[s-1]=='s')
-               && (target[s-2]=='b')
-               && (target[s-3]=='b')
-               && (target[s-4]=='.'))
+              && (target[s-2]=='b')
+              && (target[s-3]=='b')
+              && (target[s-4]=='.'))
        {
                        mWxGUITextEditor->Open(target);
                        #if NOTEBOOK
@@ -816,9 +818,9 @@ namespace bbtk
        }
 
        if ((s>3) && (target[s-1]=='f')
-               && (target[s-2]=='d')
-               && (target[s-3]=='p')
-               && (target[s-4]=='.'))
+                 && (target[s-2]=='d')
+                 && (target[s-3]=='p')
+                 && (target[s-4]=='.'))
        {
 
                // Open pdf in linux
@@ -863,7 +865,6 @@ namespace bbtk
       }
   }
 
-
   //================================================================  
   void WxGUIScriptingInterface::OnMenuWindowsFiles(wxCommandEvent& event)
   {