]> Creatis software - bbtk.git/commitdiff
*** empty log message ***
authorEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Tue, 8 Dec 2009 14:10:29 +0000 (14:10 +0000)
committerEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Tue, 8 Dec 2009 14:10:29 +0000 (14:10 +0000)
12 files changed:
kernel/cmake/BBTKBuildHtmlDocFromLatex.cmake
kernel/cmake/BBTKDefineOptions.cmake
kernel/doc/bbtkDevelopersGuide/CMakeLists.txt
kernel/doc/bbtkPackageDevelopersGuide/CMakeLists.txt
kernel/doc/bbtkUsersGuide/CMakeLists.txt
kernel/doc/help_contents.html.in
kernel/install/CMakeLists.txt
kernel/src/bbtkBlackBoxDescriptor.cxx
kernel/src/bbtkComplexBlackBoxDescriptor.cxx
kernel/src/bbtkConfigurationFile.cxx
kernel/src/bbtkWxGUIScriptingInterface.cxx
packages/itk/src/bbitkDICOMSeriesFileNames.xml

index d96acb15bea15d77e5ea5e1491dcc68dcbbf0d25..59738d4048eddbda5bbcd33ddf244f7f0d6c24a7 100644 (file)
@@ -1,6 +1,11 @@
 
 
 MACRO(BBTK_BUILD_HTML_DOC_FROM_LATEX TEX_FILE OUTPUT_REL_PATH)
+  
+  #EED 11/11/2009
+  BBTK_DOC_INSTALL_IMAGES(${OUTPUT_REL_PATH})
+  
+  
   # Need tth
   SET(USE_TTH ON CACHE BOOL "" FORCE)
   # Construct absolute build path
index e9c27e4cf3d19921e2f561edb021d353b40641d7..3f78e97fe2257fd115365ab383be8a0f551fec1f 100644 (file)
@@ -21,7 +21,7 @@ IF(BUILD_BBTK_DOC)
   OPTION(BUILD_BBTK_DOC_GUIDES_PDF 
     "Build bbtk Guides', PDF format (latex)."            ON)
   OPTION(BUILD_BBTK_DOC_GUIDES_HTML 
-    "Build bbtk Guides', HTML format (latex+tth)."       ON)
+    "Build bbtk Guides', HTML format (latex+tth)."       OFF)
 
 ELSE(BUILD_BBTK_DOC)
   
index 0e03ff7e2c01673ada427bc3d435cf8e039ee12d..32cbb4f962786bc02836a0aab4b8c57fc375985c 100755 (executable)
@@ -1,7 +1,7 @@
 MESSAGE(STATUS "")
 MESSAGE(STATUS "=======================================")
 MESSAGE(STATUS "Configuring bbtk Developers' Guide build ")
-BBTK_DOC_INSTALL_IMAGES(bbtkDevelopersGuide)
+#EED 11/11/2009  BBTK_DOC_INSTALL_IMAGES(bbtkDevelopersGuide)
 BBTK_BUILD_LATEX_DOC(bbtkDevelopersGuide bbtkDevelopersGuide)
 BBTK_BUILD_HTML_DOC_FROM_LATEX(bbtkDevelopersGuide bbtkDevelopersGuide)
 MESSAGE(STATUS "=======================================")
index 38f4edf71aa04cad7a38564840fff5381edc3995..c9a8e5d1a5a9e5a0ea1883320469190748de0d23 100755 (executable)
@@ -1,7 +1,7 @@
 MESSAGE(STATUS "")
 MESSAGE(STATUS "=======================================")
 MESSAGE(STATUS "Configuring bbtk Package Developers' Guide build ")
-BBTK_DOC_INSTALL_IMAGES(bbtkPackageDevelopersGuide)
+#EED 11/11/2009   BBTK_DOC_INSTALL_IMAGES(bbtkPackageDevelopersGuide)
 BBTK_BUILD_LATEX_DOC(bbtkPackageDevelopersGuide bbtkPackageDevelopersGuide)
 BBTK_BUILD_HTML_DOC_FROM_LATEX(bbtkPackageDevelopersGuide bbtkPackageDevelopersGuide)
 MESSAGE(STATUS "=======================================")
index 7136f24b7a548632f4ba19e0f2512076a50d6ecf..e03222d2c5fab6bc243f5aa63b602d34fd0cc93f 100755 (executable)
@@ -2,7 +2,7 @@ MESSAGE(STATUS "")
 MESSAGE(STATUS "=======================================")
 MESSAGE(STATUS "Configuring bbtk Users' Guide build ")
 
