]> Creatis software - bbtk.git/commitdiff
*** empty log message ***
authorguigues <guigues>
Mon, 28 Jan 2008 15:34:37 +0000 (15:34 +0000)
committerguigues <guigues>
Mon, 28 Jan 2008 15:34:37 +0000 (15:34 +0000)
kernel/cmake/BBTKCreatePackageBBdoc.cmake
kernel/src/bbtkExecuter.cxx

index 8c43287129b6225f0ceee7fcdf45da39b777ed72..d9d2cbb298655841170bc99f96e06a05bd9472ea 100644 (file)
@@ -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 
     )
 
index 891b6aa6b016ff41b83880d135726d3bc1619346..8730b02eb2387ef7ea7bba95ce8f107e1ebea92f 100644 (file)
@@ -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;
     /*