diff --git a/main.cpp b/main.cpp index fd3e533..4b6acc2 100644 --- a/main.cpp +++ b/main.cpp @@ -1,11 +1,14 @@ #include "mainwindow.h" #include +#include int main(int argc, char *argv[]) { QApplication a(argc, argv); MainWindow w; w.show(); + + return a.exec(); } diff --git a/step.cpp b/step.cpp index 1e80c51..17f2edc 100644 --- a/step.cpp +++ b/step.cpp @@ -7,7 +7,20 @@ Step::Step() { } Step::Step(QTextStream &in) -{} +{ + int stepNumber; + in >> stepNumber; + in.readLine(); + title = in.readLine(); + QChar latDir, lonDir; + int latDeg, lonDeg; + float latMin, lonMin; + in >> latDir >> latDeg >> latMin >> lonDir >> lonDeg >> lonMin; + setLatitude(latDeg, latMin, latDir); + setLongitude(lonDeg, lonMin, lonDir); + in >> response; + in.readLine(); +} void Step::setLatitude(int degree, float minute, QChar NS) { latitude = degree + minute / 60.0;