*** empty log message ***

diff --git a/kernel/appli/bbRegeneratePackageDoc/bbRegeneratePackageDoc.cpp b/kernel/appli/bbRegeneratePackageDoc/bbRegeneratePackageDoc.cpp
index b6a492f735de14b67a0cd250e9a1637abc05b871..6f60f54f67440e40b8fbadf4b70dac2286eae2d0 100644 (file)
--- 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 );"<<std::endl;
+//std::cout<<"JCP bbRegeneratePackageDoc.cpp I->InterpretLine( include );"<<std::endl;
                I->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;"<<std::endl;
+//std::cout<<" if (i->second->GetName()==user) continue;"<<std::endl;
              if (i->second->GetName()=="user") continue;
              RegenerateDoc(i->second,doc_path);
            }

diff --git a/kernel/cmake/BBTKKernelConfig.cmake b/kernel/cmake/BBTKKernelConfig.cmake
index a2a07b0b7d7707ff1efb547dd2cd91d6e56913dc..b3e15ca43fab0308972c7ef31cd748b0e7cec69b 100644 (file)
--- 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 0c65247ce5c68f1034b5d4cda68028dbf4796292..b8f99908663282688e3567f9abfb2c542516017a 100644 (file)
--- 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="<<command1<<std::endl;
     // 2. Executing .dot file -> png
     system( command1.c_str() );   
     // 3. Executing .dot file -> cmap
+       std::cout<<"JCP bbtkComplexBlackBox.cxx execute="<<command1a<<std::endl;
     system( command1a.c_str() );  
     
     // 4. HTML code insertion

diff --git a/kernel/src/bbtkPackage.cxx b/kernel/src/bbtkPackage.cxx
index ecaa1ccacbdf4e86fb2132a7ad8667cbb6806f95..8abe68906c4c81a122b9e0c7193a391caa91d44f 100644 (file)
--- a/kernel/src/bbtkPackage.cxx
+++ b/kernel/src/bbtkPackage.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkPackage.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/06/09 08:42:12 $
-  Version:   $Revision: 1.31 $
+  Date:      $Date: 2009/10/16 08:52:12 $
+  Version:   $Revision: 1.32 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -1130,6 +1130,8 @@ namespace bbtk
     bbtkDebugMessageInc("kernel",9,"Package<"<<GetName()<<">::CreateHtmlPage(\""
                        <<filename<<"\")"<<bbtkendl);
 
+//std::cout<<"JCP bbtkPackage.cxx void Package::CreateHtmlPage() ln 1133"<<std::endl;
+
     //---------------------
     // Open output file
     std::ofstream s;
@@ -1220,7 +1222,7 @@ namespace bbtk
          << bbtk::GetVersion() << "</TD></TR>\n";
        s << "</TABLE>\n";
       }
-
+//std::cout<<"JCP bbtkPackage.cxx void Package::CreateHtmlPage() ln 1225"<<std::endl;
     //-------------------
     // Table of contents
     // Black boxes list
@@ -1231,64 +1233,64 @@ namespace bbtk
     s << "<p><TABLE cellspacing=0  cellpadding=3>\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"<<std::endl;
+    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);
-
-        s << "<TR>";
-       s << "<TD style='vertical-align: top;'>";
-       s << "&nbsp;&nbsp;&nbsp;<a name=\"toc_"<<name
-         <<"\" href=\"#"<<name<<"\">"
-         <<name<<"</a>";
-       s << "</TD> ";
-       s << " <TD style='vertical-align: top;'>" << descr << " </TD>";
-        s << "</TR>\n";
-      }    
-    s << "</TABLE>\n";
-    
-    
-    s << "</ul>\n";
-    s << "</div>\n";
-    
-    //-------------------
-    // Adaptors list
-    if (mAdaptorMap.size()>0) 
-      {
-       //  s << "<div class=\"contents\">\n";
-       s << "<p><b> Adaptors : </b>\n";
-       s << "<ul>\n";
-
-       //    DescriptorMapType::const_iterator i;
-       s << "<p><TABLE cellspacing=0  cellpadding=3>\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"<<std::endl;
+               s << "<TR>";
+               s << "<TD style='vertical-align: top;'>";
+               s << "&nbsp;&nbsp;&nbsp;<a name=\"toc_"<<name
+               <<"\" href=\"#"<<name<<"\">"
+               <<name<<"</a>";
+               s << "</TD> ";
+               s << " <TD style='vertical-align: top;'>" << descr << " </TD>";
+               s << "</TR>\n";
+               }    
+               s << "</TABLE>\n";
+
+
+               s << "</ul>\n";
+               s << "</div>\n";
     
-           std::string name = i->second->GetTypeName();
-           Utilities::html_format(name);
-           std::string descr = i->second->GetDescription();
+               //-------------------
+               // Adaptors list
+               if (mAdaptorMap.size()>0) 
+               {
+                       //  s << "<div class=\"contents\">\n";
+                       s << "<p><b> Adaptors : </b>\n";
+                       s << "<ul>\n";
+//std::cout<<"JCP bbtkPackage.cxx void Package::CreateHtmlPage() ln 1268"<<std::endl;
+                       //    DescriptorMapType::const_iterator i;
+                       s << "<p><TABLE cellspacing=0  cellpadding=3>\n";
+                       for (i=mDescriptorMap.begin(); i!=mDescriptorMap.end();++i) 
+                       {
+                               if ( i->second->GetKind() == BlackBoxDescriptor::STANDARD) 
+                                       continue;
     
-           s << "<TR>";
-           s << "<TD style='vertical-align: top;'>";
-           s << "&nbsp;&nbsp;&nbsp;<a name=\"toc_"<<name
-             <<"\" href=\"#"<<name<<"\">"
-             <<name<<"</a>";
-           s << "</TD> ";
-           s << " <TD style='vertical-align: top;'>" << descr << " </TD>";
-           s << "</TR>\n";
-         }    
-       s << "</TABLE>\n";
-
-       s << "</ul>\n";
-       s << "</div>\n";
-      }
+                               std::string name = i->second->GetTypeName();
+                               Utilities::html_format(name);
+                               std::string descr = i->second->GetDescription();
+                   
+                               s << "<TR>";
+                               s << "<TD style='vertical-align: top;'>";
+                               s << "&nbsp;&nbsp;&nbsp;<a name=\"toc_"<<name
+                                 <<"\" href=\"#"<<name<<"\">"
+                                 <<name<<"</a>";
+                               s << "</TD> ";
+                               s << " <TD style='vertical-align: top;'>" << descr << " </TD>";
+                               s << "</TR>\n";
+                       }    
+                       s << "</TABLE>\n";
+
+                       s << "</ul>\n";
+                       s << "</div>\n";
+               }
     
     
     //  s << "<div class=\"node\">\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 fb74afdc75e94887f9154d3e96548557540cc2b2..f0674b2db32db3a2e97376dc8741dfbd95ea2957 100644 (file)
--- 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);
    }