Changes in the sources, updated README

QuadraticFormula.cpp

@@ -1,39 +1,21 @@
+/* Ive changed the type of the function to double,     */
+/* so it is consistent with the type that sqrt returns */
+
+
 #include "frog.h"
 
-/// \fn frog::QuadraticPlus(int a, int b, int c)
-/// \~English
-/// \brief Function that returns the result of the negative quadratic formula.
-/// \param a: value used to complete the quadratic formula
-/// \param b: value used to complete the quadratic formula
-/// \param c: value used to complete the quadratic formula
-/// \~Spanish
-/// \brief Funcion que devuelve el resultado de la formula cuadratica negativa.
-/// \param a: valor utilizado para completar la formula quadratica
-/// \param b: valor utilizado para completar la formula quadratica
-/// \param c: valor utilizado para completar la formula quadratica
 double frog::QuadraticPlus(int a, int b, int c){
-    double result = 0;
+    double result;
 
-    // YOUR CODE HERE / TU CODIGO AQUI
+    // YOUR CODE HERE
 
-    return result = 0;
+    return result;
 }
 
-/// \fn frog::QuadraticMinus(int a, int b, int c)
-/// \~English
-/// \brief Function that returns the result of the negative quadratic formula.
-/// \param a: value used to complete the quadratic formula
-/// \param b: value used to complete the quadratic formula
-/// \param c: value used to complete the quadratic formula
-/// \~Spanish
-/// \brief Funcion que devuelve el resultado de la formula cuadratica negativa.
-/// \param a: valor utilizado para completar la formula quadratica
-/// \param b: valor utilizado para completar la formula quadratica
-/// \param c: valor utilizado para completar la formula quadratica
 double frog::QuadraticMinus(int a, int b, int c){
     double result;
 
-    // YOUR CODE HERE / TU CODIGO AQUI
+    // YOUR CODE HERE
 
     return result;
 }

README.md

@@ -316,7 +316,7 @@ In this exercise you will implement the quadratic formula to complete a game in
     ---
 
 
-5. Use "Deliverable 1" in Moodle to submit the file  `QuadraticFormula.cpp` containing the code with the functions `QuadraticPlus` and `QuadraticMinus`. Remember to use good programming practices, to include the names of the programmers and to document your program.
+5. Use "Deliver 1" in Moodle to submit the file  `QuadraticFormula.cpp` containing the code with the functions `QuadraticPlus` and `QuadraticMinus`. Remember to use good programming practices, to include the names of the programmers and to document your program.
 
 6. To play, the frog should leap jump from one leaf to another. Note that the leaves have values for $x_1$ and $x_2$. These values represent the intersects of the parabola with the $x$-axis. You should input the values for the coefficients $a, b, c$ of the quadratic equation so that its graph that is a parabola that opens down and intersects the $x$-axis in the values $x_1, x_2$ shown in the leaves. You can obtain these values noting that
 
