From 2159bb535360a4085428c6121099327dd75a7b6e Mon Sep 17 00:00:00 2001 From: guigues Date: Mon, 28 Jan 2008 15:34:37 +0000 Subject: [PATCH] *** empty log message *** --- kernel/cmake/BBTKCreatePackageBBdoc.cmake | 2 +- kernel/src/bbtkExecuter.cxx | 20 +++++++++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/kernel/cmake/BBTKCreatePackageBBdoc.cmake b/kernel/cmake/BBTKCreatePackageBBdoc.cmake index 8c43287..d9d2cbb 100644 --- a/kernel/cmake/BBTKCreatePackageBBdoc.cmake +++ b/kernel/cmake/BBTKCreatePackageBBdoc.cmake @@ -17,7 +17,7 @@ MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME) "include ${PACKAGE_NAME}\n" "include ${PACKAGE_NAME}-appli\n" "#-----------------------------------------\n" - "graph workspace 0 0 ${DOC_OUTPUT} \"none\" \"Package ${PACKAGE_NAME} documentation\"\n" + "graph ${PACKAGE_NAME} 0 0 ${DOC_OUTPUT} \"none\" \"Package ${PACKAGE_NAME} documentation\"\n" #${BBTK_DOCUMENT_SCRIPTS_OUTPUT_PATH}/header.html ) diff --git a/kernel/src/bbtkExecuter.cxx b/kernel/src/bbtkExecuter.cxx index 891b6aa..8730b02 100644 --- a/kernel/src/bbtkExecuter.cxx +++ b/kernel/src/bbtkExecuter.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkExecuter.cxx,v $ $ Language: C++ - Date: $Date: 2008/01/28 15:08:53 $ - Version: $Revision: 1.2 $ + Date: $Date: 2008/01/28 15:34:37 $ + Version: $Revision: 1.3 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -450,11 +450,21 @@ namespace bbtk relative_link = false; } + + Package* p; + try + { + p = GetGlobalFactory()->GetPackage(nameblackbox); + } + catch (Exception e) + { + p = mPackage; + } // Generating documentation-help of workspace - mPackage->SetDocURL(filename_rootHtml); - mPackage->SetDocRelativeURL(simplefilename_rootHtml); + p->SetDocURL(filename_rootHtml); + p->SetDocRelativeURL(simplefilename_rootHtml); - mPackage->CreateHtmlPage(filename_rootHtml,"bbi","user package",custom_header,custom_title,detail,level,relative_link); + p->CreateHtmlPage(filename_rootHtml,"bbi","user package",custom_header,custom_title,detail,level,relative_link); std::string page = filename_rootHtml; /* -- 2.45.1