-BBTK_DOC_INSTALL_IMAGES(bbtkUsersGuide)
+#EED 11/11/2009 BBTK_DOC_INSTALL_IMAGES(bbtkUsersGuide)
 BBTK_BUILD_LATEX_DOC(bbtkUsersGuide bbtkUsersGuide)
 BBTK_BUILD_HTML_DOC_FROM_LATEX(bbtkUsersGuide bbtkUsersGuide)
 MESSAGE(STATUS "=======================================")
index 0fe9af09a82073019eb80abfc901931f3ec25d55..6ef0b9b586faa2a4014f95b177dd9bda15319b73 100644 (file)
@@ -12,8 +12,9 @@
 
 <H2>Guides</H2>
 
-<a href="bbtkUsersGuide/bbtkUsersGuide.html" target="information">User's Guide</a><br>
-<a href="bbtkPackageDevelopersGuide/bbtkPackageDevelopersGuide.html" target="information">Package Developer's Guide</a><br>
+<a href="bbtkUsersGuide\bbtkUsersGuide.pdf" target="information">User's Guide</a><br>
+<a href="bbtkPackageDevelopersGuide\bbtkPackageDevelopersGuide.pdf" target="information">Package Developer's Guide</a><br>
+<a href="bbtkUsersGuide\bbtkDevelopersGuide.pdf" target="information">Developer Guide</a><br>
 <a href="doxygen/bbtk/main.html" target="information">bbtk library doxygen doc</a><br>
 
 <H2>Boxes</H2>
index 1c906e587046339cf0782ab835bae5f845ce88bc..0d99fb1bcffa3101b4d12908565703a7f3b77402 100644 (file)
@@ -7,10 +7,28 @@ SUBDIRS(cpack)
 
 
 
-INSTALL(
-  DIRECTORY  ${BBTK_BINARY_DIR}/${BBTK_DOC_REL_PATH}
-  DESTINATION  ${BBTK_SHARE_REL_PATH}
-)
+# Install documentation directoris
+#-------------------------------------------------------------------
+#INSTALL(
+#  DIRECTORY  ${BBTK_BINARY_DIR}/${BBTK_DOC_REL_PATH}
+#  DESTINATION  ${BBTK_SHARE_REL_PATH}
+#  FILES_MATCHING PATTERN "*.html"
+#)
+
+#INSTALL(
+#  DIRECTORY  ${BBTK_BINARY_DIR}/${BBTK_DOC_REL_PATH}
+#  DESTINATION  ${BBTK_SHARE_REL_PATH}
+#  FILES_MATCHING PATTERN "*.jpg"
+#)
+
+#INSTALL(
+#  DIRECTORY  ${BBTK_BINARY_DIR}/${BBTK_DOC_REL_PATH}
+#  DESTINATION  ${BBTK_SHARE_REL_PATH}
+#  FILES_MATCHING PATTERN "*.pdf"
+#)
+#-------------------------------------------------------------------
+
+
 
 INSTALL(
   DIRECTORY  ${BBTK_BINARY_DIR}/${BBTK_BBS_REL_PATH}
index ab6b1225ef40f6faa650d64637724d115d1468e0..18dfcd181546f43e8ca8e4f4a3279ede30f958ae 100644 (file)
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkBlackBoxDescriptor.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/05/28 08:12:05 $
-  Version:   $Revision: 1.21 $
+  Date:      $Date: 2009/12/08 14:10:36 $
+  Version:   $Revision: 1.22 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -415,7 +415,8 @@ namespace bbtk
       
       std::string descr(in->second->GetDescription());
       //Utilities::html_format(descr);
-      
+
+/*EED 10/11/2009
       std::string out = 
        "<TR><TD style='vertical-align: top;' bgcolor=\"" + col
        +"\"><B><PRE> "+name+" </PRE></B></TD>"
@@ -423,7 +424,16 @@ namespace bbtk
        +"\"><I><PRE> "+type+" </PRE></I></TD>"
        + "<TD style='vertical-align: top;' bgcolor=\""+col
        +"\">"+descr+"</TD></TR>\n";
-      
+*/      
+
+      std::string out = 
+       "<TR><TD style='vertical-align: top;' bgcolor=\"" + col
+       +"\"><B><PRE> "+name+" </PRE></B></TD>"
+       + "<TD style='vertical-align: top;' bgcolor=\""+col
+       +"\"><I><PRE> "+descr+" </PRE></I></TD>"
+       + "<TD style='vertical-align: top;' bgcolor=\""+col
+       +"\">"+type+"</TD></TR>\n";
+
       if (iotype==0) user_defined.push_back(out);
       else if (iotype==1) ubb_defined.push_back(out);
       else if (iotype==2) wxbb_defined.push_back(out);
@@ -481,6 +491,7 @@ namespace bbtk
        std::string descr(o->second->GetDescription());
        //Utilities::html_format(descr);
        
+/*EED 10/11/2009
        std::string out = 
          "<TR><TD style='vertical-align: top;' bgcolor=\"" + col
          +"\"><B><PRE> "+name+" </PRE></B></TD>"
@@ -488,7 +499,15 @@ namespace bbtk
          +"\"><I><PRE> "+type+" </PRE></I></TD>"
          + "<TD style='vertical-align: top;' bgcolor=\""+col
          +"\">"+descr+"</TD></TR>\n";
-       
+*/
+       std::string out = 
+         "<TR><TD style='vertical-align: top;' bgcolor=\"" + col
+         +"\"><B><PRE> "+name+" </PRE></B></TD>"
+         + "<TD style='vertical-align: top;' bgcolor=\""+col
+         +"\"><I><PRE> "+descr+" </PRE></I></TD>"
+         + "<TD style='vertical-align: top;' bgcolor=\""+col
+         +"\">"+type+"</TD></TR>\n";
+
        if (iotype==0) user_defined.push_back(out);
        else if (iotype==1) ubb_defined.push_back(out);
        else if (iotype==2) wxbb_defined.push_back(out);
index a56659c030cb2b2572bd4dfe8fbe49544efa6401..3037cae072d36a075e40e19a3a9786540c36c2c4 100644 (file)
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkComplexBlackBoxDescriptor.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/05/28 08:12:05 $
-  Version:   $Revision: 1.20 $
+  Date:      $Date: 2009/12/08 14:10:36 $
+  Version:   $Revision: 1.21 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -456,9 +456,15 @@ namespace bbtk
        std::string descr(in->second->GetDescription());
        //Utilities::html_format(descr);
 
+/*EED 10/11/2009
        (s) << "<TR><TD style='vertical-align: top;'><B><PRE> "<<name<<" </PRE></B></TD>"
          << "<TD style='vertical-align: top;'><I><PRE> "<<type<<" </PRE></I></TD>"
          << "<TD style='vertical-align: top;'>"<<descr<<"</TD></TR>\n";
+*/
+
+       (s) << "<TR><TD style='vertical-align: top;'><B><PRE> "<<name<<" </PRE></B></TD>"
+         << "<TD style='vertical-align: top;'><I><PRE> "<<descr<<" </PRE></I></TD>"
+         << "<TD style='vertical-align: top;'>"<<type<<"</TD></TR>\n";
        
       }
     // (s) << "</TABLE>\n";
@@ -489,10 +495,15 @@ namespace bbtk
        std::string descr(o->second->GetDescription());
        //Utilities::html_format(descr);
        
+/*EED 10/11/2009
        (s) << "<TR><TD style='vertical-align: top;'><B><PRE> "<<name<<" </PRE></B></TD>"
          << "<TD style='vertical-align: top;'><I><PRE> "<<type<<" </PRE></I></TD>"
          << "<TD style='vertical-align: top;'>"<<descr<<"</TD></TR>\n";
-       
+*/     
+       (s) << "<TR><TD style='vertical-align: top;'><B><PRE> "<<name<<" </PRE></B></TD>"
+         << "<TD style='vertical-align: top;'><I><PRE> "<<descr<<" </PRE></I></TD>"
+         << "<TD style='vertical-align: top;'>"<<type<<"</TD></TR>\n";
+
       }
     (s) << "</TABLE>\n";
 
index c163a5b6a9907cad8cc9b58ec30403648be0ceed..8e2d78ce31d6b5b30c145a4e3cd497b9813d5b39 100644 (file)
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkConfigurationFile.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/05/28 14:22:10 $
-  Version:   $Revision: 1.31 $
+  Date:      $Date: 2009/12/08 14:10:36 $
+  Version:   $Revision: 1.32 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -240,50 +240,55 @@ namespace bbtk
     std::string filename = Utilities::MakeUserSettingsFullFileName("doc/help_contents.html");
     if (!Utilities::FileExists(filename))
       {
-       bbtkDebugMessage("config",1, 
+                       bbtkDebugMessage("config",1, 
                         "* Creating [" << filename << "]" << std::endl);
-       // The path to the doc folder (=mInstall_path+"/"+mDoc_rel_path)
-       std::string doc_path = mInstall_path + "/" 
-         + BBTK_STRINGIFY_SYMBOL(BBTK_DOC_REL_PATH) + "/";
-       Utilities::MakeValidFileName(doc_path); 
-       std::ofstream f;
-       f.open(filename.c_str(), std::ios::out );
-       f << "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD "
-         << "HTML 4.01 Transitional//EN\">"
-         << "<html><head><title>Help Contents - bbtk "
-         << GetVersion() << "</title>"
-         << "<meta http-equiv=\"Content-Type\" content=\"text/html; "
-         << "charset=iso-8859-1\"></head><H1>Help Contents</H1>"
-         << "<a href=\"bbdoc/index-category.html#demo\" "
-         << "target=\"information\">Demos</a><br>"
-         << "<a href=\"bbdoc/index-category.html#example\" "
-         << "target=\"information\">Examples</a>"
-         << "<H2>Guides</H2>"
-         << "<a href=\""
-         << doc_path 
-         << "bbtkUsersGuide/bbtkUsersGuide.html"
-         << "\" target=\"information\">User's Guide</a><br>"
-         << "<a href=\""
-         << doc_path
-         << "bbtkPackageDevelopersGuide/bbtkPackageDevelopersGuide.html"
-         << "\" target=\"information\">Package Developer's Guide</a><br>"
-         << "<a href=\""
-         << doc_path
-         << "doxygen/bbtk/main.html"
-         << "\" target=\"information\">bbtk library doxygen doc</a><br>"
-         << "<H2>Boxes</H2>"
-         << "<a target=\"information\" href=\"bbdoc/index-alpha.html\">"
-         << "Alphabetical list</a><br>"
-         << "<a target=\"information\" href=\"bbdoc/index-package.html\">"
-         << "List by package</a><br>"
-         << "<a target=\"information\" href=\"bbdoc/index-category.html\">"
-         << "List by category</a><br>"
-         << "<a target=\"information\" href=\"bbdoc/index-adaptors.html\">"
-         << "List of adaptors</a><br>"
-         << "</body>"
-         << "</html>";
-      }
+                       // The path to the doc folder (=mInstall_path+"/"+mDoc_rel_path)
+                       std::string doc_path = mInstall_path + "/" 
+                         + BBTK_STRINGIFY_SYMBOL(BBTK_DOC_REL_PATH) + "/";
+                       Utilities::MakeValidFileName(doc_path); 
+       
 
+                       std::ofstream f;
+                       f.open(filename.c_str(), std::ios::out );
+                       f << "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD "
+                         << "HTML 4.01 Transitional//EN\">"
+                         << "<html><head><title>Help Contents - bbtk "
+                         << GetVersion() << "</title>"
+                         << "<meta http-equiv=\"Content-Type\" content=\"text/html; "
+                         << "charset=iso-8859-1\"></head><H1>Help Contents</H1>"
+                         << "<a href=\"bbdoc/index-category.html#demo\" "
+                         << "target=\"information\">Demos</a><br>"
+                         << "<a href=\"bbdoc/index-category.html#example\" "   
+                         << "target=\"information\">Examples</a>"
+                         << "<H2>Guides</H2>"
+                         << "<a href=\""
+                         << doc_path 
+                         << "bbtkUsersGuide/bbtkUsersGuide.pdf"
+                         << "\" target=\"information\">User's Guide</a><br>"
+                         << "<a href=\""
+                         << doc_path
+                         << "bbtkDevelopersGuide/bbtkDevelopersGuide.pdf"
+                         << "\" target=\"information\">Developer's Guide</a><br>"
+                         << "<a href=\""
+                         << doc_path
+                         << "bbtkPackageDevelopersGuide/bbtkPackageDevelopersGuide.pdf"
+                         << "\" target=\"information\">Package Developer's Guide</a><br>"
+                         << "<a href=\""
+                         << doc_path
+                         << "doxygen/bbtk/main.html"
+                         << "\" target=\"information\">bbtk library doxygen doc</a><br>"
+                         << "<H2>Boxes</H2>"
+                         << "<a target=\"information\" href=\"bbdoc/index-alpha.html\">"
+                         << "Alphabetical list</a><br>"
+                         << "<a target=\"information\" href=\"bbdoc/index-package.html\">"
+                         << "List by package</a><br>"
+                         << "<a target=\"information\" href=\"bbdoc/index-category.html\">"
+                         << "List by category</a><br>"
+                         << "<a target=\"information\" href=\"bbdoc/index-adaptors.html\">"
+                         << "List of adaptors</a><br>"
+                         << "</body>"
+                 << "</html>";
+      } // if
 
     mTemp_path = Utilities::MakeUserSettingsFullFileName("tmp");
     Utilities::CreateDirectoryIfNeeded(mTemp_path);
