projects
/
speedfreak
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Conflict solved: mainwindow.cpp and calculate.cpp
[speedfreak]
/
Client
/
routesavedialog.cpp
diff --git
a/Client/routesavedialog.cpp
b/Client/routesavedialog.cpp
index
3119b30
..
bd6b9fc
100644
(file)
--- a/
Client/routesavedialog.cpp
+++ b/
Client/routesavedialog.cpp
@@
-149,6
+149,7
@@
void RouteSaveDialog::changeEvent(QEvent *e)
/**
* Draws compass to the UI
/**
* Draws compass to the UI
+ *
* @param QPaintEvent
*/
void RouteSaveDialog::paintEvent(QPaintEvent *)
* @param QPaintEvent
*/
void RouteSaveDialog::paintEvent(QPaintEvent *)
@@
-435,6
+436,9
@@
void RouteSaveDialog::gpsStatus()
/**
* This slot function is called when routeDialog emit sendroute (sendPushButton).
/**
* This slot function is called when routeDialog emit sendroute (sendPushButton).
+ *
+ * @param QString new name
+ * @param int i
*/
void RouteSaveDialog::sendRoute(QString newName, int i)
{
*/
void RouteSaveDialog::sendRoute(QString newName, int i)
{
@@
-488,6
+492,7
@@
void RouteSaveDialog::killRouteDialog()
/**
* This function return speed average.
/**
* This function return speed average.
+ *
* @return double average speed
*/
double RouteSaveDialog::getAverageSpeed()
* @return double average speed
*/
double RouteSaveDialog::getAverageSpeed()
@@
-497,6
+502,7
@@
double RouteSaveDialog::getAverageSpeed()
/**
* This function return distance traveled in QString.
/**
* This function return distance traveled in QString.
+ *
* @return QString distance traveled
*/
QString RouteSaveDialog::getDistanceTraveled()
* @return QString distance traveled
*/
QString RouteSaveDialog::getDistanceTraveled()
@@
-505,7
+511,9
@@
QString RouteSaveDialog::getDistanceTraveled()
}
/**
}
/**
- * This function
+ * This function set progressbar
+ *
+ * @param int i
*/
void RouteSaveDialog::setProgressbar(int i)
{
*/
void RouteSaveDialog::setProgressbar(int i)
{
@@
-527,7
+535,6
@@
void RouteSaveDialog::on_buttonLoadRoute_clicked()
/**
* This function open and show route.
/**
* This function open and show route.
- * @param QString file name
*/
void RouteSaveDialog::openRouteDialog()
{
*/
void RouteSaveDialog::openRouteDialog()
{