bray/Projet_VictorAvecUnK
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Lister tortues fonctionne, debut ajouter tortue 2.0

Browse source
This commit is contained in:
Cameron Bray 2020-05-26 17:10:31 +02:00
parent df8d16ef4c
commit 585f568930
3 changed files with 30 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/include/Tortue.h
View file

@ -16,6 +16,8 @@ private:
public: public:
Tortue();
Tortue(const std::string &nom, const std::string &sexe); Tortue(const std::string &nom, const std::string &sexe);
const std::string &getNom() const; const std::string &getNom() const;
@ -27,7 +29,7 @@ public:
void setSexe(const std::string &sexe); void setSexe(const std::string &sexe);
static int getNbTortue(); static int getNbTortue();
int getNaissance() const; std::string getNaissance() const;
int getAge() const; int getAge() const;
const std::string &getSexe() const; const std::string &getSexe() const;

29
app/src/Tortue.cpp
View file

@ -6,32 +6,35 @@
#include "../../core_simulation.h" #include "../../core_simulation.h"
//#include <string> //#include <string>
const std::string &Tortue::getNom() const {
return nom;
}
int Tortue::getNaissance() const { Tortue::Tortue() {}
return naissance;
}
const std::string &Tortue::getSexe() const {
return sexe;
}
Tortue::Tortue(const string &nom, const string &sexe) : nom(nom), sexe(sexe) { Tortue::Tortue(const string &nom, const string &sexe) : nom(nom), sexe(sexe) {
naissance = std::time(nullptr); naissance = std::time(nullptr);
nbTortue ++; nbTortue ++;
} }
int Tortue::getAge() const { /*int Tortue::getAge() const {
int ageSec = std::time(nullptr) - naissance; int ageSec = std::time(nullptr) - naissance;
int ageHour = ageSec/(60*60); int ageHour = ageSec/(60*60);
int ageDay = ageHour/24; int ageDay = ageHour/24;
int age = ageDay / 365.25; int age = ageDay / 365.25;
return age; return age;
} }*/
int Tortue::nbTortue = 0; int Tortue::nbTortue = 0;
const std::string &Tortue::getNom() const {
return nom;
}
string Tortue::getNaissance() const {
return naissance;
}
const std::string &Tortue::getSexe() const {
return sexe;
}
int Tortue::getNbTortue() { int Tortue::getNbTortue() {
return nbTortue; return nbTortue;
} }
@ -57,3 +60,5 @@ void Tortue::setSexe(const string &sexe) {
} }

18
sketch_ino.cpp
View file

@ -43,11 +43,14 @@ void Board::setup(){
tortues.push_back(*(new Tortue("Marvin","male"))); tortues.push_back(*(new Tortue("Marvin","male")));
tortues.push_back(*(new Tortue("Clara","female"))); tortues.push_back(*(new Tortue("Clara","female")));
tortues.push_back(*(new Tortue("Camille","non binary"))); tortues.push_back(*(new Tortue("Camille","non binary")));
tortues.push_back(*(new Tortue("Clarisse","danseuse")));
} }
// la boucle de controle arduino // la boucle de controle arduino
void Board::loop() { void Board::loop() {
char buf[150]; char buf[150];
char inputBuf[150];
static int cpt = 0; static int cpt = 0;
static int bascule = 0; static int bascule = 0;
int i = 0; int i = 0;
@ -68,15 +71,10 @@ void Board::loop() {
pressure->getValue(), pressure->getValue(),
terrarium->getRadState(), terrarium->getRadState(),
terrarium->getTapState(), terrarium->getTapState(),
0); Tortue::getNbTortue());
/*strcpy(buf, menu->displayDefault(temperature.getValue(),
pressure.getValue(),
terrarium.getRadState(),
terrarium.getTapState(),
0).c_str());*/
} else if (menu->getMessage().c_str() != NULL){ } else if (menu->getMessage().c_str() != NULL){
message = menu->getMessage(); message = menu->getMessage();
//strcpy(buf, menu->getMessage().c_str());
} }
if (i % 2 == 0) { if (i % 2 == 0) {
@ -127,7 +125,11 @@ void Board::loop() {
} }
if (menu->getId() == 5){ if (menu->getId() == 5){
Tortue * newTortue; Tortue * newTortue = new Tortue();
while (1){
bus.requestFrom(2,inputBuf,150);
}
cin >> input; cin >> input;
newTortue->setNom(input); newTortue->setNom(input);
tortues.push_back(*newTortue); tortues.push_back(*newTortue);