Changeset 8200514 in observatorio

Timestamp:

Sep 16, 2014, 10:53:40 AM (10 years ago)

Author:

Alejandro <amujica@…>

Branches:

simulacion

Children:

d715e35

Parents:

121b4d6

Message:

Separado el script de generacion de graficos del wrapper de Python

Location:

simulacion/SimEscenariosEconomicos

Files:

• Makefile (modified) (4 diffs)
• svg_builder.C (modified) (3 diffs)
• svg_builder_canviz.C (added)

simulacion/SimEscenariosEconomicos/Makefile

@@ -29 +29 @@
 SB = svg_builder
 
+SBC = svg_builder_canviz
+
 WRAP = svg_builder_wrap
 
@@ -41 +43 @@
 PREFIX = ecosim_
 
-all: obj gb sim sb
+all: obj gb sim sbc
 
 gb:
@@ -52 +54 @@
         $(CXX) -c $(INCLUDE) $(SB).C $(LIBS) $(FLAGS)
         $(CXX) $(INCLUDE) test_svg_builder.C -o test_svg_builder svg_builder.o $(LIBS) $(XML) $(FLAGS)
+
+sbc:
+        $(CXX) $(INCLUDE) $(SBC).C -o $(SBC) $(LIBS) $(FLAGS)
 
 python: obj
@@ -67 +72 @@
         $(RM) *~ *.o $(SB).py* $(WRAP).*
 clean-all:
-        $(RM) *~ *.o $(SB).py* $(WRAP).* $(PREFIX)$(GB) $(PREFIX)$(SIM) $(SB) $(LOCALLIB)
+        $(RM) *~ *.o $(SBC) $(SB).py* $(WRAP).* $(PREFIX)$(GB) $(PREFIX)$(SIM) $(SB) $(LOCALLIB)
 

simulacion/SimEscenariosEconomicos/svg_builder.C

@@ -41 +41 @@
   std::string strBaseName = baseName;
 
+  std::string dotFileName = strBaseName + ".dot";
+
   std::string svgOutputFileName = strBaseName + ".svg";
 
@@ -58 +60 @@
 
       remove(xmlRoots);
-
-      std::string dotFileName = "temp.dot";
 
       ioManager.generateDot<IOManager::NodeLabel, IOManager::ArcLabel>
@@ -88 +88 @@
       }
 
-      remove(dotFileName.c_str());
-
   } catch (const std::exception & e) {
       std::cout << "Excepción capturada: " << e.what() << std::endl;