From ad80fda2a9097247bfab4080fcced6fab70c10f5 Mon Sep 17 00:00:00 2001 From: Eduardo Davila Date: Sat, 6 Mar 2010 00:56:41 +0000 Subject: [PATCH] *** empty log message *** --- kernel/src/bbtkComplexBlackBox.cxx | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/kernel/src/bbtkComplexBlackBox.cxx b/kernel/src/bbtkComplexBlackBox.cxx index b8f9990..cc91002 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/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 -- 2.45.1