-/*=========================================================================
+/*
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ # pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ # This software is governed by the CeCILL-B license under French law and
+ # abiding by the rules of distribution of free software. You can use,
+ # modify and/ or redistribute the software under the terms of the CeCILL-B
+ # license as circulated by CEA, CNRS and INRIA at the following URL
+ # http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+ # or in the file LICENSE.txt.
+ #
+ # As a counterpart to the access to the source code and rights to copy,
+ # modify and redistribute granted by the license, users are provided only
+ # with a limited warranty and the software's author, the holder of the
+ # economic rights, and the successive licensors have only limited
+ # liability.
+ #
+ # The fact that you are presently reading this means that you have had
+ # knowledge of the CeCILL-B license and that you accept its terms.
+ # ------------------------------------------------------------------------ */
+
+
+/*=========================================================================
Program: bbtk
Module: $RCSfile: bbtkComplexBlackBox.cxx,v $
Language: C++
- Date: $Date: 2009/10/16 08:52:12 $
- Version: $Revision: 1.30 $
+ Date: $Date: 2012/11/16 08:49:01 $
+ Version: $Revision: 1.33 $
=========================================================================*/
-/* ---------------------------------------------------------------------
-
-* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
-* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
-*
-* This software is governed by the CeCILL-B license under French law and
-* abiding by the rules of distribution of free software. You can use,
-* modify and/ or redistribute the software under the terms of the CeCILL-B
-* license as circulated by CEA, CNRS and INRIA at the following URL
-* http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-* or in the file LICENSE.txt.
-*
-* As a counterpart to the access to the source code and rights to copy,
-* modify and redistribute granted by the license, users are provided only
-* with a limited warranty and the software's author, the holder of the
-* economic rights, and the successive licensors have only limited
-* liability.
-*
-* The fact that you are presently reading this means that you have had
-* knowledge of the CeCILL-B license and that you accept its terms.
-* ------------------------------------------------------------------------ */
/**
#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
fprintf(ff,"}\n");
fclose(ff);
- //std::cout<<"JCP bbtkComplexBlackBox.cxx execute="<<command1<<std::endl;
+ 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 execute="<<command1a<<std::endl;
+ std::cout<<"JCP bbtkComplexBlackBox.cxx execute2="<<command1a<<std::endl;
system( command1a.c_str() );
// 4. HTML code insertion
BlackBoxMapType::const_iterator i;
for ( i = mBlackBoxMap.begin(); i != mBlackBoxMap.end(); ++i )
{
- s += i->second->GetObjectRecursiveSize();
+ s += i->second->GetObjectRecursiveSize();
}
ConnectionListType::const_iterator j;
for ( j = mConnectionList.begin();
j != mConnectionList.end(); ++j )
{
- s += (*j)->GetObjectRecursiveSize();
+ s += (*j)->GetObjectRecursiveSize();
}
return s;
}