From 30b4292974380b80ab23dedc97aa2585ed0cc8f7 Mon Sep 17 00:00:00 2001 From: Eduardo Davila Date: Tue, 8 Dec 2009 14:10:29 +0000 Subject: [PATCH] *** empty log message *** --- kernel/cmake/BBTKBuildHtmlDocFromLatex.cmake | 5 + kernel/cmake/BBTKDefineOptions.cmake | 2 +- kernel/doc/bbtkDevelopersGuide/CMakeLists.txt | 2 +- .../bbtkPackageDevelopersGuide/CMakeLists.txt | 2 +- kernel/doc/bbtkUsersGuide/CMakeLists.txt | 2 +- kernel/doc/help_contents.html.in | 5 +- kernel/install/CMakeLists.txt | 26 +++++- kernel/src/bbtkBlackBoxDescriptor.cxx | 29 +++++- kernel/src/bbtkComplexBlackBoxDescriptor.cxx | 17 +++- kernel/src/bbtkConfigurationFile.cxx | 93 ++++++++++--------- kernel/src/bbtkWxGUIScriptingInterface.cxx | 63 +++++++++---- .../itk/src/bbitkDICOMSeriesFileNames.xml | 2 +- 12 files changed, 169 insertions(+), 79 deletions(-) diff --git a/kernel/cmake/BBTKBuildHtmlDocFromLatex.cmake b/kernel/cmake/BBTKBuildHtmlDocFromLatex.cmake index d96acb1..59738d4 100644 --- a/kernel/cmake/BBTKBuildHtmlDocFromLatex.cmake +++ b/kernel/cmake/BBTKBuildHtmlDocFromLatex.cmake @@ -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 diff --git a/kernel/cmake/BBTKDefineOptions.cmake b/kernel/cmake/BBTKDefineOptions.cmake index e9c27e4..3f78e97 100644 --- a/kernel/cmake/BBTKDefineOptions.cmake +++ b/kernel/cmake/BBTKDefineOptions.cmake @@ -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) diff --git a/kernel/doc/bbtkDevelopersGuide/CMakeLists.txt b/kernel/doc/bbtkDevelopersGuide/CMakeLists.txt index 0e03ff7..32cbb4f 100755 --- a/kernel/doc/bbtkDevelopersGuide/CMakeLists.txt +++ b/kernel/doc/bbtkDevelopersGuide/CMakeLists.txt @@ -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 "=======================================") diff --git a/kernel/doc/bbtkPackageDevelopersGuide/CMakeLists.txt b/kernel/doc/bbtkPackageDevelopersGuide/CMakeLists.txt index 38f4edf..c9a8e5d 100755 --- a/kernel/doc/bbtkPackageDevelopersGuide/CMakeLists.txt +++ b/kernel/doc/bbtkPackageDevelopersGuide/CMakeLists.txt @@ -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 "=======================================") diff --git a/kernel/doc/bbtkUsersGuide/CMakeLists.txt b/kernel/doc/bbtkUsersGuide/CMakeLists.txt index 7136f24..e03222d 100755 --- a/kernel/doc/bbtkUsersGuide/CMakeLists.txt +++ b/kernel/doc/bbtkUsersGuide/CMakeLists.txt @@ -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 "=======================================") diff --git a/kernel/doc/help_contents.html.in b/kernel/doc/help_contents.html.in index 0fe9af0..6ef0b9b 100644 --- a/kernel/doc/help_contents.html.in +++ b/kernel/doc/help_contents.html.in @@ -12,8 +12,9 @@

Guides

-User's Guide
-Package Developer's Guide
+User's Guide
+Package Developer's Guide
+Developer Guide
bbtk library doxygen doc

Boxes

diff --git a/kernel/install/CMakeLists.txt b/kernel/install/CMakeLists.txt index 1c906e5..0d99fb1 100644 --- a/kernel/install/CMakeLists.txt +++ b/kernel/install/CMakeLists.txt @@ -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} diff --git a/kernel/src/bbtkBlackBoxDescriptor.cxx b/kernel/src/bbtkBlackBoxDescriptor.cxx index ab6b122..18dfcd1 100644 --- a/kernel/src/bbtkBlackBoxDescriptor.cxx +++ b/kernel/src/bbtkBlackBoxDescriptor.cxx @@ -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 = "
 "+name+"
