From 0ea8532be741c65038a045c3ee5113c2f64a5a04 Mon Sep 17 00:00:00 2001 From: ZHAO Fei Date: Sun, 20 Mar 2016 15:10:24 +0100 Subject: [PATCH] =?UTF-8?q?ins=C3=A9rer=20message=20de=20commit=20ici?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- stm32/src/simul/element.cpp | 3 +- stm32/src/simul/main_window.cpp | 1 + stm32/src/simul/objet.cpp | 9 ++++- stm32/src/simul/table.cpp | 50 +++++++++++++++++++------ stm32/src/strategie/krabijunior2016.cpp | 2 +- 5 files changed, 50 insertions(+), 15 deletions(-) diff --git a/stm32/src/simul/element.cpp b/stm32/src/simul/element.cpp index 6fbea7e0..03e77cca 100644 --- a/stm32/src/simul/element.cpp +++ b/stm32/src/simul/element.cpp @@ -89,11 +89,12 @@ void Element::paint(QPainter & pa) pa.setBrush(QColor("yellow")); pa.setPen(QColor("yellow")); - pa.drawEllipse(QPoint(p.x,-p.y),100,-100); + pa.drawEllipse(QPoint(p.x,-p.y),100,-100); pa.setBrush(QColor("black")); pa.setPen(QColor("black")); QFont font; + font.setPointSize(30); pa.setFont(font); diff --git a/stm32/src/simul/main_window.cpp b/stm32/src/simul/main_window.cpp index 9492a875..66f1edc0 100644 --- a/stm32/src/simul/main_window.cpp +++ b/stm32/src/simul/main_window.cpp @@ -1,3 +1,4 @@ + #include "simul/main_window.h" #include "simul/table.h" #include diff --git a/stm32/src/simul/objet.cpp b/stm32/src/simul/objet.cpp index 866d7b6b..1af6f129 100644 --- a/stm32/src/simul/objet.cpp +++ b/stm32/src/simul/objet.cpp @@ -177,10 +177,17 @@ case SANDCONE: break; } case SANDCYLINDER: -{ +{ p_color = QColor(232, 140, 0); pa.setBrush(p_color); pa.setPen(p_color); pa.drawEllipse(QPoint(p.x,p.y),29,29); + p_color = QColor(0, 0, 0); + pa.setBrush(p_color); + pa.setPen(p_color); + QRectF rectangle(p.x-29, p.y-29,58,58); + int startAngle = 0 * 16; + int spanAngle = 360 * 16; + pa.drawArc(rectangle, startAngle, spanAngle); break; } case SANDCUBE: diff --git a/stm32/src/simul/table.cpp b/stm32/src/simul/table.cpp index ea1335a2..9c1660c2 100644 --- a/stm32/src/simul/table.cpp +++ b/stm32/src/simul/table.cpp @@ -159,30 +159,56 @@ void Table::createObjects() objets.push_back(new Objet(world, Position(2350.,900.), Objet::SANDCUBE, 0, QColor(232, 140, 0))); - objets.push_back(new Objet(world, Position(1026.,0.), Objet::SANDCUBE, 0, QColor(232, 140, 0))); + objets.push_back(new Objet(world, Position(830.,0.), Objet::SANDCUBE, 0, QColor(232, 140, 0))); - objets.push_back(new Objet(world, Position(1084.,0.), Objet::SANDCUBE, 0, QColor(232, 140, 0))); + objets.push_back(new Objet(world, Position(888.,0.), Objet::SANDCUBE, 0, QColor(232, 140, 0))); - objets.push_back(new Objet(world, Position(1026.,58.), Objet::SANDCUBE, 0, QColor(232, 140, 0))); + objets.push_back(new Objet(world, Position(2113.,58.), Objet::SANDCUBE, 0, QColor(232, 140, 0))); - objets.push_back(new Objet(world, Position(1084.,58.), Objet::SANDCUBE, 0, QColor(232, 140, 0))); + objets.push_back(new Objet(world, Position(2055.,58.), Objet::SANDCUBE, 0, QColor(232, 140, 0))); - objets.push_back(new Objet(world, Position(1860.,8.), Objet::SANDCUBE, 0, QColor(232, 140, 0))); - objets.push_back(new Objet(world, Position(1918.,8.), Objet::SANDCUBE, 0, QColor(232, 140, 0))); - objets.push_back(new Objet(world, Position(1860.,58.), Objet::SANDCUBE, 0, QColor(232, 140, 0))); - objets.push_back(new Objet(world, Position(1918.,58.), Objet::SANDCUBE, 0, QColor(232, 140, 0))); + objets.push_back(new Objet(world, Position(830.,58.), Objet::SANDCUBE, 0, QColor(232, 140, 0))); + objets.push_back(new Objet(world, Position(888.,58.), Objet::SANDCUBE, 0, QColor(232, 140, 0))); + objets.push_back(new Objet(world, Position(2113.,0.), Objet::SANDCUBE, 0, QColor(232, 140, 0))); + objets.push_back(new Objet(world, Position(2055.,0.), Objet::SANDCUBE, 0, QColor(232, 140, 0))); + + objets.push_back(new Objet(world, Position(1471.,0.), Objet::SANDCUBE, 0, QColor(232, 140, 0))); + + objets.push_back(new Objet(world, Position(1413.,0.), Objet::SANDCUBE, 0, QColor(232, 140, 0))); + + objets.push_back(new Objet(world, Position(1355.,0.), Objet::SANDCUBE, 0, QColor(232, 140, 0))); + + objets.push_back(new Objet(world, Position(1297.,0.), Objet::SANDCUBE, 0, QColor(232, 140, 0))); + + objets.push_back(new Objet(world, Position(1239.,0.), Objet::SANDCUBE, 0, QColor(232, 140, 0))); + + objets.push_back(new Objet(world, Position(1529.,0.), Objet::SANDCUBE, 0, QColor(232, 140, 0))); + + objets.push_back(new Objet(world, Position(1587.,0.), Objet::SANDCUBE, 0, QColor(232, 140, 0))); + + objets.push_back(new Objet(world, Position(1645.,0.), Objet::SANDCUBE, 0, QColor(232, 140, 0))); + + objets.push_back(new Objet(world, Position(1703.,0.), Objet::SANDCUBE, 0, QColor(232, 140, 0))); + + objets.push_back(new Objet(world, Position(1471.,58.), Objet::SANDCUBE, 0, QColor(232, 140, 0))); + + objets.push_back(new Objet(world, Position(1413.,58.), Objet::SANDCUBE, 0, QColor(232, 140, 0))); + + objets.push_back(new Objet(world, Position(1529.,58.), Objet::SANDCUBE, 0, QColor(232, 140, 0))); //SANDCYLINDER + objets.push_back(new Objet(world, Position(1500.,145.), Objet::SANDCYLINDER, 0, QColor(232, 140, 0))); objets.push_back(new Objet(world, Position(650.,900.), Objet::SANDCYLINDER, 0, QColor(232, 140, 0))); objets.push_back(new Objet(world, Position(2350.,900.), Objet::SANDCYLINDER, 0, QColor(232, 140, 0))); - /* objets.push_back(new Objet(world, Position(884.,58.), Objet::SANDCYLINDER, 0, QColor(232, 140, 0))); - objets.push_back(new Objet(world, Position(2118.,58.), Objet::SANDCYLINDER, 0, QColor(232, 140, 0)));*/ + objets.push_back(new Objet(world, Position(888.,58.), Objet::SANDCYLINDER, 0, QColor(232, 140, 0))); + objets.push_back(new Objet(world, Position(2113.,58.), Objet::SANDCYLINDER, 0, QColor(232, 140, 0))); //SANDCONE + objets.push_back(new Objet(world, Position(650.,900.), Objet::SANDCONE, 0, QColor(232, 140, 0))); objets.push_back(new Objet(world, Position(2350.,900.), Objet::SANDCONE, 0, QColor(232, 140, 0))); - /*objets.push_back(new Objet(world, Position(884.,58.), Objet::SANDCONE, 0, QColor(232, 140, 0))); - objets.push_back(new Objet(world, Position(2118.,58.), Objet::SANDCONE, 0, QColor(232, 140, 0)));*/ + objets.push_back(new Objet(world, Position(888.,58.), Objet::SANDCONE, 0, QColor(232, 140, 0))); + objets.push_back(new Objet(world, Position(2113.,58.), Objet::SANDCONE, 0, QColor(232, 140, 0))); //PORTE objets.push_back(new Objet(world, Position(0.,0.), Objet::PORTE, 0, QColor(132, 76, 130))); diff --git a/stm32/src/strategie/krabijunior2016.cpp b/stm32/src/strategie/krabijunior2016.cpp index 84d22f0b..27a692a8 100644 --- a/stm32/src/strategie/krabijunior2016.cpp +++ b/stm32/src/strategie/krabijunior2016.cpp @@ -1,4 +1,4 @@ -#include "krabijunior2016.h" + #include "krabijunior2016.h" KrabiJunior2016::KrabiJunior2016(bool isYellow) : StrategieV3(isYellow) -- GitLab