@@ -347,6 +347,6 @@ Suppose that all courses in Cheo's University are 3 credits each and have the fo
 
     2. Remember that, in C++, when both operands in the division are integers, the result will also be an integer; the remainder will be discarded. Use "type casting": `static_cast\<type\>(expression)' to solve this problem.
 
-3. Verify your program by computing the GPA of a student that has two A's and 2 B's; what is the grade of this student, A or B (A goes from 3.5 to 4 points)? When your program is correct, save the `main.cpp` file and submit it using "Deliverable 2" in Moodle. Remember to follow the instructions regarding the names and types of the variables,  to include the names of the programmers, to document your program and to use good programming practices.
+3. Verify your program by computing the GPA of a student that has two A's and 2 B's; what is the grade of this student, A or B (A goes from 3.5 to 4 points)? When your program is correct, save the `main.cpp` file and submit it using "Deliver 2" in Moodle. Remember to follow the instructions regarding the names and types of the variables,  to include the names of the programmers, to document your program and to use good programming practices.
 
 

frog.cpp

@@ -1,7 +1,3 @@
-///
-/// Modifications:
-///     - 2015-06-05 [Ian Davila] - Changed Frogger's location
-///
 #include "frog.h"
 #include <QDebug>
 #include <cstdlib>
@@ -11,87 +7,59 @@
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 
-/// \fn frog::frog(QWidget *parent)
-/// \~English
-/// \brief Default constructor.
-/// * Ysapo: Y coordinate of the frog, set at 190 so it sits on top of the leaf
-/// * Xsapo: X coordinate of the frog, a random number from 0 to -30
-/// * xnenu, xnenu2, xnenu3: X coordinates of the leafs
-/// * textBool: Boolean for the labels on the leafs
-/// * temp, temp2: X coordinate of the background
-/// \~Spanish
-/// \ brief Constructor por defecto.
-/// * Ysapo: Coordenada Y del sapo, inicializado a 190 para que aparesca encima del nenufar
-/// * Xsapo: Coordenada X del sapo, un numero aleatorio de 0 a -30
-/// * xnenu, xnenu2, xnenu3: coordenadas x de las hojas
-/// * textBool: Booleana para las etiquetas de los nenufares
-/// * temp, temp2: Coordenada X del fondo
-///
 frog::frog(QWidget *parent) :
     QWidget(parent)
 {
     myTimer= new QTimer(this);
-    flag = xFlag = backFlag = moved = textBool = false;
+    flag = xFlag = false;
     Ysapo = 190;
     A = B = C = 0;
     temp = 580;
     temp2 = 0;
-    xnenu = -(rand()%30);
-    initialX = Xsapo = xnenu;
+    backFlag = false;
+    moved = false;
+    textBool = false;
+    buttonCounter = 0;
+    xnenu = -(rand() %30);
+    Xsapo = xnenu;
+    initialX = Xsapo;
     xnenu2 = (rand() % 100) + 100;
     xnenu3 = xnenu2 + (rand() % 100) + 200;
 }
 
-/// \fn void frog::updatenenu()
-/// \~English
-/// \brief Function that updates the position of the frog and the leafs
-///  when the frog reaches the end of the screen when it's sliding back.
-/// \~Spanish
-/// \brief Funcion que actualiza la posicion del sapo y los nenufares
-///  cuando el sapo llega al final de la pantalla cuando se desliza hacia atras.
-///
 void frog::updatenenu(){
     xnenu = -(rand() % 30);
-    initialX = Xsapo = xnenu;
+    Xsapo = xnenu;
+    initialX = Xsapo;
     xnenu2 = (rand() % 100) + 100;
     xnenu3 = xnenu2 + (rand() % 100) + 200;
 }
 
-/// \fn void frog::reset()
-/// \~English
-/// \brief Function that is invoked when the retry button is clicked, resets
-///  the frog and the leafs to a random starting position.
-/// \~Spanish
-/// \brief Funcion que es invocada cuando el boton de "retry" es presionado,
-///  restablece el sapo y los nenufares a una posicion de partida aleatoria.
-///
 void frog::reset(){
-    flag = xFlag = backFlag = moved = textBool = false;
+    flag = xFlag = false;
     Ysapo = 190;
     A = B = C = 0;
     temp = 580;
     temp2 = 0;
+    backFlag = false;
+    moved = false;
+    buttonCounter = 0;
+    textBool = false;
     repaint();
+
     myTimer->stop();
     delete myTimer;
     myTimer = new QTimer;
     connect(myTimer, SIGNAL(timeout()), this, SLOT(mySlot()));
     xnenu = -(rand() %30);
-    initialX = Xsapo = xnenu;
+    Xsapo = xnenu;
+    initialX = Xsapo;
     xnenu2 = (rand() % 100) + 100;
     xnenu3 = xnenu2 + (rand() % 100) + 200;
 
 }
 
-/// \fn void frog::paintEvent(QPaintEvent *event)
-/// \~English
-/// \brief Function that is invoked each time the widget or
-///  its parent receives a repaint signal.
-/// \~Spanish
-/// \brief Funcion que es invocada automaticamente cada vez que el widget
-///  o su padre recive una senal de repintar.
-///
-void frog::paintEvent(QPaintEvent *){
+void frog::paintEvent(QPaintEvent *event){
     QPainter p(this);
     QString frogger = ":/images/Frogger1.png";
     QString frogger2 = ":/images/Frogger2.png";
@@ -99,12 +67,20 @@ void frog::paintEvent(QPaintEvent *){
     QString leaf = ":/images/Nenufar1.png";
     QString back = ":/images/background.jpg";
 
-    //Conditions that allow a margin of error (not landing in the exact x calculated)
+//    Condiciones que permitian un rango de error (no caer en la x exacta de los nenufares)
+
     if(backFlag == true || (Xsapo <= (xnenu3 + 55) && Xsapo >= (xnenu3 - 55) && Ysapo == 190)
             || (Xsapo > xnenu && Ysapo == 190 && Xsapo < (xnenu2-55))
             || (Xsapo > xnenu2 && Ysapo == 190 && Xsapo < (xnenu3-55))
             || (Xsapo > xnenu3 && Ysapo == 190)){
 
+//    if(backFlag == true || (Ysapo == 190 && (Xsapo != xnenu && Xsapo != xnenu2))){
+        if (inter1Label == NULL){
+            delete inter1Label;
+        }
+        if (inter2Label == NULL){
+            delete inter2Label;
+        }
         backFlag = true;
         myTimer->stop();
         delete myTimer;
@@ -112,20 +88,19 @@ void frog::paintEvent(QPaintEvent *){
         QThread::msleep(5);
         connect(myTimer, SIGNAL(timeout()), this, SLOT(mySlot()));
 
-        // Draw background
+
+
         p.drawPixmap(temp2,-5,600,400,QPixmap(back));
         p.drawPixmap(temp,-5,600,400,QPixmap(back));
 
-        // Draw leaves
-        p.drawPixmap(xnenu,230,125,60,QPixmap(leaf));
-        p.drawPixmap(xnenu2,230,125,60,QPixmap(leaf));
-        p.drawPixmap(xnenu3,230,125,60,QPixmap(leaf));
+        p.drawPixmap(xnenu,250,125,60,QPixmap(leaf));
+        p.drawPixmap(xnenu2,250,125,60,QPixmap(leaf));
+        p.drawText(xnenu2+45,290,"x1 = " + QString::number(xnenu2));
+        p.drawPixmap(xnenu3,250,125,60,QPixmap(leaf));
+        p.drawText(xnenu3+45,290,"x2 = " + QString::number(xnenu3));
+
 
-        // Draw text labels
-        p.drawText(xnenu2+45,310,"x1 = " + QString::number(xnenu2));
-        p.drawText(xnenu3+45,310,"x2 = " + QString::number(xnenu3));
 
-        // Moves everything on the screen back on the x-axis
         Xsapo=Xsapo-1;
         xnenu=xnenu-1;
         xnenu2=xnenu2-1;
@@ -133,9 +108,11 @@ void frog::paintEvent(QPaintEvent *){
         temp= temp - 1;
         temp2 = temp2 -1;
 
+
         repaint();
 
-        // When the frog reaches the end of the screen reset everything to a start position
+
+
         if(temp == 0 || xnenu3 == -10 || Xsapo == 0){
             backFlag = false;
             temp = 580;
@@ -145,77 +122,63 @@ void frog::paintEvent(QPaintEvent *){
             updatenenu();
         }
 
-    }else{
+    }
+    else{
           QFont font = p.font();
           font.setBold(true);
           p.setFont(font);
 
-          // Draw background
           p.drawPixmap(temp2,-5,600,400,QPixmap(back));
           p.drawPixmap(temp,-5,600,400,QPixmap(back));
+          p.drawPixmap(xnenu,250,125,60,QPixmap(leaf));
+          p.drawPixmap(xnenu2,250,125,60,QPixmap(leaf));
+          p.drawPixmap(xnenu3,250,125,60,QPixmap(leaf));
 
-          // Draw leaves
-          p.drawPixmap(xnenu,230,125,60,QPixmap(leaf));
-          p.drawPixmap(xnenu2,230,125,60,QPixmap(leaf));
-          p.drawPixmap(xnenu3,230,125,60,QPixmap(leaf));
+//          Cambiada la condicion para que sea exacta la caida en el nenufar
+//          if(Xsapo < (xnenu2 + 55) && Ysapo == 190 && Xsapo > (xnenu2-55)){
+//               textBool = true;
+//          }
 
-          //Cambiada la condicion para que sea exacta la caida en el nenufar // Funciona con esta condición
-          if(Xsapo < (xnenu2 + 55) && Ysapo == 190 && Xsapo > (xnenu2-55)){
-               textBool = true;
-          }
-
-          // When the frog lands on the second leaf, change labels to next leaf
           if(Ysapo == 190 && Xsapo == xnenu2){
             textBool = true;
           }
 
           if(textBool){
-              // Redraw the text labels
-              p.drawText(xnenu2+35,310,"x1 = " + QString::number(xnenu2)); // de 290 a 310
-              p.drawText(xnenu3+35,310,"x2 = " + QString::number(xnenu3));
-              p.drawPixmap(xnenu,230,125,60,QPixmap(leaf)); // 250 a 230
-          }else{
-              p.drawText(xnenu2+35,310,"x2 = " + QString::number(xnenu2)); // de 290 a 310
+              p.drawText(xnenu2+35,290,"x1 = " + QString::number(xnenu2));
+              p.drawText(xnenu3+35,290,"x2 = " + QString::number(xnenu3));
+              p.drawPixmap(xnenu,250,125,60,QPixmap(leaf));
+          }
+          else{
+              p.drawText(xnenu2+35,290,"x2 = " + QString::number(xnenu2));
           }
+
     }
 
-    //Cambiada la condicion para que sea exacta la caida en el nenufar
-    if((Xsapo > (xnenu + 55) && Ysapo == 190 && Xsapo < (xnenu2-55))
+//    Cambiada la condicion para que sea exacta la caida en el nenufar
+    if(Xsapo > (xnenu + 55) && Ysapo == 190 && Xsapo < (xnenu2-55)
         || (Xsapo > (xnenu2 + 55) && Ysapo == 190 && Xsapo < (xnenu3-55))
         || (Xsapo > (xnenu3 + 55) && Ysapo == 190)){
 
+//    if(Ysapo == 190 && (Xsapo != xnenu && Xsapo != xnenu2 && Xsapo != xnenu3)){
         p.drawPixmap(Xsapo, Ysapo + 30, 100, 80, QPixmap(frogger3));
-
-    }else if(Ysapo < 190){
-       p.drawPixmap(Xsapo,Ysapo,100,100,QPixmap(frogger2));
-
+    }
+    else if(Ysapo < 190){
+        p.drawPixmap(Xsapo,Ysapo,100,100,QPixmap(frogger2));
     }else if(Ysapo == 190){
         qDebug() << "xsapo: " << Xsapo << "xnenu2: " << xnenu2;
-        p.drawPixmap(Xsapo + 15,Ysapo - 20 ,100,100,QPixmap(frogger)); //+15 a la Xsapo, -20 a Ysapo
+        p.drawPixmap(Xsapo,Ysapo,100,100,QPixmap(frogger));
         if(!textBool){
-            p.drawText(xnenu+45,310,"x1 = " + QString::number(xnenu+10));
+            p.drawText(xnenu+45,290,"x1 = " + QString::number(xnenu+10));
         }
     }
+
 }
 
-/// \fun frog::~frog()
-/// \~English
-/// \brief Default destructor.
-/// \~Spanish
-/// \brief Destructor por defecto.
-///
 frog::~frog(){
     delete myTimer;
 }
 
-/// \fun void frog::mySlot()
-/// \~English
-/// \brief Function connected to a timer, used to simulate the
-///  frog's jump.
-/// \~Spanish
-/// \brief Funcion conectada a un reloj, utilizada para simular
-///  el brinco del sapo
-///
+
 void frog::mySlot(){
     float interX1 = 0;
     float interX2 = 0;
@@ -224,6 +187,8 @@ void frog::mySlot(){
     float xtemp = 0;
     float xEnd = 0;
 
+
+
     interX1 = QuadraticMinus(A,B,C);
     interX2 = QuadraticPlus(A,B,C);
 
@@ -234,6 +199,7 @@ void frog::mySlot(){
     }
     if(moved){
         moved = false;
+        buttonCounter = 1;
         initialX = Xsapo;
     }
 
@@ -269,27 +235,12 @@ void frog::mySlot(){
 
 }
 
-/// \fn void frog::run(int aa, int bb, int cc)
-/// \~English
-/// \brief Function that is invoked when the jump button is
-///  pressed, makes the frog jump to the coordinates calculated
-///  with the a, b, c values provided by the user.
-/// \param aa value provided by user to complete the quadratic equation ax^2 + bx + c
-/// \param bb value provided by user to complete the quadratic equation ax^2 + bx + c
-/// \param cc value provided by user to complete the quadratic equation ax^2 + bx + c
-/// \~Spanish
-/// \brief Funcion que es invocada cuando el boton de brincar es
-///  presionado, hace que el sapo salte a las coordenadas calculadas
-///  con los valores de a, b, c proporcionados por el usuario.
-/// \param aa valor proporcionado por el usuario utilizado para completar la ecuacion cuadratica ax^2 + bx + c
-/// \param bb valor proporcionado por el usuario utilizado para completar la ecuacion cuadratica ax^2 + bx + c
-/// \param cc valor proporcionado por el usuario utilizado para completar la ecuacion cuadratica ax^2 + bx + c
-///
 void frog::run(int aa, int bb, int cc){
 
     A = aa;
     B = bb;
     C = cc;
+    buttonCounter++;
 
     connect(myTimer, SIGNAL(timeout()), this, SLOT(mySlot()));
     myTimer->start(25);

frog.h

@@ -8,140 +8,32 @@
 #include <QTimer>
 #include <QLabel>
 
-
-/// Class that represent the frog and leaves.
-///
-/// Frog is a subclass of QWidget.
-
 class frog : public QWidget
 {
     Q_OBJECT
 public:
-
-    /// \fn frog::frog(QWidget *parent)
-    /// \~English
-    /// \brief Default constructor.
-    /// * Ysapo: Y coordinate of the frog, set at 190 so it sits on top of the leaf
-    /// * Xsapo: X coordinate of the frog, a random number from 0 to -30
-    /// * xnenu, xnenu2, xnenu3: X coordinates of the leafs
-    /// * textBool: Boolean for the labels on the leafs
-    /// * temp, temp2: X coordinate of the background
-    /// \~Spanish
-    /// \ brief Constructor por defecto.
-    /// * Ysapo: Coordenada Y del sapo, inicializado a 190 para que aparesca encima del nenufar
-    /// * Xsapo: Coordenada X del sapo, un numero aleatorio de 0 a -30
-    /// * xnenu, xnenu2, xnenu3: coordenadas x de las hojas
-    /// * textBool: Booleana para las etiquetas de los nenufares
-    /// * temp, temp2: Coordenada X del fondo
-    ///
     explicit frog(QWidget *parent = 0);
+    float Ysapo, Xsapo, initialX;
+    bool flag, xFlag, backFlag, moved, textBool;
+    int A, B, C, buttonCounter,temp,temp2,xnenu,xnenu2,xnenu3;
 
-    /// \fn frog::QuadraticPlus(int a, int b, int c)
-    /// \~English
-    /// \brief Function that returns the result of the positive quadratic formula.
-    /// \param a: value used to complete the quadratic formula ((-b) + sqrt((pow(b,2)) - 4*a*c))/(2*a)
-    /// \param b: value used to complete the quadratic formula ((-b) + sqrt((pow(b,2)) - 4*a*c))/(2*a)
-    /// \param c: value used to complete the quadratic formula ((-b) + sqrt((pow(b,2)) - 4*a*c))/(2*a)
-    /// \~Spanish
-    /// \brief Funcion que devuelve el resultado de la formula cuadratica positiva.
-    /// \param a: valor utilizado para completar la formula quadratica ((-b) + sqrt((pow(b,2)) - 4*a*c))/(2*a)
-    /// \param b: valor utilizado para completar la formula quadratica ((-b) + sqrt((pow(b,2)) - 4*a*c))/(2*a)
-    /// \param c: valor utilizado para completar la formula quadratica ((-b) + sqrt((pow(b,2)) - 4*a*c))/(2*a)
-    ///
     double QuadraticPlus(int a, int b, int c);
-
-    /// \fn frog::QuadraticMinus(int a, int b, int c)
-    /// \~English
-    /// \brief Function that returns the result of the negative quadratic formula.
-    /// \param a: value used to complete the quadratic formula ((-b) + sqrt((pow(b,2)) - 4*a*c))/(2*a)
-    /// \param b: value used to complete the quadratic formula ((-b) + sqrt((pow(b,2)) - 4*a*c))/(2*a)
-    /// \param c: value used to complete the quadratic formula ((-b) + sqrt((pow(b,2)) - 4*a*c))/(2*a)
-    /// \~Spanish
-    /// \brief Funcion que devuelve el resultado de la formula cuadratica negativa.
-    /// \param a: valor utilizado para completar la formula quadratica ((-b) - sqrt((pow(b,2)) - 4*a*c))/(2*a)
-    /// \param b: valor utilizado para completar la formula quadratica ((-b) - sqrt((pow(b,2)) - 4*a*c))/(2*a)
-    /// \param c: valor utilizado para completar la formula quadratica ((-b) - sqrt((pow(b,2)) - 4*a*c))/(2*a)
-    ///
     double QuadraticMinus(int a, int b, int c);
-
-    /// \fun frog::~frog()
-    /// \~English
-    /// \brief Default destructor.
-    /// \~Spanish
-    /// \brief Destructor por defecto.
-    ///
     ~frog();
 
-
-    float Ysapo; /**< Y coordinate of the frog*/
-    float Xsapo; /**< X coordinate of the frog*/
-    float initialX; /**< Initial position of the frog*/
-    bool flag, xFlag, backFlag, moved, textBool;
-    int A, B, C, buttonCounter,temp,temp2,xnenu,xnenu2,xnenu3;
-
+private:
+    QLabel *inter1Label;
+    QLabel *inter2Label;
 
 signals:
 
 public slots:
-    /// \fun void frog::mySlot()
-    /// \~English
-    /// \brief Function connected to a timer, used to simulate the
-    ///  frog's jump.
-    /// \~Spanish
-    /// \brief Funcion conectada a un reloj, utilizada para simular
-    ///  el brinco del sapo
-    ///
     void mySlot();
-
-    /// \fn void frog::run(int , int , int )
-    /// \~English
-    /// \brief Function that is invoked when the jump button is
-    ///  pressed, makes the frog jump to the coordinates calculated
-    ///  with the a, b, c values provided by the user.
-    /// \param aa value provided by user to complete the quadratic equation ax^2 + bx + c
-    /// \param bb value provided by user to complete the quadratic equation ax^2 + bx + c
-    /// \param cc value provided by user to complete the quadratic equation ax^2 + bx + c
-    /// \~Spanish
-    /// \brief Funcion que es invocada cuando el boton de brincar es
-    ///  presionado, hace que el sapo salte a las coordenadas calculadas
-    ///  con los valores de a, b, c proporcionados por el usuario.
-    /// \param aa valor proporcionado por el usuario utilizado para completar la ecuacion
-    ///  cuadratica ax^2 + bx + c
-    /// \param bb valor proporcionado por el usuario utilizado para completar la ecuacion
-    ///  cuadratica ax^2 + bx + c
-    /// \param cc valor proporcionado por el usuario utilizado para completar la ecuacion
-    /// cuadratica ax^2 + bx + c
     void run(int, int, int);
-
-    /// \fn void frog::reset()
-    /// \~English
-    /// \brief Function that is invoked when the retry button is clicked, resets
-    ///  the frog and the leafs to a random starting position.
-    /// \~Spanish
-    /// \brief Funcion que es invocada cuando el boton de "retry" es presionado,
-    ///  restablece el sapo y los nenufares a una posicion de partida aleatoria.
-    ///
     void reset();
-
-    /// \fn void frog::updatenenu()
-    /// \~English
-    /// \brief Function that updates the position of the frog and the leafs
-    ///  when the frog reaches the end of the screen when it's sliding back.
-    /// \~Spanish
-    /// \brief Funcion que actualiza la posicion del sapo y los nenufares
-    ///  cuando el sapo llega al final de la pantalla cuando se desliza hacia atras.
-    ///
     void updatenenu();
 
 protected:
-    /// \fn void frog::paintEvent(QPaintEvent *event)
-    /// \~English
-    /// \brief Function that is invoked each time the widget or
-    ///  its parent receives a repaint signal.
-    /// \~Spanish
-    /// \brief Funcion que es invocada automaticamente cada vez que el widget
-    ///  o su padre recive una senal de repintar.
-    ///
     void paintEvent(QPaintEvent *event);
     QTimer *myTimer;
 

mainwindow.cpp

@@ -2,26 +2,18 @@
 /// Modifications:
 ///     - 2015-01-13 [RAN] - Changed the quadraticFormulaCheck function to
 ///                 prevent giving away the expression
-///     - 2015-06-09 [LAA] - Modified the graphics windwow so that you aren't
-///                 able to scroll
 
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 #include <QMessageBox>
 
-/// \fn MainWindow::MainWindow(QWidget *parent)
-/// \~English
-/// \brief Default constructor.
-/// \~Spanish
-/// \brief Constructor por defecto.
-///
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
     ui(new Ui::MainWindow)
 {
     quadraticFormulaCheck();
 
-    // set up mainWindow
+
     ui->setupUi(this);
     scene= new QGraphicsScene(this);
     scene->setSceneRect(QRectF(QPointF(0,0), QPointF(0,0)));
@@ -29,9 +21,7 @@ MainWindow::MainWindow(QWidget *parent) :
     ui->MainView->setAlignment((Qt::AlignLeft | Qt::AlignTop));
     ui->MainView->resize(580,345);
     ui->MainView->move(0,0);
-    ui->MainView->setEnabled(false);
 
-    // set lables and buttons
     ui->alabel->move(10,360);
     ui->alineEdit->move(25,358);
     ui->blabel->move(85,360);
@@ -40,38 +30,29 @@ MainWindow::MainWindow(QWidget *parent) :
     ui->clineEdit->move(175,358);
     ui->RunPushButton->move(10,385);
     ui->retryButton->move(180,385);
-    ui->RunPushButton->setEnabled(false);
+
+
 
     frogger = new frog;
+    //ui->x1Label->setText(fr);
+   // ui->x1Label->move(frogger->xnenu2, 300);
     globalTimer = new QTimer;
     scene->addWidget(frogger);
 
+    ui->RunPushButton->setEnabled(false);
 
 }
 
-/// \fn MainWindow::~MainWindow()
-/// \~English
-/// \brief Default destructor
-/// \~Spanish
-/// \brief Destructor por defecto
-///
+
 MainWindow::~MainWindow()
 {
     delete ui;
     delete scene;
 }
 
-/// \fn void MainWindow::quadraticFormulaCheck()
-/// \~English
-/// \brief Function that uses an array of values to determine
-///  if the equation written by the student is correct.
-/// \~Spanish
-/// \brief Funcion que utiliza un arreglo de valores para
-///  determinar si la ecuacion que escribio el estudiante
-///  esta correcta.
-///
 void MainWindow::quadraticFormulaCheck()
 {
+    // float firstX;
     float resultFromFunction;
     bool pass = true;
     float values[] = {357 , -1000 , 698 , 1.4804781099 , 748 , -392 , 51 , 0.28391805554 ,
@@ -97,7 +78,7 @@ void MainWindow::quadraticFormulaCheck()
         // firstX = (((-b) + sqrt((pow(b,2)) - 4*a*c))/(2*a));
         resultFromFunction = frogger->QuadraticPlus(a,b,c);
 
-        if( fabs(resultFromFunction - expected) > 0.00001) {
+        if( abs(resultFromFunction - expected) > 0.00001) {
             pass = false;
         }
     }
@@ -116,7 +97,7 @@ void MainWindow::quadraticFormulaCheck()
         // firstX = (((-b) + sqrt((pow(b,2)) - 4*a*c))/(2*a));
         resultFromFunction = frogger->QuadraticMinus(a,b,c);
 
-        if( fabs(resultFromFunction - expected) > 0.00001) {
+        if( abs(resultFromFunction - expected) > 0.00001) {
             pass = false;
         }
     }
@@ -126,14 +107,6 @@ void MainWindow::quadraticFormulaCheck()
     }
 }
 
-/// \fn void on_RunPushButton_clicked()
-/// \~English
-/// \brief Function that is invoked when the jump button is pressed,
-///  frog jumps to calculated location.
-/// \~Spanish
-/// \brief Funcion que se invoca cuando el boton de "jump" es presionado,
-///  el sapo brinca a la localizacion calculada.
-///
 void MainWindow::on_RunPushButton_clicked()
 {
     int a = 0;
@@ -183,29 +156,12 @@ void MainWindow::on_RunPushButton_clicked()
 
 }
 
-/// \fn void on_retryButton_clicked()
-/// \~English
-/// \brief Function that is invoked when the reset button is pressed,
-///  returns the window to its original state.
-/// \~Spanish
-/// \brief Funcion que se invoca cuando el boton de "reset" es presionado,
-///  devuelve la ventana a su estado original.
-///
 void MainWindow::on_retryButton_clicked()
 {
     frogger->reset();
 }
 
-/// \fn MainWindow::on_alineEdit_textChanged(QString &arg1)
-/// \~English
-/// \brief Function that is invoked when the text is changed in the
-///  alineEdit, enables jump buttton if the other line edits aren't empty.
-/// \~Spanish
-/// \brief Funcion que se invoca cuando el texto dentro de alineEdit
-///  cambia, permite que el button de "jump" sea presionado si los otros
-///  "line edits" no estan vacios.
-///
-void MainWindow::on_alineEdit_textChanged()
+void MainWindow::on_alineEdit_textChanged(const QString &arg1)
 {
     if(ui->alineEdit->text() != "" && ui->blineEdit->text() != "" && ui->clineEdit->text() != "" ){
         ui->RunPushButton->setEnabled(true);
@@ -215,16 +171,7 @@ void MainWindow::on_alineEdit_textChanged()
     }
 }
 
-/// \fn MainWindow::on_blineEdit_textChanged(QString &arg1)
-/// \~English
-/// \brief Function that is invoked when the text is changed in the
-///  alineEdit, enables jump buttton if the other line edits aren't empty.
-/// \~Spanish
-/// \brief Funcion que se invoca cuando el texto dentro de alineEdit
-///  cambia, permite que el button de "jump" sea presionado si los otros
-///  "line edits" no estan vacios.
-///
-void MainWindow::on_blineEdit_textChanged()
+void MainWindow::on_blineEdit_textChanged(const QString &arg1)
 {
     if(ui->alineEdit->text() != "" && ui->blineEdit->text() != "" && ui->clineEdit->text() != "" ){
         ui->RunPushButton->setEnabled(true);
@@ -234,16 +181,9 @@ void MainWindow::on_blineEdit_textChanged()
     }
 }
 
-/// \fn MainWindow::on_clineEdit_textChanged(QString &arg1)
-/// \~English
-/// \brief Function that is invoked when the text is changed in the
-///  alineEdit, enables jump buttton if the other line edits aren't empty.
-/// \~Spanish
-/// \brief Funcion que se invoca cuando el texto dentro de alineEdit
-///  cambia, permite que el button de "jump" sea presionado si los otros
-///  "line edits" no estan vacios.
-///
-void MainWindow::on_clineEdit_textChanged()
+
+
+void MainWindow::on_clineEdit_textChanged(const QString &arg1)
 {
     if(ui->alineEdit->text() != "" && ui->blineEdit->text() != "" && ui->clineEdit->text() != "" ){
         ui->RunPushButton->setEnabled(true);

mainwindow.h

@@ -15,86 +15,20 @@ class MainWindow : public QMainWindow
     Q_OBJECT
 
 public:
-    /// \fn MainWindow::MainWindow(QWidget *parent)
-    /// \~English
-    /// \brief Default constructor.
-    /// \~Spanish
-    /// \brief Constructor por defecto.
-    ///
     explicit MainWindow(QWidget *parent = 0);
-
-    /// \fn MainWindow::~MainWindow()
-    /// \~English
-    /// \brief Default destructor
-    /// \~Spanish
-    /// \brief Destructor por defecto
-    ///
     ~MainWindow();
-
-    /// \fn void MainWindow::quadraticFormulaCheck()
-    /// \~English
-    /// \brief Function that uses an array of values to determine
-    ///  if the equation written by the student is correct.
-    /// \~Spanish
-    /// \brief Funcion que utiliza un arreglo de valores para
-    ///  determinar si la ecuacion que escribio el estudiante
-    ///  esta correcta.
-    ///
     void quadraticFormulaCheck();
 
 private slots:
-    /// \fn void on_RunPushButton_clicked()
-    /// \~English
-    /// \brief Function that is invoked when the jump button is pressed,
-    ///  frog jumps to calculated location.
-    /// \~Spanish
-    /// \brief Funcion que se invoca cuando el boton de "jump" es presionado,
-    ///  el sapo brinca a la localizacion calculada.
-    ///
     void on_RunPushButton_clicked();
 
-    /// \fn void on_retryButton_clicked()
-    /// \~English
-    /// \brief Function that is invoked when the reset button is pressed,
-    ///  returns the window to its original state.
-    /// \~Spanish
-    /// \brief Funcion que se invoca cuando el boton de "reset" es presionado,
-    ///  devuelve la ventana a su estado original.
-    ///
     void on_retryButton_clicked();
 
-    /// \fn MainWindow::on_alineEdit_textChanged(QString &arg1)
-    /// \~English
-    /// \brief Function that is invoked when the text is changed in the
-    ///  alineEdit, enables jump buttton if the other line edits aren't empty.
-    /// \~Spanish
-    /// \brief Funcion que se invoca cuando el texto dentro de alineEdit
-    ///  cambia, permite que el button de "jump" sea presionado si los otros
-    ///  "line edits" no estan vacios.
-    ///
-    void on_alineEdit_textChanged();
+    void on_alineEdit_textChanged(const QString &arg1);
 
-    /// \fn MainWindow::on_blineEdit_textChanged(QString &arg1)
-    /// \~English
-    /// \brief Function that is invoked when the text is changed in the
-    ///  alineEdit, enables jump buttton if the other line edits aren't empty.
-    /// \~Spanish
-    /// \brief Funcion que se invoca cuando el texto dentro de alineEdit
-    ///  cambia, permite que el button de "jump" sea presionado si los otros
-    ///  "line edits" no estan vacios.
-    ///
-    void on_blineEdit_textChanged();
+    void on_blineEdit_textChanged(const QString &arg1);
 
-    /// \fn MainWindow::on_clineEdit_textChanged(QString &arg1)
-    /// \~English
-    /// \brief Function that is invoked when the text is changed in the
-    ///  alineEdit, enables jump buttton if the other line edits aren't empty.
-    /// \~Spanish
-    /// \brief Funcion que se invoca cuando el texto dentro de alineEdit
-    ///  cambia, permite que el button de "jump" sea presionado si los otros
-    ///  "line edits" no estan vacios.
-    ///
-    void on_clineEdit_textChanged();
+    void on_clineEdit_textChanged(const QString &arg1);
 
 private:
     Ui::MainWindow *ui;