#21 risolto il bug per cui erano sempre presenti le misure

lucabeber · Apr 27, 2021 · 2a8a56f · 2a8a56f
1 parent d261af0
commit 2a8a56f
Show file tree

Hide file tree

Showing 9 changed files with 182 additions and 124 deletions.
diff --git a/build/CMakeFiles/mainEntry.dir/CXX.includecache b/build/CMakeFiles/mainEntry.dir/CXX.includecache
@@ -6,15 +6,45 @@
 
 #IncludeRegexTransform: 
 
-../include/pistone.h
+../include/biella.h
+string
+-
+
+../include/manovella.h
 string
 -
 
-/home/luca/compito_1/src/pistone.cpp
+../include/meccanismo.h
 pistone.h
-/home/luca/compito_1/src/pistone.h
+../include/pistone.h
+biella.h
+../include/biella.h
+svg.h
+../include/svg.h
+manovella.h
+../include/manovella.h
+
+../include/pistone.h
+string
+-
+
+../include/svg.h
+string
+-
+
+/home/luca/compito_1/main.cpp
 iostream
 -
 cstring
 -
+pistone.h
+/home/luca/compito_1/pistone.h
+biella.h
+/home/luca/compito_1/biella.h
+svg.h
+/home/luca/compito_1/svg.h
+manovella.h
+/home/luca/compito_1/manovella.h
+meccanismo.h
+/home/luca/compito_1/meccanismo.h
 
diff --git a/build/CMakeFiles/mainEntry.dir/main.cpp.o b/build/CMakeFiles/mainEntry.dir/main.cpp.o
diff --git a/build/CMakeFiles/mainEntry.dir/src/svg.cpp.o b/build/CMakeFiles/mainEntry.dir/src/svg.cpp.o
diff --git a/build/mainEntry b/build/mainEntry
diff --git a/include/svg.h b/include/svg.h
@@ -28,6 +28,6 @@ void svg_to_file(std::string filename, std::string str_svg);
  * 
  *  @return stringa che contiene il svg presente nel file
  */
-std::string read_svg(std::string filename);
+std::string svg_read(std::string filename);
 
 #endif //SVG_H
diff --git a/main.cpp b/main.cpp
@@ -86,12 +86,12 @@ int main() {
             std::cout<<"Inserisci un valore valido"<<std::endl;
             break;
         }
-
+        
         s = "<!--\n Sono presenti " + std::to_string(n) + " meccanismi\n-->\n";
 
         for (int i=0; i<n; i++){
             s += "<!--\n Meccanismo " + std::to_string(i+1) + "\n-->\n";
-            s += meccanismo_svg(arr[i],1);
+            s += meccanismo_svg(arr[i],misure);
             meccanismo_del(arr[i]);
         } 
         delete arr;

diff --git a/mec.svg b/mec.svg
diff --git a/meccanismo.svg b/meccanismo.svg
diff --git a/src/svg.cpp b/src/svg.cpp
@@ -36,10 +36,12 @@ void svg_to_file (string filename, string str_svg){
     // scrivo all'interno del file la stringa svg
     MyFile << str_svg;
 
+    cout << "Il file " << filename << " e` stato creato ed e' stato scritto al suo interno" << endl;
+
     MyFile.close();
 }
 
-string read_svg (string filename){
+string svg_read (string filename){
 
     std::ifstream t(filename);
     std::stringstream buffer;
@@ -48,7 +50,6 @@ string read_svg (string filename){
     string s = buffer.str();
 
     cout << "Il file " << filename << " e` stato letto" << endl;
-    cout << s << endl;
 
     return s;
 }