From 49b815a6db0b8b3c070a00993afcf820e3fd2c78 Mon Sep 17 00:00:00 2001
From: trotFunky <teo.couprie_diaz@telecom-sudparis.eu>
Date: Tue, 21 May 2019 12:48:08 +0200
Subject: [PATCH] Correct indent for printing

---
 snippets/CMakeLists.txt      | 1 -
 xmlParser/Circle.cpp         | 7 ++++++-
 xmlParser/Circle.h           | 2 +-
 xmlParser/DrawingElement.cpp | 9 +++++++--
 xmlParser/DrawingElement.h   | 3 ++-
 xmlParser/Group.cpp          | 9 +++++++--
 xmlParser/Group.h            | 2 +-
 7 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/snippets/CMakeLists.txt b/snippets/CMakeLists.txt
index a03ef56..e15085c 100644
--- a/snippets/CMakeLists.txt
+++ b/snippets/CMakeLists.txt
@@ -40,7 +40,6 @@ endif()
 add_executable(compte_mots compte_mots.cpp)
 
 add_library(polynomial SHARED Polynomial.cpp Polynomial.tpp)
-#target_link_libraries(polynomial -static)
 
 if(GTest_FOUND)
     add_executable(polynomialTest gTestPolynomial.cpp)
diff --git a/xmlParser/Circle.cpp b/xmlParser/Circle.cpp
index d320994..338ed92 100644
--- a/xmlParser/Circle.cpp
+++ b/xmlParser/Circle.cpp
@@ -42,9 +42,14 @@ namespace xmlParser
         shape->setPosition(x-r,y-r);
     }
 
-    const std::string Circle::toString() const
+    const std::string Circle::toString(int indent) const
     {
         std::stringstream string;
+        for(int i = 0;i<indent;i++)
+        {
+            string << "\t";
+        }
+
         string << label << " at x:" << getX() << " y:" << getY() << " | r:" << getR();
         string << " color:" << getStringColor();
         return(string.str());
diff --git a/xmlParser/Circle.h b/xmlParser/Circle.h
index 2211297..d7fc924 100644
--- a/xmlParser/Circle.h
+++ b/xmlParser/Circle.h
@@ -31,7 +31,7 @@ namespace xmlParser
         float getR() const;
         void setR(float newR);
 
-        const std::string toString() const override;
+        const std::string toString(int indent) const override;
     private:
         float r;
     };
diff --git a/xmlParser/DrawingElement.cpp b/xmlParser/DrawingElement.cpp
index fd3476c..8c83d87 100644
--- a/xmlParser/DrawingElement.cpp
+++ b/xmlParser/DrawingElement.cpp
@@ -83,9 +83,14 @@ namespace xmlParser
         color = strToColor(stringColor);
     }
 
-    const std::string DrawingElement::toString() const
+    const std::string DrawingElement::toString(int indent) const
     {
         std::stringstream string;
+        for(int i = 0;i<indent;i++)
+        {
+            string << "\t";
+        }
+
         string << label << " at x:" << getX() << " y:" << getY();
         string << " | color:" << getStringColor();
         return(string.str());
@@ -93,7 +98,7 @@ namespace xmlParser
 
     std::ostream& operator<<(std::ostream& ostream, const DrawingElement& element)
     {
-        ostream << element.toString();
+        ostream << element.toString(0);
         return(ostream);
     }
 }
\ No newline at end of file
diff --git a/xmlParser/DrawingElement.h b/xmlParser/DrawingElement.h
index acb5356..8a6e4f0 100644
--- a/xmlParser/DrawingElement.h
+++ b/xmlParser/DrawingElement.h
@@ -20,6 +20,7 @@ namespace xmlParser
     {
     public:
 
+        // TODO : S'arranger pour n'avoir que des constructeurs sensés : pas de constructeur vide/résultat non évident
         explicit DrawingElement(std::string label = "Test DrawingElement", float x = 0, float y = 1,
                 const sf::Color& = sf::Color::Yellow);
 
@@ -41,7 +42,7 @@ namespace xmlParser
         void setColor(const sf::Color& newColor);
         void setColor(const std::string& stringColor);
 
-        virtual const std::string toString() const;
+        virtual const std::string toString(int indent) const;
 
         friend std::ostream& operator<<(std::ostream&,const DrawingElement&);
 
diff --git a/xmlParser/Group.cpp b/xmlParser/Group.cpp
index 9ac432f..08a2e6d 100644
--- a/xmlParser/Group.cpp
+++ b/xmlParser/Group.cpp
@@ -69,15 +69,20 @@ namespace xmlParser
         }
     }
 
-    const std::string Group::toString() const
+    const std::string Group::toString(int indent) const
     {
         std::stringstream string;
+        for(int i = 0;i<indent;i++)
+        {
+            string << "\t";
+        }
+
         string << label << " at x:" << getX() << " y:" << getY();
         string << " color:" << getStringColor() << std::endl;
 
         for(const auto& element : drawingElements)
         {
-            string << "\t" << *(element.second) << std::endl;
+            string << element.second->toString(indent+1) << std::endl;
         }
         return(string.str());
     }
diff --git a/xmlParser/Group.h b/xmlParser/Group.h
index 99c7a42..f1c9141 100644
--- a/xmlParser/Group.h
+++ b/xmlParser/Group.h
@@ -34,7 +34,7 @@ namespace xmlParser
 
         void draw(sf::RenderWindow&) override;
 
-        const std::string toString() const override;
+        const std::string toString(int indent) const override;
     private:
         std::map<std::string,DrawingElement*> drawingElements;
     };