" @@ -423,7 +424,16 @@ namespace bbtk +"\">
 "+type+"
" + ""+descr+"\n"; - +*/ + + std::string out = + "
 "+name+"
" + + "
 "+descr+"
" + + ""+type+"\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 = "
 "+name+"
" @@ -488,7 +499,15 @@ namespace bbtk +"\">
 "+type+"
" + ""+descr+"\n"; - +*/ + std::string out = + "
 "+name+"
" + + "
 "+descr+"
" + + ""+type+"\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); diff --git a/kernel/src/bbtkComplexBlackBoxDescriptor.cxx b/kernel/src/bbtkComplexBlackBoxDescriptor.cxx index a56659c..3037cae 100644 --- a/kernel/src/bbtkComplexBlackBoxDescriptor.cxx +++ b/kernel/src/bbtkComplexBlackBoxDescriptor.cxx @@ -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) << "
 "<"
 	  << "
 "<"
 	  << ""<\n";
+*/
+
+	(s) << "
 "<"
+	  << "
 "<"
+	  << ""<\n";
 	
       }
     //	(s) << "\n";
@@ -489,10 +495,15 @@ namespace bbtk
 	std::string descr(o->second->GetDescription());
 	//Utilities::html_format(descr);
 	
+/*EED 10/11/2009
 	(s) << "
 "<"
 	  << "
 "<"
 	  << ""<\n";
-	
+*/	
+	(s) << "
 "<"
+	  << "
 "<"
+	  << ""<\n";
+
       }
     (s) << "\n";
 
diff --git a/kernel/src/bbtkConfigurationFile.cxx b/kernel/src/bbtkConfigurationFile.cxx
index c163a5b..8e2d78c 100644
--- a/kernel/src/bbtkConfigurationFile.cxx
+++ b/kernel/src/bbtkConfigurationFile.cxx
@@ -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 << ""
-	  << "Help Contents - bbtk "
-	  << GetVersion() << ""
-	  << "
Help Contents
"
-	  << "Demos
"
-	  << "Examples"
-	  << "
Guides
"
-	  << "User's Guide
"
-	  << "Package Developer's Guide
"
-	  << "bbtk library doxygen doc
"
-	  << "
Boxes
"
-	  << ""
-	  << "Alphabetical list
"
-	  << ""
-	  << "List by package
"
-	  << ""
-	  << "List by category
"
-	  << ""
-	  << "List of adaptors
"
-	  << ""
-	  << "";
-      }
+			// 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 << ""
+			  << "Help Contents - bbtk "
+			  << GetVersion() << ""
+			  << "
Help Contents
"
+			  << "Demos
"
+			  << "Examples"
+			  << "
Guides
"
+			  << "User's Guide
"
+			  << "Developer's Guide
"
+			  << "Package Developer's Guide
"
+			  << "bbtk library doxygen doc
"
+			  << "
Boxes
"
+			  << ""
+			  << "Alphabetical list
"
+			  << ""
+			  << "List by package
"
+			  << ""
+			  << "List by category
"
+			  << ""
+			  << "List of adaptors
"
+			  << ""
+		  << "";
+      } // if
 
     mTemp_path = Utilities::MakeUserSettingsFullFileName("tmp");
     Utilities::CreateDirectoryIfNeeded(mTemp_path);
diff --git a/kernel/src/bbtkWxGUIScriptingInterface.cxx b/kernel/src/bbtkWxGUIScriptingInterface.cxx
index 6e20b03..c311ee2 100644
--- 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: 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 
 #include 
 
+
 //#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 '"<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;
   }
   //================================================================  
diff --git a/packages/itk/src/bbitkDICOMSeriesFileNames.xml b/packages/itk/src/bbitkDICOMSeriesFileNames.xml
index b63f11d..0720b76 100644
--- a/packages/itk/src/bbitkDICOMSeriesFileNames.xml
+++ b/packages/itk/src/bbitkDICOMSeriesFileNames.xml
@@ -38,7 +38,7 @@
   
 
   
   
   
    
   
-- 
2.45.1