X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fsrc%2FbbtkComplexBlackBox.cxx;h=3625afdb8705fa9d40da4092c59c5ca6be54ac98;hb=284c682653a60e969e2cff74445702fe54c32a76;hp=05d6923c5591a421a13a348e933c2b4250fc74d6;hpb=5c4a538667f27876a5259ce1478ff809ad2bee6f;p=bbtk.git

diff --git a/kernel/src/bbtkComplexBlackBox.cxx b/kernel/src/bbtkComplexBlackBox.cxx
index 05d6923..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/07/30 15:01:05 $
-  Version:   $Revision: 1.28 $
+  Date:      $Date: 2010/03/19 08:18:41 $
+  Version:   $Revision: 1.32 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -692,15 +692,21 @@ namespace bbtk
     
 
 #ifdef WIN32
-	std::string command1 ("dot -Tpng -o "  
-			  + filename_png2  + " " + filename_dot2 );
+	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
-	std::string command1 ("dot -Tpng:quartz -o "  
-			  + filename_png2  + " " + filename_dot2  );
+  #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
-	
-    std::string command1a("dot -T cmap -o " 
-			  + filename_cmap2 + " " + filename_dot2 );
+
+
+    
 
     // 1. Generating .dot file
     FILE *ff;
@@ -718,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