p->SetDocURL(pack_index);
p->SetDocRelativeURL("index.html");
- p->CreateHtmlPage(pack_index,"bbtk",pack_name,"","",0,0,true);
+ p->CreateHtmlPage(pack_index,"bbtk",pack_name,"","",0,0,false); //true);
}
//==========================================================================
-# Use the installed appli
IF(WIN32)
SET (EXECUTABLE_OUTPUT_REL_PATH "")
SET (LIBRARY_OUTPUT_REL_PATH "")
- FILE(TO_NATIVE_PATH ${PROJECT_BINARY_DIR}/$(OutDir) BBTK_BIN_PATH)
- SET(BBTK_BBI "${BBTK_DIR}/bin/bbi")
- SET(BBTK_BBS2CPP "${BBTK_DIR}/bin/bbs2cpp")
- SET(BBTK_BBC "${BBTK_DIR}/bin/bbc")
- SET(BBTK_BBFY "${BBTK_DIR}/bin/bbfy")
- SET(BBTK_BBDOC "${BBTK_DIR}/bin/bbdoc")
+# FILE(TO_NATIVE_PATH ${PROJECT_BINARY_DIR}/$(OutDir) BBTK_BIN_PATH)
+# SET(BBTK_BIN_PATH ${BBTK_DIR}/bin})
+# FIND_FILE(PATHS ${BBTK_BIN_PATH})
+
+ FIND_PATH(BBTK_BIN_PATH bbi.exe ${BBTK_DIR}/bin ${BBTK_DIR}/Release ${BBTK_DIR}/Debug NO_DEFAULT_PATH)
+
+ IF(NOT BBTK_BIN_PATH)
+ MESSAGE(FATAL_ERROR "bbi not found in ${BBTK_DIR}/bin ; ${BBTK_DIR}/Release ; ${BBTK_DIR}/Debug : is bbtk properly built ?")
+ ENDIF(NOT BBTK_BIN_PATH)
+
+
+ SET(BBTK_BBI "${BBTK_BIN_PATH}/bbi")
+ SET(BBTK_BBS2CPP "${BBTK_BIN_PATH}/bbs2cpp")
+ SET(BBTK_BBC "${BBTK_BIN_PATH}/bbc")
+ SET(BBTK_BBFY "${BBTK_BIN_PATH}/bbfy")
+ SET(BBTK_BBDOC "${BBTK_BIN_PATH}/bbdoc")
ELSE(WIN32)
# SET (EXECUTABLE_OUTPUT_REL_PATH bin)
#---------------------------------------------------------------------------
IF(BBTK_CORE_PACKAGE)
# If a core package set doc options from bbtk global ones
- IF (BUILD_BBTK_DOC_PACKAGE)
- SET(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_HTML_DOC ON)
- ELSE (BUILD_BBTK_DOC_PACKAGE)
- SET(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_HTML_DOC OFF)
- ENDIF (BUILD_BBTK_DOC_PACKAGE)
+ #IF (BUILD_BBTK_DOC_PACKAGE)
+ # SET(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_HTML_DOC ON)
+ #ELSE (BUILD_BBTK_DOC_PACKAGE)
+ # SET(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_HTML_DOC OFF)
+ #ENDIF (BUILD_BBTK_DOC_PACKAGE)
IF (BUILD_BBTK_DOC_DOXYGEN)
SET(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_DOXYGEN_DOC ON)
ELSE (BUILD_BBTK_DOC_DOXYGEN)
ELSE(BBTK_CORE_PACKAGE)
# If not a core package
# Create the build doc options
- OPTION(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_HTML_DOC
- "Build the bbtk package ${BBTK_PACKAGE_NAME} html documentation ?" OFF)
- SWITCH_ON_IF_BUILD_ALL(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_HTML_DOC)
+ #OPTION(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_HTML_DOC
+ # "Build the bbtk package ${BBTK_PACKAGE_NAME} html documentation ?" OFF)
+ #SWITCH_ON_IF_BUILD_ALL(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_HTML_DOC)
OPTION(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_DOXYGEN_DOC
"Build the bbtk package ${BBTK_PACKAGE_NAME} doxygen documentation ?" OFF)
SWITCH_ON_IF_BUILD_ALL(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_DOXYGEN_DOC)
#----------------------------------------------------------------------------
# bbdoc
#---------------------------------------------------------------------------
-IF(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_HTML_DOC)
- SUBDIRS(bbdoc)
-ENDIF(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_HTML_DOC)
+#IF(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_HTML_DOC)
+# SUBDIRS(bbdoc)
+#ENDIF(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_HTML_DOC)
#---------------------------------------------------------------------------
-CONFIGURE_FILE(
- ${CMAKE_CURRENT_SOURCE_DIR}/header.html.in
- ${BBTK_BBDOC_BUILD_PATH}/${BBTK_PACKAGE_NAME}/header.html
- @ONLY IMMEDIATE
- )
-INSTALL(
- FILES ${BBTK_BBDOC_BUILD_PATH}/${BBTK_PACKAGE_NAME}/header.html
- DESTINATION ${BBTK_BBDOC_INSTALL_PATH}/${BBTK_PACKAGE_NAME}
- )
+#CONFIGURE_FILE(
+# ${CMAKE_CURRENT_SOURCE_DIR}/header.html.in
+# ${BBTK_BBDOC_BUILD_PATH}/${BBTK_PACKAGE_NAME}/header.html
+# @ONLY IMMEDIATE
+# )
+#INSTALL(
+# FILES ${BBTK_BBDOC_BUILD_PATH}/${BBTK_PACKAGE_NAME}/header.html
+# DESTINATION ${BBTK_BBDOC_INSTALL_PATH}/${BBTK_PACKAGE_NAME}
+# )
-INCLUDE(${BBTK_CMAKE_DIR}/BBTKCreatePackageBBdoc.cmake)
-BBTK_CREATE_PACKAGE_BBDOC(${BBTK_PACKAGE_NAME})
+#INCLUDE(${BBTK_CMAKE_DIR}/BBTKCreatePackageBBdoc.cmake)
+#BBTK_CREATE_PACKAGE_BBDOC(${BBTK_PACKAGE_NAME})
-BBTK_DOC_INSTALL_IMAGES(bbdoc/${BBTK_PACKAGE_NAME})
\ No newline at end of file
+#BBTK_DOC_INSTALL_IMAGES(bbdoc/${BBTK_PACKAGE_NAME})
\ No newline at end of file
DESTINATION ${BBTK_DOC_INSTALL_PATH}/bbtkWebSite
)
ENDFOREACH(page)
-
-# Index generation
-SET(BBTK_INDEX_ALPHA_FILE ${BBTK_BBDOC_BUILD_PATH}/index-alpha.html)
-SET(BBTK_INDEX_PACKAGES_FILE ${BBTK_BBDOC_BUILD_PATH}/index-package.html)
-SET(BBTK_INDEX_CATEGORIES_FILE ${BBTK_BBDOC_BUILD_PATH}/index-category.html)
-SET(BBTK_INDEX_ADAPTORS_FILE ${BBTK_BBDOC_BUILD_PATH}/index-adaptors.html)
-SET(INDEX_OUTPUT
- ${BBTK_INDEX_ALPHA_FILE} ${BBTK_INDEX_PACKAGES_FILE}
- ${BBTK_INDEX_CATEGORIES_FILE}
- )
-
-CONFIGURE_FILE(
- ${CMAKE_CURRENT_SOURCE_DIR}/make-index.bbs.in
- ${CMAKE_CURRENT_BINARY_DIR}/make-index.bbs
- @ONLY
- )
-
-IF (WIN32)
- SET(USE_DOT TRUE)
- MAKE_DLL_PATH()
- ADD_CUSTOM_COMMAND(
- OUTPUT ${INDEX_OUTPUT}
- COMMAND
- set ${DLL_PATH} cd ${BBTK_BIN_PATH} && ${BBTK_BBI} -N -q ${CMAKE_CURRENT_BINARY_DIR}/make-index.bbs
- DEPENDS ${BBTK_BBI_DEPENDENCY} ${BBTK_PACKAGES_DEPS}
- )
-ELSE (WIN32)
- SET(LD_LIBRARY_PATH "$ENV{LD_LIBRARY_PATH}:${LIBRARY_OUTPUT_PATH}")
-# MESSAGE(LD_LIBRARY_PATH=${LD_LIBRARY_PATH})
- ADD_CUSTOM_COMMAND(
- OUTPUT ${INDEX_OUTPUT}
- COMMAND
- cd ${BBTK_BIN_PATH} && export LD_LIBRARY_PATH=${LD_LIBRARY_PATH} && ${BBTK_BBI} -N -q ${CMAKE_CURRENT_BINARY_DIR}/make-index.bbs
- DEPENDS ${BBTK_BBI_DEPENDENCY} ${BBTK_PACKAGES_DEPS}
- )
-ENDIF (WIN32)
-
-ADD_CUSTOM_TARGET(bbdoc_index ALL
- DEPENDS ${INDEX_OUTPUT}
- )
-INSTALL(
- FILES ${INDEX_OUTPUT}
- DESTINATION ${BBTK_BBDOC_INSTALL_PATH}
- )
-
-# create make-index.bbs for build / install tree
-SET(BBTK_INDEX_ALPHA_FILE index-alpha.html)
-SET(BBTK_INDEX_PACKAGES_FILE index-package.html)
-SET(BBTK_INDEX_CATEGORIES_FILE index-category.html)
-SET(BBTK_INDEX_ADAPTORS_FILE index-adaptors.html)
-CONFIGURE_FILE(
- ${CMAKE_CURRENT_SOURCE_DIR}/make-index.bbs.in
- ${BBTK_BBDOC_BUILD_PATH}/make-index.bbs
- @ONLY
- )
-INSTALL(
- FILES ${BBTK_BBDOC_BUILD_PATH}/make-index.bbs
- DESTINATION ${BBTK_BBDOC_INSTALL_PATH}
- )
-# bbtk-make-index
-CONFIGURE_FILE(
- ${CMAKE_CURRENT_SOURCE_DIR}/bbtk-make-index.sh.in
- ${BBTK_BBDOC_BUILD_PATH}/bbtk-make-index
- @ONLY
- )
-CONFIGURE_FILE(
- ${CMAKE_CURRENT_SOURCE_DIR}/bbtk-make-index.sh.in
- ${BBTK_BIN_PATH}/bbtk-make-index
- @ONLY
- )
-INSTALL(
- PROGRAMS ${BBTK_BBDOC_BUILD_PATH}/bbtk-make-index
- DESTINATION bin
- )
+++ /dev/null
-@echo off
-echo "** Recreating bbtk doc index **"
-
-echo EED> "TMP=$(which $0|rev)"
-echo EED>"TMP2=$(echo ${TMP#*/}|rev)"
-echo EED">DIR=${TMP2}/../"
-
-echo "> cd ${DIR}/doc/bbdoc"
-echo cd ${DIR}/doc/bbdoc
-
-echo "> bbi -n ./make-index"
-..\..\bin\bbi -n .\make-index
-..\..\bin\Debug\bbi -n .\make-index
-..\..\bin\Release\bbi -n .\make-index
-
-echo "** Done ! **"
+++ /dev/null
-#!/bin/bash
-# Have to source the bashrc for potential LD_LIBRARY_PATH additions
-# (typical /usr/local install)
-source ${HOME}/.bashrc
-#echo ${LD_LIBRARY_PATH}
-
-echo "** Recreating bbtk doc index **"
-
-TMP=$(which $0|rev)
-BIN=$(echo ${TMP#*/}|rev)
-
-echo "> cd ${BIN}/../@BBTK_BBDOC_REL_PATH@"
-cd ${BIN}/../@BBTK_BBDOC_REL_PATH@
-
-echo "> ${BIN}/bbi -N -q ./make-index"
-${BIN}/bbi -N -q ./make-index
-
-echo "** Done ! **"
+++ /dev/null
-exec freeze
-include *
-index @BBTK_INDEX_ALPHA_FILE@ Initials
-index @BBTK_INDEX_PACKAGES_FILE@ Packages
-index @BBTK_INDEX_CATEGORIES_FILE@ Categories
-index @BBTK_INDEX_ADAPTORS_FILE@ Adaptors
SET(CPACK_STRIP_FILES "bin/bbi")
SET(CPACK_SOURCE_STRIP_FILES "")
ENDIF(WIN32 AND NOT UNIX)
-SET(CPACK_PACKAGE_EXECUTABLES "bbStudio" "bbStudio" "bbPackageBrowser" "bbPackageBrowser" "bbi" "bbInterpreter")
+SET(CPACK_PACKAGE_EXECUTABLES "bbStudio" "bbStudio" "bbPackageBrowser" "bbPackageBrowser" "bbi" "bbInterpreter" "bbRegeneratePackageDoc" "Regenerate packages doc" "bbRegenerateBoxesLists" "Regenerate boxes lists")
INCLUDE(CPack)
Program: bbtk
Module: $RCSfile: bbtkComplexBlackBoxDescriptor.cxx,v $
Language: C++
- Date: $Date: 2008/05/14 10:26:29 $
- Version: $Revision: 1.16 $
+ Date: $Date: 2008/10/08 13:39:33 $
+ Version: $Revision: 1.17 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
if (inc.size()>0)
{
s << "<TR><TD style='vertical-align: top;'><b> To use it </b></TD><TD style='vertical-align: top;'> : </TD><TD style='vertical-align: top;'> include ";
- s << inc << " <a href=\"../../../bbs/"<<inc<<"\">[source]</a>";
+ // s << inc << " <a href=\"../../../bbs/"<<inc<<"\">[source]</a>";
+ // LG TODO : USE PACKAGE BBS PATH
+ s << inc << " <a href=\""<<inc<<"\">[source]</a>";
s << "</TD></TR>\n";
}
Program: bbtk
Module: $RCSfile: bbtkInterpreter.cxx,v $ $
Language: C++
- Date: $Date: 2008/10/08 10:56:27 $
- Version: $Revision: 1.74 $
+ Date: $Date: 2008/10/08 13:39:33 $
+ Version: $Revision: 1.75 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
/**
*
*/
- Interpreter::ExitStatus Interpreter::InterpretFile( const std::string& filename )
+ Interpreter::ExitStatus Interpreter::InterpretFile( const std::string& filename, bool source )
{
bbtkDebugMessageInc("Interpreter",9,"Interpreter::InterpretFile(\""<<filename<<"\")"<<std::endl);
try
{
- SwitchToFile(filename);
+ SwitchToFile(filename,source);
bool insideComment = false; // for multiline comment
while (mFile.size()>0)
case cDefine :
if (mFileName.size()>0)
{
- filename = mIncludeFileName.back(); //Utilities::get_file_name(mFileName.back());
+ filename = mFileName.back(); //mIncludeFileName.back(); //Utilities::get_file_name(mFileName.back());
}
if (words.size()==2)
{
break;
case cInclude :
- if (mCommandLine)
+ // if 'source' was given (words.size()==3) then tell to set the
+ // source file name of the current complex box with the full file name included
+ if (mCommandLine)
{
- InterpretFile(words[1]);
+ InterpretFile(words[1],(words.size()==3));
}
else
{
- SwitchToFile(words[1]);
+ SwitchToFile(words[1],(words.size()==3) );
}
- // if 'source' was given
- if (words.size()==3)
- {
- GetExecuter()->SetCurrentFileName(words[1]);
- }
- break;
+ break;
case cLoad:
GetExecuter()->LoadPackage(words[1]);
*/
// =========================================================================
- void Interpreter::SwitchToFile( const std::string& name )
+ void Interpreter::SwitchToFile( const std::string& name , bool source )
{
// Note : in the following :
// name : the user supplied name
return;
}
else
+ {
LoadScript(fullPathScriptName,name);
+ if (source) GetExecuter()->SetCurrentFileName(fullPathScriptName);
+ }
return;
}
mIncludeFileName.push_back(includeScriptName);
mLine.push_back(0);
- return;
+ return;
}
//=======================================================================
Program: bbtk
Module: $RCSfile: bbtkInterpreter.h,v $ $
Language: C++
- Date: $Date: 2008/10/02 07:43:20 $
- Version: $Revision: 1.33 $
+ Date: $Date: 2008/10/08 13:39:33 $
+ Version: $Revision: 1.34 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
ExitStatus;
/// Runs the interpretation of a file
- ExitStatus InterpretFile( const std::string& filename);
+ ExitStatus InterpretFile( const std::string& filename, bool source = false);
/// Runs the interpretation of a buffer and deletes it !
ExitStatus InterpretBuffer( std::stringstream* buffer );
CommandInfoType& info );
/// Switch to the interpretation of a file
- void SwitchToFile( const std::string& filename );
+ void SwitchToFile( const std::string& filename, bool source = false );
/// Switch to the interpretation of a stringstream
void SwitchToStream( std::stringstream* stream );
Program: bbtk
Module: $RCSfile: bbtkWxGUIHtmlBrowser.cxx,v $
Language: C++
- Date: $Date: 2008/09/10 12:38:24 $
- Version: $Revision: 1.7 $
+ Date: $Date: 2008/10/08 13:39:33 $
+ Version: $Revision: 1.8 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
bool go = true;
if (mUser)
{
+ /*
wxString file = wxPathOnly(mwxURL->GetValue());
file += std2wx(ConfigurationFile::GetInstance().Get_file_separator());
file += e.GetLinkInfo().GetHref();
- go = mUser->WxGUIHtmlBrowserUserOnLinkClicked( wx2std( file ) );
+ */
+ wxString file = e.GetLinkInfo().GetHref();
+ go = mUser->WxGUIHtmlBrowserUserOnLinkClicked( wx2std( file ) );
}
if (go)
{
load wx
load vtk
load std
+load wxvtk
define IsoSurfaceWithControls wxvtk
author "laurent.guigues@creatis.insa-lyon.fr"
load wx
load vtk
load std
+load wxvtk
define MIPWithControls wxvtk
author "laurent.guigues@creatis.insa-lyon.fr"
git://git.creatis.insa-lyon.fr / bbtk.git / commitdiff