From: Juan Prieto Date: Fri, 16 Oct 2009 08:52:10 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: CREATOOLS.2-0-3~122 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=d6a3121dd19dec63c484cd1eeeda57bd7edb8442;p=bbtk.git *** empty log message *** --- diff --git a/kernel/appli/bbRegeneratePackageDoc/bbRegeneratePackageDoc.cpp b/kernel/appli/bbRegeneratePackageDoc/bbRegeneratePackageDoc.cpp index b6a492f..6f60f54 100644 --- a/kernel/appli/bbRegeneratePackageDoc/bbRegeneratePackageDoc.cpp +++ b/kernel/appli/bbRegeneratePackageDoc/bbRegeneratePackageDoc.cpp @@ -90,14 +90,14 @@ int main(int argc, char **argv) } else { -std::cout<<"JCP bbRegeneratePackageDoc.cpp I->InterpretLine( include );"<InterpretLine( include );"<InterpretLine( "include *"); bbtk::Factory::PackageMapType::const_iterator i; for (i = I->GetExecuter()->GetFactory()->GetPackageMap().begin(); i != I->GetExecuter()->GetFactory()->GetPackageMap().end(); ++i) { -std::cout<<" if (i->second->GetName()==user) continue;"<second->GetName()==user) continue;"<second->GetName()=="user") continue; RegenerateDoc(i->second,doc_path); } diff --git a/kernel/cmake/BBTKKernelConfig.cmake b/kernel/cmake/BBTKKernelConfig.cmake index a2a07b0..b3e15ca 100644 --- a/kernel/cmake/BBTKKernelConfig.cmake +++ b/kernel/cmake/BBTKKernelConfig.cmake @@ -20,7 +20,7 @@ IF(WIN32) # OR APPLE) SET (EXECUTABLE_OUTPUT_REL_PATH "") SET (LIBRARY_OUTPUT_REL_PATH "") IF(WIN32) - SET (ADDITIONAL_DLL_PATH "C:/Program Files/CreaTools/crea_ThirdParty_dlls-0.2.0/bin" CACHE PATH "Additional paths in which to look for dlls") + SET (ADDITIONAL_DLL_PATH "C:/Program Files/CreaTools/crea_ThirdParty_dlls-3.0.0/bin" CACHE PATH "Additional paths in which to look for dlls") ENDIF(WIN32) ELSE(WIN32) # OR APPLE) SET (EXECUTABLE_OUTPUT_REL_PATH bin) diff --git a/kernel/src/bbtkComplexBlackBox.cxx b/kernel/src/bbtkComplexBlackBox.cxx index 0c65247..b8f9990 100644 --- a/kernel/src/bbtkComplexBlackBox.cxx +++ b/kernel/src/bbtkComplexBlackBox.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkComplexBlackBox.cxx,v $ Language: C++ - Date: $Date: 2009/10/05 22:44:48 $ - Version: $Revision: 1.29 $ + Date: $Date: 2009/10/16 08:52:12 $ + Version: $Revision: 1.30 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -693,12 +693,13 @@ namespace bbtk #ifdef WIN32 - std::string currentexecpath( crea::System::GetDllAppPath("bbtk") +"\\dot_embedded\\"); - std::string command1 (currentexecpath + "dot -Tpng -o " - + filename_png2 + " " + filename_dot2 ); + std::string currentexecpath("\"\"" + crea::System::GetDllAppPath("bbtk") +"\\dot_embedded\\dot\""); - std::string command1a(currentexecpath + "dot -T cmap -o " - + filename_cmap2 + " " + filename_dot2 ); + std::string command1 (currentexecpath + " -Tpng -o " + + filename_png2 + " " + filename_dot2 + "\""); + + std::string command1a(currentexecpath + " -T cmap -o " + + filename_cmap2 + " " + filename_dot2 + "\""); #else std::string command1 ("dot -Tpng:quartz -o " @@ -727,9 +728,11 @@ namespace bbtk fprintf(ff,"}\n"); fclose(ff); + //std::cout<<"JCP bbtkComplexBlackBox.cxx execute="< png system( command1.c_str() ); // 3. Executing .dot file -> cmap + std::cout<<"JCP bbtkComplexBlackBox.cxx execute="<::CreateHtmlPage(\"" <\n"; s << "\n"; } - +//std::cout<<"JCP bbtkPackage.cxx void Package::CreateHtmlPage() ln 1225"<\n"; DescriptorMapType::const_iterator i; - for (i=mDescriptorMap.begin(); i!=mDescriptorMap.end(); ++i) - { - if ( i->second->GetKind() != BlackBoxDescriptor::STANDARD) - continue; +//std::cout<<"JCP bbtkPackage.cxx void Package::CreateHtmlPage() ln 1236"<second->GetKind() != BlackBoxDescriptor::STANDARD) + continue; - std::string name = i->second->GetTypeName(); - Utilities::html_format(name); - std::string descr = i->second->GetDescription(); - //Utilities::html_format(descr); - - s << ""; - s << " "; - s << " "; - s << "\n"; - } - s << "
"; - s << "   " - <"; - s << "" << descr << "
\n"; - - - s << "\n"; - s << "\n"; - - //------------------- - // Adaptors list - if (mAdaptorMap.size()>0) - { - // s << "
\n"; - s << "

Adaptors : \n"; - s << "

    \n"; - - // DescriptorMapType::const_iterator i; - s << "

    \n"; - for (i=mDescriptorMap.begin(); i!=mDescriptorMap.end();++i) - { - if ( i->second->GetKind() == BlackBoxDescriptor::STANDARD) - continue; + std::string name = i->second->GetTypeName(); + Utilities::html_format(name); + std::string descr = i->second->GetDescription(); + //Utilities::html_format(descr); +//std::cout<<"JCP bbtkPackage.cxx void Package::CreateHtmlPage() ln 1246"<"; + s << " "; + s << " "; + s << "\n"; + } + s << "
    "; + s << "   " + <"; + s << "" << descr << "
    \n"; + + + s << "

\n"; + s << "
\n"; - std::string name = i->second->GetTypeName(); - Utilities::html_format(name); - std::string descr = i->second->GetDescription(); + //------------------- + // Adaptors list + if (mAdaptorMap.size()>0) + { + // s << "
\n"; + s << "

Adaptors : \n"; + s << "

    \n"; +//std::cout<<"JCP bbtkPackage.cxx void Package::CreateHtmlPage() ln 1268"<\n"; + for (i=mDescriptorMap.begin(); i!=mDescriptorMap.end();++i) + { + if ( i->second->GetKind() == BlackBoxDescriptor::STANDARD) + continue; - s << ""; - s << " "; - s << " "; - s << "\n"; - } - s << "
    "; - s << "   " - <"; - s << "" << descr << "
    \n"; - - s << "
\n"; - s << "
\n"; - } + std::string name = i->second->GetTypeName(); + Utilities::html_format(name); + std::string descr = i->second->GetDescription(); + + s << ""; + s << ""; + s << "   " + <"; + s << " "; + s << " " << descr << " "; + s << "\n"; + } + s << "\n"; + + s << "\n"; + s << "\n"; + } // s << "
\n"; @@ -1307,23 +1309,23 @@ namespace bbtk //------------------- // Computes output directory from filename to pass it to // BlackBoxDescriptor::InsertHtmlHelp - std::string dir; + std::string dir; - std::string::size_type slash_position = filename.find_last_of("/\\"); + std::string::size_type slash_position = filename.find_last_of("/\\"); - if (slash_position != std::string::npos) { - if (slash_position == 0) - slash_position = 1; - dir = filename.substr(0,slash_position); - } + if (slash_position != std::string::npos) { + if (slash_position == 0) + slash_position = 1; + dir = filename.substr(0,slash_position); + } - for (i=mDescriptorMap.begin(); - i!=mDescriptorMap.end(); - ++i) - { - i->second->InsertHtmlHelp(s,detail,level,dir,relative_link); - } + for (i=mDescriptorMap.begin(); + i!=mDescriptorMap.end(); + ++i) + { + i->second->InsertHtmlHelp(s,detail,level,dir,relative_link); + } //---------------------- // Footer diff --git a/packages/vtk/src/bbvtkVolumeRenderer.cxx b/packages/vtk/src/bbvtkVolumeRenderer.cxx index fb74afd..f0674b2 100644 --- a/packages/vtk/src/bbvtkVolumeRenderer.cxx +++ b/packages/vtk/src/bbvtkVolumeRenderer.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbvtkVolumeRenderer.cxx,v $ Language: C++ - Date: $Date: 2009/08/07 15:06:26 $ - Version: $Revision: 1.4 $ + Date: $Date: 2009/10/16 08:52:13 $ + Version: $Revision: 1.5 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -58,6 +58,7 @@ namespace bbvtk mMapper = NULL; mVolume = NULL; bbSetInputColorFunction(0); + bbSetInputColorFunction1(0); bbSetInputOpacityFunction(0); }