index 6e20b0333eb13df2d84c9076dcff3801297b8109..c311ee2aaa303367d4b2a0c413eed65ce129db91 100644 (file)
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxGUIScriptingInterface.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/11/05 16:47:42 $
-  Version:   $Revision: 1.39 $
+  Date:      $Date: 2009/12/08 14:10:36 $
+  Version:   $Revision: 1.40 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -57,6 +57,7 @@
 #include <wx/tipwin.h>
 #include <wx/splash.h>
 
+
 //#include "icons/cc_run.xpm"
 
 namespace bbtk
@@ -509,7 +510,7 @@ namespace bbtk
     std::string configFile = 
       ConfigurationFile::GetInstance().Get_config_xml_full_path();
     Open(configFile);
-       wxMessageDialog ww(NULL,_T("If you change the bbtk_config.xml, you have to reinicialice this appliaction..."), _T("Alert !"), wxOK);
+       wxMessageDialog ww(NULL,_T("If you change the bbtk_config.xml, you have to restart this appliaction..."), _T("Alert !"), wxOK);
        ww.ShowModal();
   }
   //================================================================
@@ -697,8 +698,6 @@ namespace bbtk
        command += " -q";
        bbtkMessage("debug",1,"Executing system command '"<<command<<"'"<<std::endl);
 
-
-
     if ( ! system ( command.c_str() ) )
       {
        SetStatusText( _T("Done !"));
@@ -804,17 +803,49 @@ 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]=='.'))
-      {
-       mWxGUITextEditor->Open(target);
-#if NOTEBOOK
-       mwxNotebook->SetSelection(0);
-#endif
-       mWxGUITextEditor->SetFocus();
-       return false;
-      }
+               && (target[s-2]=='b')
+               && (target[s-3]=='b')
+               && (target[s-4]=='.'))
+       {
+                       mWxGUITextEditor->Open(target);
+                       #if NOTEBOOK
+                               mwxNotebook->SetSelection(0);
+                       #endif
+                       mWxGUITextEditor->SetFocus();
+                       return false;
+       }
+
+       if ((s>3) && (target[s-1]=='f')
+               && (target[s-2]=='d')
+               && (target[s-3]=='p')
+               && (target[s-4]=='.'))
+       {
+
+               // Open pdf in linux
+                 // gnome-open target
+
+               // Open pdf in macOS
+
+               // Open pdf in windows
+                       int size=target.size();
+                       int pos=target.rfind("\\");
+                       std::string commandStart("start ");
+                       std::string commandPath("/D \""+target.substr(0,pos) +"\"");
+                       std::string commandPDF( target.substr(pos+1,size-pos+1) );
+
+                       printf("EED WxGUIScriptingInterface::WxGUIHtmlBrowserUserOnLinkClicked cc %s \n",commandPath.c_str() );
+                       // cleanning path
+                       while (commandPath.rfind("\\\\")!=-1 )
+                       {
+                               commandPath.erase( commandPath.rfind("\\\\") , 1 );
+                       printf("EED WxGUIScriptingInterface::WxGUIHtmlBrowserUserOnLinkClicked cc %s \n",commandPath.c_str() );
+                       }
+
+                       std::string command = commandStart+commandPath+" "+commandPDF;
+                       printf("EED WxGUIScriptingInterface::WxGUIHtmlBrowserUserOnLinkClicked BB %s \n",command.c_str() );
+                       system( command.c_str() );
+                       return false;
+     }
     return true;
   }
   //================================================================  
index b63f11d48ee840e83e7d82eecee6df17da77e721..0720b769659621f10fe0a843681034b2d42ef1cc 100644 (file)
@@ -38,7 +38,7 @@
   <!--=====================================================================-->
 
   <!--========================================================================
-    CONSTRUCTORS / DESTRUCTORS (OPTIONAL) 
+    CONSTRUCTORS / DESTRUCTORS (OPTIONAL)  -->
   <defaultValues><PRE>
   </PRE></defaultValues>