Commit b642d1e6 authored by Leander Schulten's avatar Leander Schulten
Browse files

Merge branch 'development' into QT_QUICK_APP

parents b6bb37c2 083d6941
......@@ -89,7 +89,7 @@ public:
bool getIntervall()const{return intervall;}
double distort(double time){
double diff = std::fmodf(time,intervall); // wie weit sind wir in aktuellen intervall
double diff = std::fmod(time,intervall); // wie weit sind wir in aktuellen intervall
double offset = time-diff; // offset zum intervall start
diff = distortionCurve.valueForProgress(diff/intervall)*intervall;// die verzerrung für den Aktuellen fortchritt im intervall mal die intervall größe
return offset+diff; // den offset plus der verzerrte Fortschritt im intervall
......@@ -7,8 +7,8 @@ UserManagment::UserManagment(const QJsonObject &o){
void UserManagment::load(const QJsonObject &o){
for(const auto o : o["user"].toArray()){
user.push_back(new User(o.toObject()));
for(const auto u : o["user"].toArray()){
user.push_back(new User(u.toObject()));
Supports Markdown
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