X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkComplexBlackBox.cxx;h=3625afdb8705fa9d40da4092c59c5ca6be54ac98;hb=bafc00d3eee5ab3c580e0971cb2d8806b5c74f35;hp=c5465ca142c722cd3b29eb96c87a29e16e069368;hpb=8c690fedb5ea897b6a69584e1e237cb5dbad97a5;p=bbtk.git

diff --git a/kernel/src/bbtkComplexBlackBox.cxx b/kernel/src/bbtkComplexBlackBox.cxx
index c5465ca..3625afd 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/05/28 08:12:05 $
-  Version:   $Revision: 1.27 $
+  Date:      $Date: 2010/03/19 08:18:41 $
+  Version:   $Revision: 1.32 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -691,10 +691,22 @@ namespace bbtk
     std::string filename_dot2	("\""	+ filename_dot	+ "\"");
     
 
-    std::string command1 ("dot -Tpng:quartz -o "  
-			  + filename_png2  + " " + filename_dot2 );
-    std::string command1a("dot -T cmap -o " 
-			  + filename_cmap2 + " " + filename_dot2 );
+#ifdef WIN32
+	std::string currentexecpath("\"\"" + crea::System::GetDllAppPath("bbtk") +"\\dot_embedded\\dot\"");	
+	std::string command1 (currentexecpath + " -Tpng -o " + filename_png2  + " " + filename_dot2 + "\"");
+	std::string command1a(currentexecpath + " -T cmap -o " + filename_cmap2 + " " + filename_dot2 + "\"");		
+#else
+  #ifdef APPLE
+	std::string command1 ("dot -Tpng:quartz -o " + filename_png2  + " " + filename_dot2  );
+	std::string command1a("dot -T cmap -o " + filename_cmap2 + " " + filename_dot2 );
+  #else
+	std::string command1 ("dot -Tpng:cairo -o " + filename_png2  + " " + filename_dot2  );
+	std::string command1a("dot -T cmap -o " + filename_cmap2 + " " + filename_dot2 );
+  #endif
+#endif
+
+
+    
 
     // 1. Generating .dot file
     FILE *ff;
@@ -712,9 +724,11 @@ namespace bbtk
     fprintf(ff,"}\n");
     fclose(ff);
 
+	std::cout<<"JCP bbtkComplexBlackBox.cxx execute1="<<command1<<std::endl;
     // 2. Executing .dot file -> png
     system( command1.c_str() );   
     // 3. Executing .dot file -> cmap
+	std::cout<<"JCP bbtkComplexBlackBox.cxx execute2="<<command1a<<std::endl;
     system( command1a.c_str() );  
     
     // 4. HTML code insertion