diff --git a/stm32/src/simul/element.cpp b/stm32/src/simul/element.cpp index 6fbea7e071ad97c092fa36c4f1ca5549d9946c79..03e77cca8b6745df6894f8645687584884504c49 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 9492a8752f129bd16c8eeac138596ba023e5af94..66f1edc006c8efcb91244ce40870ed53e8b0b08f 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 866d7b6b0816b40330666724d1bd4697bae64b99..1af6f1295c52ef5a215a48100f33715afbca6573 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 ea1335a259a34bc87da2f1b8d5f863cd157bbbfb..9c1660c2c98ae32c14f1395582798a70d29c902f 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 84d22f0b3c96280e37114443ef158ba05e4149a9..27a692a8c5c4f3ef17acbe1dc0b704bcef2c74d2 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)