Fix gitignore merge

1 files changed, 32 insertions, 0 deletions

diff --git a/cercle.cpp b/cercle.cpp
new file mode 100644
index 0000000..bd3c876
--- /dev/null
+++ b/cercle.cpp
@@ -0,0 +1,32 @@
+#include "cercle.h"
+#include <math.h>
+
+Cercle::Cercle(int x, int y, int r):Forme(x,y) {
+  setRayon(r);
+};
+
+Cercle::~Cercle() {
+};
+
+void Cercle::setRayon(int r) {
+  rayon = r;
+};
+
+int Cercle::getRayon() {
+  return rayon;
+};
+
+double Cercle::aire() {
+  return M_PI*pow(rayon,2);
+};
+
+double Cercle::getPerimetre() {
+  return 2*M_PI*rayon;
+};
+
+void Cercle::afficher(ostream & s) {
+  s << "Cercle (x=" << getAncrage().x
+    << ", y="       << getAncrage().y
+    << ", r="       << getRayon()
+    << ", aire="    << aire() << ")\n";
+};