Commit 0ea8532b authored by ZHAO Fei's avatar ZHAO Fei

insérer message de commit ici

parent 52ce2907
......@@ -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);
......
#include "simul/main_window.h"
#include "simul/table.h"
#include <QTimer>
......
......@@ -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:
......
......@@ -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)));
......
#include "krabijunior2016.h"
#include "krabijunior2016.h"
KrabiJunior2016::KrabiJunior2016(bool isYellow) : StrategieV3(isYellow)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment