Merged the version from lab07 into this one. Commented in Spanish and English. Removed (most of) the dead functions.

Testing.pro

@@ -25,3 +25,4 @@ FORMS    += mainwindow.ui
 
 RESOURCES += \
     images.qrc
+

functions.cpp

@@ -1,3 +1,5 @@
+// RAN - 2015-06-26 - Fixed the issue with the leading zeros in Zulu
+
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 
@@ -14,6 +16,7 @@
 #include <unistd.h>
 #endif
 
+
 // =========================================================
 // Sort Functions
 // =========================================================
@@ -108,362 +111,97 @@ void mySortDelta(QString &a, QString &b, QString &c) {
 }
 
 
-//This is the correct dice roller
-void MainWindow::diceAlpha(){
-    QString a, b;
-
-    //This loop is used to simulate the dice rolling by
-    //changing the images at a slowing down speed
-    for (int i = 0; i<=150000 ; i=i+5000){
-
-#ifdef _WIN32
-        Sleep(i);
-#else
-        usleep(i);
-#endif
-
-        //First dice image. Since we want random pictures
-        //on each iteration, we get a random number, converted
-        //it to string and append it to others string that
-        //conform the names of the dices
-        a = ":/images/resources/d";
-        a.append(QString::number(rand()%6 + 1));
-        a.append(".png");
-
-        b = ":/images/resources/d";
-        b.append(QString::number(rand()%6 + 1));
-        b.append(".png");
-
-        //We load the images and check if there is no problem with them
-        if(!dice1.load(a) || !dice2.load(b)){
-            qDebug() << "Error2 Loading image";
-        }
-
-        //Finally we set the labels with the random dice images
-        label[3]->setPixmap(QPixmap::fromImage(dice1));
-        label[4]->setPixmap(QPixmap::fromImage(dice2));
-
-// Is there an option to see the changes of the dice/label
-// in this function and no just when we get out of it?
-
-//        Fail attempts
-//        layout->update();
-//        repaint();
-//        window->repaint();
-
-//        label[3]->repaint();
-//        label[3]->update();
-//        label[3]->hide();
-//        label[3]->show();
-//        label[3]->setVisible(false);
-//        label[3]->setVisible(true);
-
-//        layout->update();
-//        update();
-//        window->update();
-
-        window->hide();
-        window->show();
-    }
-
-    //Finally, we set the result of the sum of the dices.
-    QString a2 = (QString)a[20];
-    QString b2 = (QString)b[20];
-    int total = a2.toInt() + b2.toInt();
-    line[0]->setText(QString::number(total));
-}
-
-//This version sums the first dice twice
-void MainWindow::diceBeta(){
-    QString a, b;
-
-    for (int i = 0; i<=150000 ; i=i+5000){
-#ifdef _WIN32
-        Sleep(i);
-#else
-        usleep(i);
-#endif
-        a = ":/images/resources/d";
-        a.append(QString::number(rand()%6 + 1));
-        a.append(".png");
-
-        b = ":/images/resources/d";
-        b.append(QString::number(rand()%6 + 1));
-        b.append(".png");
-
-        if(!dice1.load(a) || !dice2.load(b)){
-            qDebug() << "Error2 Loading image";
-        }
-
-        label[3]->setPixmap(QPixmap::fromImage(dice1));
-        label[4]->setPixmap(QPixmap::fromImage(dice2));
-
-// Is there an option to see the changes of the dice/label
-// in this function and no just when we get out of it?
-        window->hide();
-        window->show();
-    }
-
-    int total = a[20].digitValue() + a[20].digitValue();
-    line[0]->setText(QString::number(total));
-}
-
-//This one substracts the second dice to the first one
-void MainWindow::diceGamma(){
-    QString a, b;
-
-    for (int i = 0; i<=150000 ; i=i+5000){
-#ifdef _WIN32
-        Sleep(i);
-#else
-        usleep(i);
-#endif
-        a = ":/images/resources/d";
-        a.append(QString::number(rand()%6 + 1));
-        a.append(".png");
-
-        b = ":/images/resources/d";
-        b.append(QString::number(rand()%6 + 1));
-        b.append(".png");
-
-        if(!dice1.load(a) || !dice2.load(b)){
-            qDebug() << "Error2 Loading image";
-        }
-
-        label[3]->setPixmap(QPixmap::fromImage(dice1));
-        label[4]->setPixmap(QPixmap::fromImage(dice2));
-
-// Is there an option to see the changes of the dice/label
-// in this function and no just when we get out of it?
-        window->hide();
-        window->show();
-    }
-
-    QString a2 = (QString)a[20];
-    QString b2 = (QString)b[20];
-    int total = a2.toInt() - b2.toInt();
-    line[0]->setText(QString::number(total));
-}
-
-//This one tooks the number 6 as a 12
-void MainWindow::diceDelta(){
-    QString a, b;
-
-    for (int i = 0; i<=150000 ; i=i+5000){
-#ifdef _WIN32
-        Sleep(i);
-#else
-        usleep(i);
-#endif
-        a = ":/images/resources/d";
-        a.append(QString::number(rand()%6 + 1));
-        a.append(".png");
-
-        b = ":/images/resources/d";
-        b.append(QString::number(rand()%6 + 1));
-        b.append(".png");
 
-        if(!dice1.load(a) || !dice2.load(b)){
-            qDebug() << "Error2 Loading image";
-        }
-
-        label[3]->setPixmap(QPixmap::fromImage(dice1));
-        label[4]->setPixmap(QPixmap::fromImage(dice2));
-
-// Is there an option to see the changes of the dice/label
-// in this function and no just when we get out of it?
-        window->hide();
-        window->show();
-    }
-
-    int x, y;
-    QString a2 = (QString)a[20];
-    QString b2 = (QString)b[20];
-    if (a2.toInt() == 6){
-        x = 12;
-    }
-    else{
-        x = a2.toInt();
-    }
-    if (b2.toInt() == 6){
-        y = 12;
-    }
-    else{
-        y = b2.toInt();
-    }
-
-    int total = x + y;
-    line[0]->setText(QString::number(total));
-}
 
 // =========================================================
 // Rock Paper Scissor Functions
 // =========================================================
 
 
-///
-/// \brief RPSAlpha
-/// \param p1
-/// \param p2
-/// \param score1
-/// \param score2
-/// \return
-///
-
-int RPSAlpha(char p1, char p2, int &score1, int &score2) {
+int RPSAlpha(char p1, char p2) {
     p1 = toupper(p1);
     p2 = toupper(p2);
     if ( p1 == 'P' ) {
-        if ( p2 == 'P' ) return 0;
-        else if (p2 == 'R') {
-            score1++; return 1;
-        }
-        else {
-            score2++; return 2;
-        }
+        if ( p2 == 'P' )    return TIE;
+        else if (p2 == 'R') return P1_WON;
+        else                return P2_WON;
     }
+
     else if (p1 == 'R') {
-        if ( p2 == 'R' ) return 0;
-        else if (p2 == 'S') {
-            score1++;    return 1;
-        }
-        else {
-            score2++;    return 2;
-        }
+        if ( p2 == 'R' )    return TIE;
+        else if (p2 == 'S') return P1_WON;
+        else                return P2_WON;
     }
+
     else {
-        if ( p2 == 'S' ) return 0;
-        else if (p2 == 'P') {
-            score1++;    return 1;
-        }
-        else {
-            score2++;    return 2;
-        }
+        if ( p2 == 'S' )    return TIE;
+        else if (p2 == 'P') return P1_WON;
+        else                return P2_WON;
     }
 }
 
 
-///
-/// \brief RPSBeta
-/// \param p1
-/// \param p2
-/// \param score1
-/// \param score2
-/// \return
-///
-
-int RPSBeta(char p1, char p2, int &score1, int &score2) {
+int RPSBeta(char p1, char p2) {
     p1 = toupper(p1);
     p2 = toupper(p2);
     if ( p1 == 'P' ) {
-        if ( p2 == 'S' ) return 0;
-        else if (p2 == 'R') {
-            score1++; return 1;
-        }
-        else {
-            score2++; return 2;
-        }
+        if ( p2 == 'S' )    return TIE;
+        else if (p2 == 'R') return P1_WON;
+        else                return P2_WON;
     }
     else if (p1 == 'R') {
-        if ( p2 == 'S' ) return 0;
-        else if (p2 == 'P') {
-            score1++;    return 1;
-        }
-        else {
-            score2++;    return 2;
-        }
+        if ( p2 == 'S' )    return TIE;
+        else if (p2 == 'P') return P1_WON;
+        else                return P2_WON;
     }
+
     else {
-        if ( p2 == 'S' ) return 0;
-        else if (p2 == 'R') {
-            score1++;    return 1;
-        }
-        else {
-            score2++;    return 2;
-        }
+        if ( p2 == 'S' )    return TIE;
+        else if (p2 == 'R') return P1_WON;
+        else                return P2_WON;
     }
 }
 
 
-///
-/// \brief RPSGamma
-/// \param p1
-/// \param p2
-/// \param score1
-/// \param score2
-/// \return
-///
 
-int RPSGamma(char p1, char p2, int &score1, int &score2) {
+int RPSGamma(char p1, char p2) {
     p1 = toupper(p1);
     p2 = toupper(p2);
     if ( p1 == 'P' ) {
-        if ( p2 == 'P' ) return 0;
-        else if (p2 == 'S') {
-            score1++; return 1;
-        }
-        else {
-            score2++; return 2;
-        }
+        if ( p2 == 'P' )    return TIE;
+        else if (p2 == 'S') return P1_WON;
+        else                return P2_WON;
     }
     else if (p1 == 'R') {
-        if ( p2 == 'R' ) return 0;
-        else if (p2 == 'P') {
-            score1++;    return 1;
-        }
-        else {
-            score2++;    return 2;
-        }
+        if ( p2 == 'R' )    return TIE;
+        else if (p2 == 'P') return P1_WON;
+        else                return P2_WON;
     }
     else {
-        if ( p2 == 'P' ) return 0;
-        else if (p2 == 'S') {
-            score1++;    return 1;
-        }
-        else {
-            score2++;    return 2;
-        }
+        if ( p2 == 'P' )    return TIE;
+        else if (p2 == 'S') return P1_WON;
+        else                return P2_WON;
     }
 }
 
-///
-/// \brief RPSDelta
-/// \param p1
-/// \param p2
-/// \param score1
-/// \param score2
-/// \return
-///
 
-int RPSDelta(char p1, char p2, int &score1, int &score2) {
+int RPSDelta(char p1, char p2) {
     p1 = toupper(p1);
     p2 = toupper(p2);
     if ( p1 == 'P' ) {
-        if ( p2 == 'P' ) return 0;
-        else if (p2 == 'S') {
-            score2++; return 1;
-        }
-        else {
-            score1++; return 2;
-        }
+        if ( p2 == 'P' )    return TIE;
+        else if (p2 == 'S') return P1_WON;
+        else                return P2_WON;
     }
     else if (p1 == 'R') {
-        if ( p2 == 'R' ) return 0;
-        else if (p2 == 'P') {
-            score2++;    return 1;
-        }
-        else {
-            score1++;    return 2;
-        }
+        if ( p2 == 'R' )    return TIE;
+        else if (p2 == 'P') return P1_WON;
+        else                return P2_WON;
     }
     else {
-        if ( p2 == 'P' ) return 0;
-        else if (p2 == 'S') {
-            score2++;    return 1;
-        }
-        else {
-            score1++;    return 2;
-        }
+        if ( p2 == 'P' )    return TIE;
+        else if (p2 == 'S') return P1_WON;
+        else                return P2_WON;
     }
 }
 
@@ -475,11 +213,6 @@ int RPSDelta(char p1, char p2, int &score1, int &score2) {
 
 QMap<int,QString> M;
 
-///
-/// \brief initCheckWMaps: initialize the values in the dictionary that is used throughout
-///                        the check functions.
-///
-
 void initCheckWMaps() {
 
     M[1] = "one";       M[2] = "two";       M[3]  = "three";      M[4] = "four";
@@ -493,13 +226,6 @@ void initCheckWMaps() {
 }
 
 
-///
-/// \brief validateCheckQty: determines is entered text is a valid number in [0,999999999]
-/// \param st text entered by the user
-/// \param qty text converted to integer
-/// \return true if the entered text is valid
-///
-
 bool validateCheckQty(QString st, unsigned int &qty) {
     int i = 0;
     for (i = 0; i < st.length() ; i++) {
@@ -512,13 +238,9 @@ bool validateCheckQty(QString st, unsigned int &qty) {
     return true;
 }
 
-///
-/// \brief wordForNumber: Given a number n in [0,999] returns the word equivalent
-/// \param n: the number
-/// \return a Qstring containing the number in words
-///
 
-QString wordForNumber(int n) {
+
+QString wordForNumber(unsigned int n) {
     QString st;
 
     int tens = n % 100;
@@ -539,13 +261,8 @@ QString wordForNumber(int n) {
 }
 
 
-///
-/// \brief checkWAlpha: One of the functions to convert a number in [0,999999999] to words
-/// \param n: the number
-/// \return a Qstring containing the number in words
-///
 
-QString checkWAlpha(int n) {
+QString checkWAlpha(unsigned int n) {
     QString st;
 
     // the cents
@@ -562,13 +279,8 @@ QString checkWAlpha(int n) {
     return st;
 }
 
-///
-/// \brief checkWBeta: One of the functions to convert a number in [0,999999999] to words
-/// \param n: the number
-/// \return a Qstring containing the number in words
-///
 
-QString checkWBeta(int n) {
+QString checkWBeta(unsigned int n) {
     QString st;
 
     st = wordForNumber(n % 1000);
@@ -580,13 +292,8 @@ QString checkWBeta(int n) {
     return st;
 }
 
-///
-/// \brief checkWGamma: One of the functions to convert a number in [0,999999999] to words
-/// \param n: the number
-/// \return a Qstring containing the number in words
-///
 
-QString checkWGamma(int n) {
+QString checkWGamma(unsigned int n) {
     QString st;
 
     st = wordForNumber(n % 10);
@@ -598,14 +305,9 @@ QString checkWGamma(int n) {
     return st;
 }
 
-///
-/// \brief checkWDelta: One of the functions to convert a number in [0,999999999] to words
-/// \param n: the number
-/// \return a Qstring containing the number in words
-///
 
 
-QString checkWDelta(int n) {
+QString checkWDelta(unsigned int n) {
     QString st;
 
     n /= 10;
@@ -640,11 +342,10 @@ bool validZuluTime(const QString &time, const QString &zone, int &hours, int &mi
     return true;
 }
 
-//This is the correct one
 
 QString zuluAlpha(int hours, int minutes, char zone) {
     int diff = 0;
-
+    zone = toupper(zone);
     if (zone <= 'I')         diff = zone - 'A' + 1;
     else if (zone <= 'M')    diff = 10 + (zone - 'K');
     else if (zone <= 'Y')    diff = -(zone - 'N' + 1);
@@ -652,7 +353,13 @@ QString zuluAlpha(int hours, int minutes, char zone) {
 
     hours = (hours + (24 + diff) ) % 24;
 
-    return QString::number(hours) + QString::number(minutes);
+    QString qstHours = QString::number(hours);
+    if (qstHours.length() == 1) qstHours.prepend("0");
+
+    QString qstMin = QString::number(minutes);
+    if (qstMin.length() == 1) qstMin.prepend("0");
+
+    return qstHours + qstMin;
 }
 
 QString zuluBeta(int hours, int minutes, char zone) {
@@ -692,161 +399,3 @@ QString zuluDelta(int hours, int minutes, char zone) {
 
     return QString::number(hours)  + QString::number(minutes);
 }
-
-
-
-// =========================================================
-// APFT Functions
-// =========================================================
-
-
-//This it the correct one
-
-void MainWindow::APFTAlpha(){
-    //For each one of these variables we apply the formula that they use
-    //to set the points
-    double sit_ups = qFloor(line[0]->text().toDouble() * 1.6 - 24.8);
-
-    double push_ups = qFloor(line[1]->text().toInt() * 1.42);
-
-    double running_time = qFloor((line[2]->text().left(2).append('.' + line[2]->text().right(2))).toDouble());
-    double two_mile_run = qFloor((820 / 3) - ((40 * running_time) / 3));
-
-    //Since the maximum of points that one can obtain
-    //on each excercise type is 100, we restrict it
-    if (sit_ups > 100){
-        sit_ups = 100;
-    }
-    else if (sit_ups < 0){
-        sit_ups = 0;
-    }
-    if (push_ups > 100){
-        push_ups = 100;
-    }
-    else if (push_ups < 0){
-        push_ups = 0;
-    }
-    if (two_mile_run > 100){
-        two_mile_run = 100;
-    }
-    else if (two_mile_run < 0){
-        two_mile_run = 0;
-    }
-
-    //Finally we set the outputs.
-    line[3]->setText(QString::number(sit_ups));
-    line[4]->setText(QString::number(push_ups));
-    line[5]->setText(QString::number(two_mile_run));
-    line[6]->setText(QString::number(push_ups + sit_ups + two_mile_run));
-    if (push_ups >= 60 && sit_ups >= 60 && two_mile_run >= 60){
-        label[7]->setText("PASS");
-    }
-    else{
-        label[7]->setText("FAIL");
-    }
-}
-
-//This one do not check if the number is greater than 100
-
-void MainWindow::APFTBeta(){
-    double sit_ups = qFloor(line[0]->text().toDouble() * 1.6 - 24.8);
-
-    double push_ups = qFloor(line[1]->text().toInt() * 1.42);
-
-    double running_time = qFloor((line[2]->text().left(2).append('.' + line[2]->text().right(2))).toDouble());
-    double two_mile_run = qFloor((820 / 3) - ((40 * running_time) / 3));
-
-    line[3]->setText(QString::number(sit_ups));
-    line[4]->setText(QString::number(push_ups));
-    line[5]->setText(QString::number(two_mile_run));
-    line[6]->setText(QString::number(push_ups + sit_ups + two_mile_run));
-    if (push_ups >= 60 && sit_ups >= 60 && two_mile_run >= 60){
-        line[7]->setText("PASS");
-    }
-    else{
-        line[7]->setText("FAIL");
-    }
-}
-
-//This one switch the results
-
-void MainWindow::APFTGamma(){
-    double sit_ups = qFloor(line[0]->text().toDouble() * 1.6 - 24.8);
-    double push_ups = qFloor(line[1]->text().toInt() * 1.42);
-    double running_time = qFloor((line[2]->text().left(2).append('.' + line[2]->text().right(2))).toDouble());
-    double two_mile_run = qFloor((820 / 3) - ((40 * running_time) / 3));
-
-    if (sit_ups > 100){
-        sit_ups = 100;
-    }
-    else if (sit_ups < 0){
-        sit_ups = 0;
-    }
-    if (push_ups > 100){
-        push_ups = 100;
-    }
-    else if (push_ups < 0){
-        push_ups = 0;
-    }
-    if (two_mile_run > 100){
-        two_mile_run = 100;
-    }
-    else if (two_mile_run < 0){
-        two_mile_run = 0;
-    }
-
-    line[5]->setText(QString::number(sit_ups));
-    line[3]->setText(QString::number(push_ups));
-    line[4]->setText(QString::number(two_mile_run));
-    line[6]->setText(QString::number(push_ups + sit_ups + two_mile_run));
-    if (push_ups >= 60 && sit_ups >= 60 && two_mile_run >= 60){
-        line[7]->setText("PASS");
-    }
-    else{
-        line[7]->setText("FAIL");
-    }
-}
-
-//This one do not sums the points but the quantities of each excercise
-
-void MainWindow::APFTDelta(){
-    double sit_ups = qFloor(line[0]->text().toDouble() * 1.6 - 24.8);
-    double push_ups = qFloor(line[1]->text().toInt() * 1.42);
-    double running_time = qFloor((line[2]->text().left(2).append('.'
-                                   + line[2]->text().right(2))).toDouble());
-    double two_mile_run = qFloor((820 / 3) - ((40 * running_time) / 3));
-
-    if (sit_ups > 100){
-        sit_ups = 100;
-    }
-    else if (sit_ups < 0){
-        sit_ups = 0;
-    }
-    if (push_ups > 100){
-        push_ups = 100;
-    }
-    else if (push_ups < 0){
-        push_ups = 0;
-    }
-    if (two_mile_run > 100){
-        two_mile_run = 100;
-    }
-    else if (two_mile_run < 0){
-        two_mile_run = 0;
-    }
-
-    int sumaTo = line[0]->text().toInt() + line[1]->text().toInt() + running_time;
-    line[3]->setText(QString::number(sit_ups));
-    line[4]->setText(QString::number(push_ups));
-    line[5]->setText(QString::number(two_mile_run));
-    line[6]->setText(QString::number(sumaTo));
-    if (push_ups >= 60 && sit_ups >= 60 && two_mile_run >= 60){
-        line[7]->setText("PASS");
-    }
-    else{
-        line[7]->setText("FAIL");
-    }
-}
-
-
-

functions.h

@@ -4,28 +4,316 @@
 #include <string>
 using namespace std;
 
+
+/// \fn validateSorts
+/// \~English
+/// \brief Function to validate that sort is invoked with non-empty strings
+/// \param a first QSring
+/// \param b second Qstring
+/// \param c third QString
+/// \return true if non of the QStrings are empty
+/// \~Spanish
+/// \brief Valida que los QStrings que se van a ordenar no estén vacios.
+/// \param a primer QSring
+/// \param b segundo Qstring
+/// \param c tercer QString
+/// \return true si ninguno de los QString está vacio
 bool validateSorts(const QString &a, const QString &b, const QString &c);
+
+/// \fn mySortAlpha
+/// \~English
+/// \brief A function to sort the QStrings. Returns the order 
+/// strings through the parameters (a is smallest, c is largest).
+/// \param a reference to first QSring
+/// \param b reference to second Qstring
+/// \param c reference to third QString
+/// \~Spanish
+/// \brief Función para ordenar QStrings. Devuelve los QStrings
+/// ordenados a través de los parámetros (a para el menor, c para el mayor).
+/// \param a referencia al primer QSring
+/// \param b referencia al segundo Qstring
+/// \param c referencia al tercer QString
 void mySortAlpha(QString &a, QString &b, QString &c);
+
+/// \fn mySortBeta
+/// \~English
+/// \brief A function to sort the QStrings. Returns the order 
+/// strings through the parameters (a is smallest, c is largest).
+/// \param a reference to first QSring
+/// \param b reference to second Qstring
+/// \param c reference to third QString
+/// \~Spanish
+/// \brief Función para ordenar QStrings. Devuelve los QStrings
+/// ordenados a través de los parámetros (a para el menor, c para el mayor).
+/// \param a referencia al primer QSring
+/// \param b referencia al segundo Qstring
+/// \param c referencia al tercer QString
 void mySortBeta(QString &a, QString &b, QString &c);
+
+/// \fn mySortGamma
+/// \~English
+/// \brief A function to sort the QStrings. Returns the order 
+/// strings through the parameters (a is smallest, c is largest).
+/// \param a reference to first QSring
+/// \param b reference to second Qstring
+/// \param c reference to third QString
+/// \~Spanish
+/// \brief Función para ordenar QStrings. Devuelve los QStrings
+/// ordenados a través de los parámetros (a para el menor, c para el mayor).
+/// \param a referencia al primer QSring
+/// \param b referencia al segundo Qstring
+/// \param c referencia al tercer QString
 void mySortGamma(QString &a, QString &b, QString &c);
+
+/// \fn mySortDelta
+/// \~English
+/// \brief First function to sort the QStrings. Returns the order 
+/// strings through the parameters (a is smallest, c is largest).
+/// \param a reference to first QSring
+/// \param b reference to second Qstring
+/// \param c reference to third QString
+/// \~Spanish
+/// \brief Función para ordenar QStrings. Devuelve los QStrings
+/// ordenados a través de los parámetros (a para el menor, c para el mayor).
+/// \param a referencia al primer QSring
+/// \param b referencia al segundo Qstring
+/// \param c referencia al tercer QString
 void mySortDelta(QString &a, QString &b, QString &c);
 
+
+/// \fn validZuluTime
+/// \~English
+/// \brief Function to validate the arguments that will be passed to the
+///  Zulu functions.  Returns the integer hour and minutes through last two parameters.
+/// \param time QString that contains the time in military format.
+/// \param zone  QString that specifies military zone.
+/// \param hours hours, extracted from the time parameter
+/// \param minutes minutes, extracted from the time parameter
+/// \return true if the time and zone are valid. 
+/// \~Spanish
+/// \brief Función para validar los argumentos que serán pasados a
+/// funciones Zulu.  Devuelve (como enteros) la hora y minutos a través de los 
+/// últimos dos parámetros.
+/// \param time QString que contiene la hora en formato militar, e.g. "15:22"
+/// \param zone  QString que contiene zona militar.
+/// \param hours horas, extraida del argumento pasado a time.
+/// \param minutes minutos, extraidos del argumento pasado a time.
+/// \return true si la hora (time) y la zona son válidas. 
 bool validZuluTime(const QString &time, const QString &zone, int &hours, int &minutes);
+
+
+/// \fn zuluAlpha
+/// \~English
+/// \brief Given the hour, minutes and military zone returns the Zulu time (as a QString)
+/// \param hours 
+/// \param minutes 
+/// \param zone 
+/// \return a QString of the Zulu time, in military time format
+/// \~Spanish
+/// \brief Dado la hora, minutos y zona militar devuelve el tiempo Zulu (como QString)
+/// \param hours 
+/// \param minutes 
+/// \param zone 
+/// \return un QString del tiempo Zulu, en formato de hora militar.
 QString zuluAlpha(int hours, int minutes, char zone);
+
+
+/// \fn zuluBeta
+/// \~English
+/// \brief Given the hour, minutes and military zone returns the Zulu time (as a QString)
+/// \param hours 
+/// \param minutes 
+/// \param zone 
+/// \return a QString of the Zulu time, in military time format
+/// \~Spanish
+/// \brief Dado la hora, minutos y zona militar devuelve el tiempo Zulu (como QString)
+/// \param hours 
+/// \param minutes 
+/// \param zone 
+/// \return un QString del tiempo Zulu, en formato de hora militar.
 QString zuluBeta(int hours, int minutes, char zone);
+
+
+/// \fn zuluGamma
+/// \~English
+/// \brief Given the hour, minutes and military zone returns the Zulu time (as a QString)
+/// \param hours 
+/// \param minutes 
+/// \param zone 
+/// \return a QString of the Zulu time, in military time format
+/// \~Spanish
+/// \brief Dado la hora, minutos y zona militar devuelve el tiempo Zulu (como QString)
+/// \param hours 
+/// \param minutes 
+/// \param zone 
+/// \return un QString del tiempo Zulu, en formato de hora militar.
 QString zuluGamma(int hours, int minutes, char zone);
+
+
+/// \fn zuluDelta
+/// \~English
+/// \brief Given the hour, minutes and military zone returns the Zulu time (as a QString)
+/// \param hours 
+/// \param minutes 
+/// \param zone 
+/// \return a QString of the Zulu time, in military time format
+/// \~Spanish
+/// \brief Dado la hora, minutos y zona militar devuelve el tiempo Zulu (como QString)
+/// \param hours 
+/// \param minutes 
+/// \param zone 
+/// \return un QString del tiempo Zulu, en formato de hora militar.
 QString zuluDelta(int hours, int minutes, char zone);
 
-int RPSAlpha(char p1, char p2, int &score1, int &score2);
-int RPSBeta(char p1, char p2, int &score1, int &score2);
-int RPSGamma(char p1, char p2, int &score1, int &score2);
-int RPSDelta(char p1, char p2, int &score1, int &score2);
 
+// Constants for the rock, paper, scisor functions.
+const int TIE = 0;
+const int P1_WON = 1;
+const int P2_WON = 2;
+
+
+/// \fn RPSAlpha
+/// \~English
+/// \brief Given play by the first and second players, returns who won the rock, paper
+/// scisors match.
+/// \param p1 play by the first player, as represented by char 'R', 'P' or 'S' 
+/// \param p2 play by the first player, as represented by char 'R', 'P' or 'S'  
+/// \return a 0 if there was a tie, 1 if the first player won, 2 if the second player won.
+/// \~Spanish
+/// \brief Dado la jugada del jugador 1 y 2, devuelve quien ganó el juego de piedra, 
+/// papel y tijera ((R)ock, (P)aper, (S)cisors)
+/// \param p1 jugada del primer jugador, representada por un caracter ('R','P','S') 
+/// \param p1 jugada del segundo jugador, representada por un caracter ('R','P','S')
+/// \return a 0 si hubo empate, 1 si ganó el primer jugador, 2 si ganó el segundo.
+int RPSAlpha(char p1, char p2);
+
+/// \fn RPSBeta
+/// \~English
+/// \brief Given play by the first and second players, returns who won the rock, paper
+/// scisors match.
+/// \param p1 play by the first player, as represented by char 'R', 'P' or 'S' 
+/// \param p2 play by the first player, as represented by char 'R', 'P' or 'S'  
+/// \return a 0 if there was a tie, 1 if the first player won, 2 if the second player won.
+/// \~Spanish
+/// \brief Dado la jugada del jugador 1 y 2, devuelve quien ganó el juego de piedra, 
+/// papel y tijera ((R)ock, (P)aper, (S)cisors)
+/// \param p1 jugada del primer jugador, representada por un caracter ('R','P','S') 
+/// \param p1 jugada del segundo jugador, representada por un caracter ('R','P','S')
+/// \return a 0 si hubo empate, 1 si ganó el primer jugador, 2 si ganó el segundo.
+int RPSBeta(char p1, char p2);
+
+/// \fn RPSGamma
+/// \~English
+/// \brief Given play by the first and second players, returns who won the rock, paper
+/// scisors match.
+/// \param p1 play by the first player, as represented by char 'R', 'P' or 'S' 
+/// \param p2 play by the first player, as represented by char 'R', 'P' or 'S'  
+/// \return a 0 if there was a tie, 1 if the first player won, 2 if the second player won.
+/// \~Spanish
+/// \brief Dado la jugada del jugador 1 y 2, devuelve quien ganó el juego de piedra, 
+/// papel y tijera ((R)ock, (P)aper, (S)cisors)
+/// \param p1 jugada del primer jugador, representada por un caracter ('R','P','S') 
+/// \param p1 jugada del segundo jugador, representada por un caracter ('R','P','S')
+/// \return a 0 si hubo empate, 1 si ganó el primer jugador, 2 si ganó el segundo.
+int RPSGamma(char p1, char p2);
+
+/// \fn RPSDelta
+/// \~English
+/// \brief Given play by the first and second players, returns who won the rock, paper
+/// scisors match.
+/// \param p1 play by the first player, as represented by char 'R', 'P' or 'S' 
+/// \param p2 play by the first player, as represented by char 'R', 'P' or 'S'  
+/// \return a 0 if there was a tie, 1 if the first player won, 2 if the second player won.
+/// \~Spanish
+/// \brief Dado la jugada del jugador 1 y 2, devuelve quien ganó el juego de piedra, 
+/// papel y tijera ((R)ock, (P)aper, (S)cisors)
+/// \param p1 jugada del primer jugador, representada por un caracter ('R','P','S') 
+/// \param p1 jugada del segundo jugador, representada por un caracter ('R','P','S')
+/// \param zone 
+/// \return a 0 si hubo empate, 1 si ganó el primer jugador, 2 si ganó el segundo.
+int RPSDelta(char p1, char p2);
+
+
+/// \fn initCheckWMaps
+/// \~English
+/// \brief Initialize the values in the dictionary (M) that is used throughout
+/// the check functions.
+/// \~Spanish
+/// \brief Inicializa los valores del diccionario que se utiliza a través del 
+/// las funciones 'check' 
 void initCheckWMaps();
+
+
+
+/// \fn validateCheckQty
+/// \~English
+/// \brief Given a QString determines its numerical value and if the 
+/// the value is in the range [0,999999999]
+/// \param st a QString with a numeric value, e.g. "4520"
+/// \param qty unsigned integer to return the numeric value, e.g. 4520
+/// \return true if the QString was converted to an integer and is in the valid range
+/// \~Spanish
+/// \brief Dado un string determina su valor numérico y si el valor está en el 
+/// rango [0,999999999]
+/// \param st un QString con un valor numérico, e.g. "4520"
+/// \param qty entero sin signo para devolver el valor numérico, e.g. 4520
+/// \return true si el QString se pudo convertir a entero y está en el rango
 bool validateCheckQty(QString st, unsigned int &qty);
-QString checkWAlpha(int n);
-QString checkWBeta(int n);
-QString checkWGamma(int n);
-QString checkWDelta(int n);
+
+
+/// \fn wordForNumber
+/// \~English
+/// \brief Given a number n in [0,999] returns the word equivalent
+/// \param n the unsigned integer, e.g. 34
+/// \return a QString containing the number in words, e.g. "thirty four"
+/// \~Spanish
+/// \brief Dado un número entero en el rango [0,999] devuelve su representación en palabras
+/// \param n el entero sin signo, e.g. 34
+/// \return un QString que contiene el valor en palabras, e.g. "thirty four"
+QString wordForNumber(unsigned int n);
+
+/// \fn checkWAlpha
+/// \~English
+/// \brief Given a unsigned integer returns its value as a string of words (in English)
+/// \param n the unsigned integer, e.g. 42
+/// \return QString containing the value (in words), e.g. "fourty two"
+/// \~Spanish
+/// \brief Dado un entero sin signo devuelve su valor como un string de palabras (in English)
+/// \param n el entero sin signo, e.g. 42
+/// \return QString que contien el valor en palabras, e.g. "fourty two"
+QString checkWAlpha(unsigned int n);
+
+/// \fn checkWBeta
+/// \~English
+/// \brief Given a unsigned integer returns its value as a string of words (in English)
+/// \param n the unsigned integer, e.g. 42
+/// \return QString containing the value (in words), e.g. "fourty two"
+/// \~Spanish
+/// \brief Dado un entero sin signo devuelve su valor como un string de palabras (in English)
+/// \param n el entero sin signo, e.g. 42
+/// \return QString que contien el valor en palabras, e.g. "fourty two"
+QString checkWBeta(unsigned int n);
+
+/// \fn checkWGamma
+/// \~English
+/// \brief Given a unsigned integer returns its value as a string of words (in English)
+/// \param n the unsigned integer, e.g. 42
+/// \return QString containing the value (in words), e.g. "fourty two"
+/// \~Spanish
+/// \brief Dado un entero sin signo devuelve su valor como un string de palabras (in English)
+/// \param n el entero sin signo, e.g. 42
+/// \return QString que contien el valor en palabras, e.g. "fourty two"
+QString checkWGamma(unsigned int n);
+
+/// \fn checkWDelta
+/// \~English
+/// \brief Given a unsigned integer returns its value as a string of words (in English)
+/// \param n the unsigned integer, e.g. 42
+/// \return QString containing the value (in words), e.g. "fourty two"
+/// \~Spanish
+/// \brief Dado un entero sin signo devuelve su valor como un string de palabras (in English)
+/// \param n el entero sin signo, e.g. 42
+/// \return QString que contien el valor en palabras, e.g. "fourty two"
+QString checkWDelta(unsigned int n);
 
 #endif // FUNCTIONS_H

main.cpp

@@ -6,65 +6,17 @@
 #include <cassert>
 #include <QDebug>
 
-void testSort() {
-    QString a = "AAA" , b = "BBB" , c = "CCC";
-    mySortBeta(a,b,c);
-    assert( a < b && b < c);
 
-    a = "AAA", b = "CCC", c = "BBB";
-    mySortBeta(a,b,c);
-    assert( a < b && b < c);
-
-    a = "BBB", b = "AAA", c = "CCC";
-    mySortBeta(a,b,c);
-    assert( a < b && b < c);
-
-    a = "BBB", b = "CCC", c = "AAA";
-    mySortBeta(a,b,c);
-    assert( a < b && b < c);
-
-    a = "CCC", b = "AAA", c = "BBB";
-    mySortBeta(a,b,c);
-    //qDebug() << a << b << c;
-    assert( a < b && b < c);
-
-    a = "CCC", b = "BBB", c = "AAA";
-    mySortBeta(a,b,c);
-    assert( a < b && b < c);
-
-    qDebug() << "Passed Test for Sort!!!!";
-}
-
-void testCheck() {
-
-    assert( checkWAlpha(91) == QString("ninety one"));
-    assert( checkWAlpha(891) == QString("eight hundred ninety one"));
-    assert( checkWAlpha(100) == QString("one hundred"));
-    assert( checkWAlpha(59123) == QString("fifty nine thousand one hundred twenty three"));
-    assert( checkWAlpha(100001) == QString("one hundred thousand one"));
-    assert( checkWAlpha(100000) == QString("one hundred thousand"));
-    assert( checkWAlpha(100000000) == QString("one hundred million"));
-    qDebug() << "Passed Test for Check Word!!!!";
-}
 
 int main(int argc, char *argv[])
 {
-//    testSort();
-    initCheckWMaps(); /*** DONT FORGET ***/
-
-//    testCheck();
-//    qDebug() << checkWAlpha(91);
-//    qDebug() << checkWAlpha(891);
-//    qDebug() << checkWAlpha(801);
 
+    initCheckWMaps(); 
 
     srand(time(NULL));
     QApplication a(argc, argv);
     MainWindow w;
-    w.setWindowTitle("Testing Lab");
     w.show();
 
-
-
     return a.exec();
 }

mainwindow.cpp

@@ -1,8 +1,12 @@
+// RAN 2015-06-26 - Added Zulu Zone label
+//   - Removed the onclick functions for the buttons that are no longer used
+
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 #include "secondwindow.cpp"
 
 #include <QDebug>
+#include <QTimer>
 #include <QtCore/qmath.h>
 #include <QMessageBox>
 #include "functions.h"
@@ -38,7 +42,7 @@ MainWindow::MainWindow(QWidget *parent) :
 
     // We need to know whenever the second window is closed to show the
     // main window, or to hide when the second one is showed
-    connect(window, SIGNAL(cerrado(bool)), this, SLOT(mostrar(bool)));
+    connect(window, SIGNAL(closeIt(bool)), this, SLOT(showMW(bool)));
 
     if(!dice1.load(":/images/resources/d1.png") || !dice2.load(":/images/resources/d1.png")){
         qDebug() << "Error1 Loading image";
@@ -52,9 +56,8 @@ MainWindow::~MainWindow()
     delete ui;
 }
 
-//This function show the main window and delete all the items created on the closed one or hide the mainwindow
-void MainWindow::mostrar(bool si){
-    if (si==true){
+void MainWindow::showMW(bool doShow){
+    if (doShow){
         show();
 
         // Deleting pointers and point them to NULL
@@ -76,14 +79,13 @@ void MainWindow::mostrar(bool si){
 
         // Create the new window and connecting it again with the signal
         window = new secondwindow;
-        connect(window, SIGNAL(cerrado(bool)), this, SLOT(mostrar(bool)));
+        connect(window, SIGNAL(closeIt(bool)), this, SLOT(showMW(bool)));
     }
     else hide();
 }
 
-//It is a slot that reads what item of the combo box was selected and save it
-//into a member
-void MainWindow::whatOption(QString str){
+
+void MainWindow::setOption(QString str){
     option = str;
 }
 
@@ -97,212 +99,8 @@ void MainWindow::clearLines(){
     score1 = score2 = 0;
 }
 
-//It forces the input 1 to be valid
-void MainWindow::RPSnormalizer1(QString str){
-    //For every character in the string only allow
-    //the character 'R' for rock, 'P' for paper and
-    //'S' for scissors. Delete all the other characters
-    //different from this three, and if is 'r', 'p' or 's'
-    //make it uppercase.
-    for (int i = 0; i< str.size(); i++){
-        if      (str[i] == 'r'){
-            str[i] = 'R';
-        }
-        else if (str[i] == 'p'){
-            str[i] = 'P';
-        }
-        else if (str[i] == 's'){
-            str[i] = 'S';
-        }
-
-        else if (str[i] == 'R' || str[i] == 'P' ||
-                 str[i] == 'S');//then its ok, do nothing
-        else{
-            str = str.mid(0,i).append(str.mid(i+1));
-        }
-    }
-
-    line[0]->setText(str);
-}
-
-//It forces the input 2 to be valid
-void MainWindow::RPSnormalizer2(QString str){
-    for (int i = 0; i< str.size(); i++){
-        if      (str[i] == 'r'){
-            str[i] = 'R';
-        }
-        else if (str[i] == 'p'){
-            str[i] = 'P';
-        }
-        else if (str[i] == 's'){
-            str[i] = 'S';
-        }
-        else if (str[i] == 'R' || str[i] == 'P' ||
-                 str[i] == 'S');//then its ok, do nothing
-        else{
-            str = str.mid(0,i).append(str.mid(i+1));
-        }
-    }
-
-    line[1]->setText(str);
-}
-
-//It forces the input 3 to be valid
-void MainWindow::RPSnormalizer3(QString str){
-    //Verify that the string do not contains other thing than
-    //numbers
-    for (int i = 0; i< str.size(); i++){
-        if (!str[i].isDigit()){
-            str = str.mid(0,i).append(str.mid(i+1));
-        }
-    }
-
-    //Left zeros do not count, delete them
-    while (str[0] == '0'){
-        str = str.mid(1);
-    }
-
-    //If the player exagerates the number of games to win
-    //change the string to the maximum number allowed
-    if (str.toInt() > 150){
-        str = "150";
-    }
-
-    line[2]->setText(str);
-}
-
-//It forces the input to be valid
-void MainWindow::CheckWnormalizer(QString str){
-    //Just allow numbers
-    for (int i = 0; i< str.size(); i++){
-        if (!str[i].isDigit()){
-            str = str.mid(0,i).append(str.mid(i+1));
-        }
-    }
-
-    //Zeros on the left side do not count (delete them)
-    while (str[0] == '0'){
-        str = str.mid(1);
-    }
-
-    //The maximum is 999,999,999
-    if (str.toDouble() > 999999999){
-        str = "999999999";
-    }
-
-    line[0]->setText(str);
-}
-
-
-
-//It forces the first input of Zulu to be valid
-void MainWindow::Zulunormalizer1(QString str){
-    //Just allow numbers to be written
-    for (int i = 0; i< str.size(); i++){
-        if (!str[i].isDigit()){
-            str = str.mid(0,i).append(str.mid(i+1));
-        }
-    }
-
-    //The maximum here is 2359, so force it to be the
-    //maximum when the user write a larger number
-    if (str.toInt() > 2359){
-        str = "2359";
-    }
-
-    line[0]->setText(str);
-}
-
-//It forces the second input of Zulu to be valid
-void MainWindow::Zulunormalizer2(QString str){
-    //Just allow one character to be written
-    if (str.size() > 1){
-        str = str[1];
-    }
-
-    //If that only character is 'e', 'c', 'm' or 'p'
-    //the uppercase it
-    if (str[0] == 'e' || str[0] == 'c' ||
-            str[0] == 'm' || str[0] == 'p'){
-        str = str[0].toUpper();
-    }
-    //If we get here is because the character is not
-    //the lowercase letters allowed... so if they are
-    //not the uppercase letters that we admit we have
-    //to delete it.
-    else if (str[0] != 'E' || str[0] != 'C' ||
-             str[0] != 'M' || str[0] != 'P'){
-        str = "";
-    }
-
-    line[1]->setText(str);
-}
 
-//It forces the first input of APFT to be valid
-void MainWindow::APFTnormalizer1(QString str){
-    //Just admit numbers, delete the other type of
-    //characters
-    for (int i = 0; i< str.size(); i++){
-        if (!str[i].isDigit()){
-            str = str.mid(0,i).append(str.mid(i+1));
-        }
-    }
-
-    //Left zeros are not valid
-    while (str[0] == '0'){
-        str = str.mid(1);
-    }
-
-    line[0]->setText(str);
-}
-
-//It forces the second input of APFT to be valid
-void MainWindow::APFTnormalizer2(QString str){
-    //Just allow the numbers to be written
-    for (int i = 0; i< str.size(); i++){
-        if (!str[i].isDigit()){
-            str = str.mid(0,i).append(str.mid(i+1));
-        }
-    }
-
-    //Left-hand zeros? Delete them
-    while (str[0] == '0'){
-        str = str.mid(1);
-    }
-
-    line[1]->setText(str);
-}
-
-//It forces the third input of APFT to be valid
-void MainWindow::APFTnormalizer3(QString str){
-    //Allow just numbers on the string only if the
-    //character is not in the position 2
-    for (int i = 0; i< str.size(); i++){
-        if (!str[i].isDigit() && i != 2){
-            str = str.mid(0,i).append(str.mid(i+1));
-        }
-    }
-
-    //Then if there is a character in the position 2
-    //and it is not ':', then add it between the
-    //position 1 and 3
-    if (str.size() > 2 && str[2] != ':'){
-        while (str.size()>2 && !str[2].isDigit()){
-            str = str.mid(0,2).append(str.mid(3));
-        }
-        str = str.mid(0, 2).append(':').append(str.mid(2));
-    }
-    //If the size exceeds 5, then take the first five
-    //so then we will have the format mm:ss
-    if (str.size() > 5){
-        str = str.mid(0, 5);
-    }
-
-    line[2]->setText(str);
-}
-
-//Checks which version of sort is selected and call it
-void MainWindow::sorts(){
+void MainWindow::callOneOfTheSorts(){
     QString a = line[0]->text();
     QString b = line[1]->text();
     QString c = line[2]->text();
@@ -331,16 +129,12 @@ void MainWindow::sorts(){
 }
 
 
+void MainWindow::callOneOfTheRPS(){
 
+    QString p1 = this->cmbPlayer01->currentText();
+    QString p2 = this->cmbPlayer02->currentText();
 
-//Checks which version of RPS is selected and call it
-void MainWindow::RPSs(){
-
-    QString p1 = line[0]->text();
-    QString p2 = line[1]->text();
-    QString gamesToWin = line[2]->text();
-
-    if (p1.length() * p2.length() * gamesToWin.length() == 0) {
+    if (p1.length() * p2.length() == 0) {
         QMessageBox::warning(this, "Alert",
                              "Please provide a play for both players and the number of games to win");
         return;
@@ -348,50 +142,100 @@ void MainWindow::RPSs(){
 
     int winnerNum;
     if (option == "Version Alpha")
-        winnerNum = RPSAlpha(p1.toStdString()[0], p2.toStdString()[0], score1, score2);
+        winnerNum = RPSDelta(p1.toStdString()[0], p2.toStdString()[0]);
     else if (option == "Version Beta")
-        winnerNum = RPSBeta(p1.toStdString()[0], p2.toStdString()[0], score1, score2);
+        winnerNum = RPSBeta(p1.toStdString()[0], p2.toStdString()[0]);
     else if (option == "Version Gamma")
-        winnerNum = RPSGamma(p1.toStdString()[0], p2.toStdString()[0], score1, score2);
+        winnerNum = RPSGamma(p1.toStdString()[0], p2.toStdString()[0]);
     else
-        winnerNum = RPSDelta(p1.toStdString()[0], p2.toStdString()[0], score1, score2);
+        winnerNum = RPSDelta(p1.toStdString()[0], p2.toStdString()[0]);
 
     QString st;
 
+
     switch(winnerNum) {
-    case 1:  st = "Player 1"; break;
-    case 2:  st = "Player 2"; break;
-    case 0:  st = "Tie"; break;
-    default: st = "Error";
+        case 1:  st = "Player 1"; break;
+        case 2:  st = "Player 2"; break;
+        case 0:  st = "Tie"; break;
+        default: st = "Error";
     }
 
-    line[3]->setText(st);
+    line[0]->setText(st);
 
-    line[4]->setText(QString::number(score1) + " to " + QString::number(score2));
+}
 
-    if (score1 == gamesToWin.toInt() || score2 == gamesToWin.toInt() ) {
-        QMessageBox::warning(this, "Alert",
-                             "Game won by " + st + "!!!");
-        score1 = score2 = 0;
+
+void MainWindow::paintDice() {
+    this->timerCounter++;
+    int a, b;
+    a = rand()%6;
+    b = rand()%6;
+    label[3]->setPixmap(QPixmap::fromImage(diceImages[a]));
+    label[4]->setPixmap(QPixmap::fromImage(diceImages[b]));
+    if (this->timerCounter == 10) {
+        aTimer->stop();
+        diceFinal01 = a;
+        diceFinal02 = b;
+        if (option == "Version Alpha")
+            diceBeta();
+        else if (option == "Version Beta")
+            diceGamma();
+        else if (option == "Version Gamma")
+            diceAlpha();
+        else
+            diceAlpha();
     }
+}
+
+
+void MainWindow::callOneOfTheDices(){
+
+    for (int i = 1; i <= 6; i++)
+        this->diceImages.push_back(QImage(":/images/resources/d" + QString::number(i) + ".png"));
+
+    aTimer = new QTimer;
+    aTimer->setInterval(100);
+    aTimer->setSingleShot(false);
+    aTimer->start();
+    timerCounter = 0;
+    QObject::connect(aTimer,&QTimer::timeout, this, &MainWindow::paintDice); //[&](){ birth(w, juana, avelardo, piolin);});
+
 
 }
 
-//Checks which version of dice is selected and call it
-void MainWindow::dices(){
-    if (option == "Version Alpha")
-        diceAlpha();
-    else if (option == "Version Beta")
-        diceBeta();
-    else if (option == "Version Gamma")
-        diceGamma();
-    else
-        diceDelta();
+
+
+
+//========================================================
+// Functions for the dice roller
+//========================================================
+
+
+void MainWindow::diceAlpha(){
+    int total = diceFinal01 + diceFinal02 + 2;
+    line[0]->setText(QString::number(total));
+}
+
+
+void MainWindow::diceBeta(){
+    int total = diceFinal01 + diceFinal01 + 2;
+    line[0]->setText(QString::number(total));
+}
+
+
+void MainWindow::diceGamma(){
+    int total = diceFinal01 - diceFinal02;
+    line[0]->setText(QString::number(total));
+}
+
+
+void MainWindow::diceDelta(){
+    int total = diceFinal01 + diceFinal02;
+    line[0]->setText(QString::number(total));
 }
 
 
-//Checks which version of check-writer is selected and call it
-void MainWindow::checkWs(){
+void MainWindow::callOneOfTheChecks(){
     unsigned int qty;
     if (!validateCheckQty(line[0]->text(),qty)) {
         QMessageBox::warning(this, "Alert",
@@ -408,8 +252,7 @@ void MainWindow::checkWs(){
         line[1]->setText( checkWDelta(qty) );
 }
 
-//Checks which version of zulu is selected and call it
-void MainWindow::zulus(){
+void MainWindow::callOneOfTheZulus(){
     QString zuluTime = line[0]->text();
     QString zuluZone = line[1]->text();
     int hours, minutes;
@@ -417,7 +260,7 @@ void MainWindow::zulus(){
     if (!validZuluTime(zuluTime, zuluZone, hours, minutes) ) {
 
         QMessageBox::warning(this, "Alert",
-                             "Either Zulu Time or Zone is not valid");
+                             "Either Zulu Time or Zone is not valid.");
         line[2]->setText("Error");
         return;
     }
@@ -432,23 +275,7 @@ void MainWindow::zulus(){
 
 }
 
-//Checks which version of APFT is selected and call it
-void MainWindow::APFTs(){
-    if (option == "Version Alpha"){
-        APFTAlpha();
-    }
-    else if (option == "Version Beta"){
-        APFTBeta();
-    }
-    else if (option == "Version Gamma"){
-        APFTGamma();
-    }
-    else{
-        APFTDelta();
-    }
-}
 
-//Here is what happend when Sort-button is clicked
 void MainWindow::on_SortsButton_clicked()
 {
     //Create a new QComboBox and add the items in it
@@ -495,19 +322,18 @@ void MainWindow::on_SortsButton_clicked()
 
     //Here we connect the signals of the widgets generated
     //by code to their respective functions
-    connect(method, SIGNAL(currentIndexChanged(QString)), this, SLOT(whatOption(QString)));
-    connect(button[0], SIGNAL(clicked()), this, SLOT(sorts()));
+    connect(method, SIGNAL(currentIndexChanged(QString)), this, SLOT(setOption(QString)));
+    connect(button[0], SIGNAL(clicked()), this, SLOT(callOneOfTheSorts()));
     connect(button[1], SIGNAL(clicked()), this, SLOT(clearLines()));
 
     //Now that we have set our new window, we hide the main-window
     //and show the new one. The new-window has a signal that
     //notify when it was closed so we can shor the main-window
     window->setLayout(layout);
-    mostrar(false);
+    showMW(false);
     window->show();
 }
 
-//Here is what happend when Dice-button is clicked
 void MainWindow::on_DiceButton_clicked()
 {
     //Create a new QComboBox and add the items in it
@@ -551,18 +377,17 @@ void MainWindow::on_DiceButton_clicked()
 
     //Here we connect the signals of the widgets generated
     //by code to their respective functions
-    connect(method, SIGNAL(currentIndexChanged(QString)), this, SLOT(whatOption(QString)));
-    connect(button[0], SIGNAL(clicked()), this, SLOT(dices()));
+    connect(method, SIGNAL(currentIndexChanged(QString)), this, SLOT(setOption(QString)));
+    connect(button[0], SIGNAL(clicked()), this, SLOT(callOneOfTheDices()));
 
     //Now that we have set our new window, we hide the main-window
     //and show the new one. The new-window has a signal that
     //notify when it was closed so we can shor the main-window
     window->setLayout(layout);
-    mostrar(false);
+    showMW(false);
     window->show();
 }
 
-//Here is what happend when RPS-button is clicked
 void MainWindow::on_RPSButton_clicked()
 {
     //Create a new QComboBox and add the items in it
@@ -573,117 +398,52 @@ void MainWindow::on_RPSButton_clicked()
     method->addItem("Version Delta");
     option = "Version Alpha"; //Default option is alpha
 
-    //We create a new layout and insert the comboBox to it
-    layout = new QGridLayout;
-    layout->addWidget(method, 0, 0, 1, -1);
+    cmbPlayer01 = new QComboBox;
+    cmbPlayer02 = new QComboBox;
+    cmbPlayer01->addItem("rock");       cmbPlayer02->addItem("rock");
+    cmbPlayer01->addItem("paper");      cmbPlayer02->addItem("paper");
+    cmbPlayer01->addItem("scisors");    cmbPlayer02->addItem("scisors");
+
 
     //The buttons needed here are the 'play' and 'clear' buttons
     button[0] = new QPushButton("Play");
-    button[1] = new QPushButton("Clear");
-
-    //3 inputs and 1 output
-    for (int i = 0; i<4; i++){
-        line[i] = new QLineEdit;
-    }
 
+    line[0] = new QLineEdit;
     //The user is not able to write on the output line
-    line[3]->setEnabled(false);
+    line[0]->setEnabled(false);
 
     //Labels to let the user understand the app
     label[0] = new QLabel("Player 1's moves");
     label[1] = new QLabel("Player 2's moves");
-    label[2] = new QLabel("How many games to win:");
-    label[3] = new QLabel("Winner:");
-    label[4] = new QLabel("Tournament:");
-    //lines for score
-    line[4] = new QLineEdit;
-    line[4]->setEnabled(false);
-
-    //Here we insert the widgets on the layout
-    layout->addWidget(label[0], 1, 0);
-    layout->addWidget(line[0], 2, 0);
-    layout->addWidget(label[1], 3, 0);
-    layout->addWidget(line[1], 4, 0);
-    layout->addWidget(label[2], 5, 0);
-    layout->addWidget(line[2], 5, 1);
-    layout->addWidget(label[3], 6, 0);
-    layout->addWidget(line[3], 6, 1);
-    layout->addWidget(button[0], 2, 1);
-    layout->addWidget(button[1], 3, 1);
-    layout->addWidget(line[4],7 ,1 );
-    layout->addWidget(label[4],7 ,0 );
-
-    //Here we connect the signals of the widgets generated
-    //by code to their respective functions
-    connect(method, SIGNAL(currentIndexChanged(QString)), this, SLOT(whatOption(QString)));
-    connect(button[0], SIGNAL(clicked()), this, SLOT(RPSs()));
-    connect(button[1], SIGNAL(clicked()), this, SLOT(clearLines()));
-    connect(line[0], SIGNAL(textEdited(QString)), this, SLOT(RPSnormalizer1(QString)));
-    connect(line[1], SIGNAL(textEdited(QString)), this, SLOT(RPSnormalizer2(QString)));
-    connect(line[2], SIGNAL(textEdited(QString)), this, SLOT(RPSnormalizer3(QString)));
-
-    //Now that we have set our new window, we hide the main-window
-    //and show the new one. The new-window has a signal that
-    //notify when it was closed so we can shor the main-window
-    window->setLayout(layout);
-    mostrar(false);
-    window->show();
-    score1 = score2 = 0;
-}
-
-//Here is what happend when CheckWritter-button is clicked
-void MainWindow::on_CheckWriterButton_clicked()
-{
-    //Create a new QComboBox and add the items in it
-    method = new QComboBox;
-    method->addItem("Version Alpha");
-    method->addItem("Version Beta");
-    method->addItem("Version Gamma");
-    method->addItem("Version Delta");
-    option = "Version Alpha"; //Default option is alpha
+    label[2] = new QLabel("Winner:");
 
     //We create a new layout and insert the comboBox to it
+    int row = 0;
     layout = new QGridLayout;
-    layout->addWidget(method, 0, 0, 1, -1);
-
-    //Label to let the user understand the app
-    label[0] = new QLabel("Number to convert");
+    layout->addWidget(method,       row++, 0);
+    layout->addWidget(label[0],     row, 0);
+    layout->addWidget(cmbPlayer01,  row++, 1);
+    layout->addWidget(label[1],     row, 0);
+    layout->addWidget(cmbPlayer02,  row++, 1);
+    layout->addWidget(button[0],    row++, 1);
+    layout->addWidget(line[0],      row, 1);
+    layout->addWidget(label[2],      row++, 0);
 
-    //We just need two buttons to clear or convert
-    button[0] = new QPushButton("Convert");
-    button[1] = new QPushButton("Clear");
-
-    //1 output and 1 input
-    for (int i = 0; i<2; i++){
-        line[i] = new QLineEdit;
-    }
-
-    //The user is not able to write on the output line
-    line[1]->setEnabled(false);
-
-    //Here we insert the widgets on the layout
-    layout->addWidget(label[0], 1, 0, 1, 2);
-    layout->addWidget(line[0], 2, 0, 1, 2);
-    layout->addWidget(button[0], 3, 0);
-    layout->addWidget(button[1], 3, 1);
-    layout->addWidget(line[1], 4, 0, 1, 2);
 
     //Here we connect the signals of the widgets generated
     //by code to their respective functions
-    connect(method, SIGNAL(currentIndexChanged(QString)), this, SLOT(whatOption(QString)));
-    connect(button[0], SIGNAL(clicked()), this, SLOT(checkWs()));
-    connect(button[1], SIGNAL(clicked()), this, SLOT(clearLines()));
-    //connect(line[0], SIGNAL(textEdited(QString)), this, SLOT(CheckWnormalizer(QString)));
+    connect(method, SIGNAL(currentIndexChanged(QString)), this, SLOT(setOption(QString)));
+    connect(button[0], SIGNAL(clicked()), this, SLOT(callOneOfTheRPS()));
 
     //Now that we have set our new window, we hide the main-window
     //and show the new one. The new-window has a signal that
     //notify when it was closed so we can shor the main-window
     window->setLayout(layout);
-    mostrar(false);
+    showMW(false);
     window->show();
 }
 
-//Here is what happend when Zulu-button is clicked
+
 void MainWindow::on_ZuluButton_clicked()
 {
     //Create a new QComboBox and add the items in it
@@ -701,6 +461,7 @@ void MainWindow::on_ZuluButton_clicked()
     //Labels to let the user understand the app
     label[0] = new QLabel("Zulu time:");
     label[1] = new QLabel("Standard time");
+    label[2] = new QLabel("Zulu zone:");
 
     //Just the buttons to clear and convert the time
     button[0] = new QPushButton("Clear");
@@ -716,6 +477,7 @@ void MainWindow::on_ZuluButton_clicked()
 
     //Here we insert the widgets on the layout
     layout->addWidget(label[0], 1, 0);
+    layout->addWidget(label[2], 1, 1);
     layout->addWidget(line[0], 2, 0);
     layout->addWidget(line[1], 2, 1);
     layout->addWidget(button[0], 3, 0);
@@ -725,9 +487,9 @@ void MainWindow::on_ZuluButton_clicked()
 
     //Here we connect the signals of the widgets generated
     //by code to their respective functions
-    connect(method, SIGNAL(currentIndexChanged(QString)), this, SLOT(whatOption(QString)));
+    connect(method, SIGNAL(currentIndexChanged(QString)), this, SLOT(setOption(QString)));
     connect(button[0], SIGNAL(clicked()), this, SLOT(clearLines()));
-    connect(button[1], SIGNAL(clicked()), this, SLOT(zulus()));
+    connect(button[1], SIGNAL(clicked()), this, SLOT(callOneOfTheZulus()));
 
     // Rafa 2014-09-16 - Validation will be done when button is clicked
     //    connect(line[0], SIGNAL(textEdited(QString)), this, SLOT(Zulunormalizer1(QString)));
@@ -737,82 +499,7 @@ void MainWindow::on_ZuluButton_clicked()
     //and show the new one. The new-window has a signal that
     //notify when it was closed so we can shor the main-window
     window->setLayout(layout);
-    mostrar(false);
+    showMW(false);
     window->show();
 }
 
-//Here is what happend when APFT-button is clicked
-void MainWindow::on_APFTButton_clicked()
-{
-    //Create a new QComboBox and add the items in it
-    method = new QComboBox;
-    method->addItem("Version Alpha");
-    method->addItem("Version Beta");
-    method->addItem("Version Gamma");
-    method->addItem("Version Delta");
-    option = "Version Alpha"; //Default option is alpha
-
-    //We create a new layout and insert the comboBox to it
-    layout = new QGridLayout;
-    layout->addWidget(method, 0, 0, 1, -1);
-
-    //3 inputs and 4 outputs
-    for (int i = 0; i<7; i++){
-        line[i] = new QLineEdit;
-    }
-
-    //The user is not able to write on the output lines
-    line[3]->setEnabled(false);
-    line[4]->setEnabled(false);
-    line[5]->setEnabled(false);
-    line[6]->setEnabled(false);
-
-    //Labels to let the user understand the app
-    label[0] = new QLabel("Sit-Ups");
-    label[1] = new QLabel("Push-Ups");
-    label[2] = new QLabel("2 Mile Run");
-    label[3] = new QLabel("Sit-Ups Score");
-    label[4] = new QLabel("Push-Ups Score");
-    label[5] = new QLabel("2 Mile Run Score");
-    label[6] = new QLabel("Total Score");
-    label[7] = new QLabel("----");
-
-    //Just the buttons to calculate it and clear the lines
-    button[0] = new QPushButton("Calculate");
-    button[1] = new QPushButton("Clear");
-
-    //Here we insert the widgets on the layout
-    layout->addWidget(label[0], 1, 0);
-    layout->addWidget(label[1], 2, 0);
-    layout->addWidget(label[2], 3, 0);
-    layout->addWidget(button[0], 4, 0);
-    layout->addWidget(line[0], 1, 1);
-    layout->addWidget(line[1], 2, 1);
-    layout->addWidget(line[2], 3, 1);
-    layout->addWidget(button[1], 4, 1);
-    layout->addWidget(label[3], 1, 2);
-    layout->addWidget(label[4], 2, 2);
-    layout->addWidget(label[5], 3, 2);
-    layout->addWidget(label[6], 4, 2);
-    layout->addWidget(line[3], 1, 3);
-    layout->addWidget(line[4], 2, 3);
-    layout->addWidget(line[5], 3, 3);
-    layout->addWidget(line[6], 4, 3);
-    layout->addWidget(label[7], 4, 4);
-
-    //Here we connect the signals of the widgets generated
-    //by code to their respective functions
-    connect(method, SIGNAL(currentIndexChanged(QString)), this, SLOT(whatOption(QString)));
-    connect(button[0], SIGNAL(clicked()), this, SLOT(APFTs()));
-    connect(button[1], SIGNAL(clicked()), this, SLOT(clearLines()));
-    connect(line[0], SIGNAL(textEdited(QString)), this, SLOT(APFTnormalizer1(QString)));
-    connect(line[1], SIGNAL(textEdited(QString)), this, SLOT(APFTnormalizer2(QString)));
-    connect(line[2], SIGNAL(textEdited(QString)), this, SLOT(APFTnormalizer3(QString)));
-
-    //Now that we have set our new window, we hide the main-window
-    //and show the new one. The new-window has a signal that
-    //notify when it was closed so we can shor the main-window
-    window->setLayout(layout);
-    mostrar(false);
-    window->show();
-}

mainwindow.h

@@ -1,3 +1,5 @@
+// RAN - 2015-06-26 - Removed some old slots that were not being used
+
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
@@ -12,6 +14,7 @@
 #include <QComboBox>
 #include <QString>
 #include <QImage>
+#include <QVector>
 
 namespace Ui {
     class MainWindow;
@@ -25,75 +28,187 @@ public:
     explicit MainWindow(QWidget *parent = 0);
     ~MainWindow();
 
-    void diceAlpha();
-    void diceBeta();
-    void diceGamma();
-    void diceDelta();
-
-    void APFTAlpha();
-    void APFTBeta();
-    void APFTGamma();
-    void APFTDelta();
-
-private slots:
-    void on_SortsButton_clicked();
-    void on_DiceButton_clicked();
-    void on_RPSButton_clicked();
-    void on_CheckWriterButton_clicked();
-    void on_ZuluButton_clicked();
-    void on_APFTButton_clicked();
-
-    void mostrar(bool si);
-
-    void whatOption(QString str);
 
-    void clearLines();
-
-    void RPSnormalizer1(QString str);
+    /// \fn diceAlpha
+    /// \~English
+    /// \brief Computes the dice total based on the values of the dice.
+    /// \~Spanish
+    /// \brief Computa el total de puntos usando los valores de los dados.
+    void diceAlpha();
 
-    void RPSnormalizer2(QString str);
 
-    void RPSnormalizer3(QString str);
+    /// \fn diceBeta
+    /// \~English
+    /// \brief Computes the dice total based on the values of the dice.
+    /// \~Spanish
+    /// \brief Computa el total de puntos usando los valores de los dados.
+    void diceBeta();
 
-    void CheckWnormalizer(QString str);
+    /// \fn diceGamma
+    /// \~English
+    /// \brief Computes the dice total based on the values of the dice.
+    /// \~Spanish
+    /// \brief Computa el total de puntos usando los valores de los dados.
+    void diceGamma();
 
-    void Zulunormalizer1(QString str);
+    /// \fn diceDelta
+    /// \~English
+    /// \brief Computes the dice total based on the values of the dice.
+    /// \~Spanish
+    /// \brief Computa el total de puntos usando los valores de los dados.
+    void diceDelta();
 
-    void Zulunormalizer2(QString str);
 
-    void APFTnormalizer1(QString str);
+private slots:
 
-    void APFTnormalizer2(QString str);
 
-    void APFTnormalizer3(QString str);
+    /// \fn on_SortsButton_clicked
+    /// \~English
+    /// \brief Called when Sort-button is clicked. Creates controls for secondary window,
+    /// displays it, and hides the main window.
+    /// \~Spanish
+    /// \brief Esta función es llamada cuando el usuario cliquea el boton de Sort. 
+    /// Crea los controles de la ventana secundaria. muestra la ventana secundaria 
+    /// y esconde la ventana principal.
+    void on_SortsButton_clicked();
 
-    void sorts();
+    /// \fn on_DiceButton_clicked
+    /// \~English
+    /// \brief Called when Dice button is clicked. Creates controls for secondary window,
+    /// displays it, and hides the main window.
+    /// \~Spanish
+    /// \brief Esta función es llamada cuando el usuario cliquea el boton de Dice. 
+    /// Crea los controles de la ventana secundaria. muestra la ventana secundaria 
+    /// y esconde la ventana principal.
+    void on_DiceButton_clicked();
 
-    void RPSs();
+    /// \fn on_RPSButton_clicked
+    /// \~English
+    /// \brief Called when RPS button is clicked. Creates controls for secondary window,
+    /// displays it, and hides the main window.
+    /// \~Spanish
+    /// \brief Esta función es llamada cuando el usuario cliquea el boton de RPS. 
+    /// Crea los controles de la ventana secundaria. muestra la ventana secundaria 
+    /// y esconde la ventana principal.  
+    void on_RPSButton_clicked();
 
-    void dices();
 
-    void checkWs();
+    /// \fn on_ZuluButton_clicked
+    /// \~English
+    /// \brief Called when Zulu time button is clicked. Creates controls for secondary window,
+    /// displays it, and hides the main window.
+    /// \~Spanish
+    /// \brief Esta función es llamada cuando el usuario cliquea el boton de Zulu time. 
+    /// Crea los controles de la ventana secundaria. muestra la ventana secundaria 
+    /// y esconde la ventana principal.  
+    void on_ZuluButton_clicked();
 
-    void zulus();
+    /// \fn showMW
+    /// \~English
+    /// \brief This function either (1) shows the main window and deletes all the items created on 
+    /// the closed one or (2) hides the mainwindow
+    /// \param doShow if true then show the main window, else hide it. 
+    /// \~Spanish
+    /// \brief Esta función hace una de dos: (1) muestra la ventana principal y borra
+    /// todas los elementos creados en la secundaria, o (2) esconde la ventana principal
+    /// \param doShow si es true muestra la ventana principal, de lo contrario la esconde. 
+    void showMW(bool doShow);
+
+
+    /// \fn setOption
+    /// \~English
+    /// \brief A slot that reads what item of the combo box was selected and saves it
+    /// to a data member.
+    /// \~Spanish
+    /// \brief Un slot que lee la selección del combobox y lo guarda a un data member.
+    void setOption(QString str);
+
+
+    /// \fn clearLines
+    /// \~English
+    /// \brief Clear the text boxes in the GUIs.
+    /// \~Spanish
+    /// \brief Limpia las cajas de texto en los GUIs.
+    void clearLines();
 
-    void APFTs();
+    /// \fn callOneOfTheSorts
+    /// \~English
+    /// \brief Reads the version combobox, validates the inputs, and calls the
+    /// alpha, beta, gamma or delta sort function.
+    /// \~Spanish
+    /// \brief Lee el combobox, valida los inputs y llama a la versión
+    /// alpha, beta, gamma o delta de las funciones de sort
+    void callOneOfTheSorts();
+
+
+    /// \fn callOneOfTheRPS
+    /// \~English
+    /// \brief Reads the version combobox, validates the inputs, and calls the
+    /// alpha, beta, gamma or delta RPS function.
+    /// \~Spanish
+    /// \brief Lee el combobox, valida los inputs y llama a la versión
+    /// alpha, beta, gamma o delta de las funciones de RPS (piedra, papel y tijera)
+    void callOneOfTheRPS();
+
+
+    /// \fn callOneOfTheDices
+    /// \~English
+    /// \brief Reads the version combobox, validates the inputs, and calls the
+    /// alpha, beta, gamma or delta dice function.
+    /// \~Spanish
+    /// \brief Lee el combobox, valida los inputs y llama a la versión
+    /// alpha, beta, gamma o delta de las funciones de "dice".
+    void callOneOfTheDices();
+
+
+    /// \fn callOneOfTheChecks
+    /// \~English
+    /// \brief Reads the version combobox, validates the inputs, and calls the
+    /// alpha, beta, gamma or delta check function
+    /// \~Spanish
+    /// \brief Lee el combobox, valida los inputs y llama a la versión
+    /// alpha, beta, gamma o delta de las funciones de cheques.
+    void callOneOfTheChecks();
+
+
+    /// \fn callOneOfTheZulus
+    /// \~English
+    /// \brief Reads the version combobox, validates the inputs, and calls the
+    /// alpha, beta, gamma or delta zulu time function
+    /// \~Spanish
+    /// \brief Lee el combobox, valida los inputs y llama a la versión
+    /// alpha, beta, gamma o delta de las funciones de zulu time.
+    void callOneOfTheZulus();
+
+
+    /// \fn paintDice
+    /// \~English
+    /// \brief This function is called on every timer tick to "animate" the dice.
+    /// \~Spanish
+    /// \brief Función invocada en cada tick del timer para "animar" el dado.
+    void paintDice();
 
 private:
-    Ui::MainWindow *ui;
-    secondwindow *window;
-    QGridLayout *layout;
-    QPushButton *button[2];
+    Ui::MainWindow  *ui;
+    secondwindow    *window;
+    QGridLayout     *layout;
+    QPushButton     *button[2];
+    QLineEdit       *line[7];
+    QLabel          *label[7];
+    QComboBox       *method, *cmbPlayer01, *cmbPlayer02;
+    QTimer          *aTimer;
+
     int buttonSize;
-    QLineEdit *line[7];
     int lineSize;
-    QLabel *label[7];
     int labelSize;
-    QComboBox *method;
     QString option;
     QImage dice1;
     QImage dice2;
+    int diceFinal01, diceFinal02;
+    int timerCounter;
     int score1, score2;
+
+    QVector<QImage> diceImages;
 };
 
 #endif // MAINWINDOW_H

mainwindow.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>487</width>
-    <height>257</height>
+    <width>361</width>
+    <height>256</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -42,8 +42,8 @@
    <widget class="QPushButton" name="RPSButton">
     <property name="geometry">
      <rect>
-      <x>330</x>
-      <y>70</y>
+      <x>10</x>
+      <y>140</y>
       <width>141</width>
       <height>61</height>
      </rect>
@@ -66,19 +66,6 @@
      <string>Dice</string>
     </property>
    </widget>
-   <widget class="QPushButton" name="APFTButton">
-    <property name="geometry">
-     <rect>
-      <x>330</x>
-      <y>140</y>
-      <width>141</width>
-      <height>61</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string>APFT</string>
-    </property>
-   </widget>
    <widget class="QPushButton" name="ZuluButton">
     <property name="geometry">
      <rect>
@@ -92,19 +79,6 @@
      <string>Zulu</string>
     </property>
    </widget>
-   <widget class="QPushButton" name="CheckWriterButton">
-    <property name="geometry">
-     <rect>
-      <x>10</x>
-      <y>140</y>
-      <width>141</width>
-      <height>61</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string>Check Writer</string>
-    </property>
-   </widget>
    <widget class="QFrame" name="frame">
     <property name="geometry">
      <rect>
@@ -126,9 +100,9 @@
     <widget class="QLabel" name="label">
      <property name="geometry">
       <rect>
-       <x>180</x>
+       <x>30</x>
        <y>10</y>
-       <width>161</width>
+       <width>361</width>
        <height>41</height>
       </rect>
      </property>
@@ -143,6 +117,9 @@
      <property name="text">
       <string>Testing Lab</string>
      </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
     </widget>
     <widget class="QFrame" name="frame_2">
      <property name="geometry">
@@ -150,7 +127,7 @@
        <x>30</x>
        <y>54</y>
        <width>641</width>
-       <height>21</height>
+       <height>16</height>
       </rect>
      </property>
      <property name="styleSheet">
@@ -163,13 +140,11 @@
       <enum>QFrame::Raised</enum>
      </property>
     </widget>
-    <zorder>frame_2</zorder>
-    <zorder>label</zorder>
    </widget>
    <widget class="QFrame" name="frame_3">
     <property name="geometry">
      <rect>
-      <x>290</x>
+      <x>160</x>
       <y>200</y>
       <width>201</width>
       <height>61</height>
@@ -179,11 +154,12 @@
      <string notr="true">background-image: url(:/images/resources/logo.png);</string>
     </property>
     <property name="frameShape">
-     <enum>QFrame::NoFrame</enum>
+     <enum>QFrame::StyledPanel</enum>
     </property>
     <property name="frameShadow">
      <enum>QFrame::Raised</enum>
     </property>
+    <zorder>label</zorder>
    </widget>
   </widget>
  </widget>

secondwindow.cpp

@@ -7,5 +7,5 @@ secondwindow::secondwindow(QWidget *parent) :
 }
 
 void secondwindow::closeEvent(QCloseEvent *){
-    emit cerrado(true);
+    emit closeIt(true);
 }

secondwindow.h

@@ -7,12 +7,37 @@ class secondwindow : public QWidget
 {
     Q_OBJECT
 public:
+
+    /// \fn secondwindow
+    /// \~English
+    /// \brief Constructor.
+    /// \param parent this object's parent
+    /// \~Spanish
+    /// \brief Constructor
+    /// \param parent ventana padre
     explicit secondwindow(QWidget *parent = 0);
 
 signals:
-    void cerrado(bool si);
+    /// \fn closeIt
+    /// \~English
+    /// \brief Just a signal that will be emitted when closing 
+	/// objects of this class
+	/// \param dummy this parameter is just for making this signal compatible with 
+    /// type of slot it will be connected.
+    /// \~Spanish
+    /// \brief Señal que será emitida al cerrar objetos de esta clase
+	/// \param dummy este parameterro existe para que la señal sea compatible con el
+	/// slot al que será conectada.
+    void closeIt(bool dummy);
 
 protected:
+
+    /// \fn closeEvent
+    /// \~English
+    /// \brief Overloaded function that is called when an object of this class is closed.
+    /// \~Spanish
+    /// \brief Función sobrecargada que es invocada cuando se cierra un objeto de 
+    /// esta clase.  
     virtual void closeEvent(QCloseEvent *);
 
 public slots: