]> Creatis software - bbtk.git/commitdiff
*** empty log message ***
authorEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Sat, 6 Mar 2010 00:56:41 +0000 (00:56 +0000)
committerEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Sat, 6 Mar 2010 00:56:41 +0000 (00:56 +0000)
kernel/src/bbtkComplexBlackBox.cxx

index b8f99908663282688e3567f9abfb2c542516017a..cc9100200841d5a1b1a34d0d994229979ce60945 100644 (file)
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkComplexBlackBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/10/16 08:52:12 $
-  Version:   $Revision: 1.30 $
+  Date:      $Date: 2010/03/06 00:56:41 $
+  Version:   $Revision: 1.31 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -692,21 +692,17 @@ namespace bbtk
     
 
 #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 + "\"");               
-
+       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  );
-       std::string command1a("dot -T cmap -o " 
-                         + filename_cmap2 + " " + 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