Bläddra i källkod

Correcciones gramaticales

SaraB 7 år sedan
förälder
incheckning
5b67775d98
3 ändrade filer med 11 tillägg och 12 borttagningar
  1. 2
    3
      README-en.md
  2. 6
    6
      mainwindow.cpp
  3. 3
    3
      mainwindow.h

+ 2
- 3
README-en.md Visa fil

4
 ![main2.png](images/main2-small.png)
4
 ![main2.png](images/main2-small.png)
5
 ![main3.png](images/main3-small.png)
5
 ![main3.png](images/main3-small.png)
6
 
6
 
7
-[Verano 2016 - Ive - Coralys]
8
 
7
 
9
-Two common tasks when working with arrays of data is to search for and sort the data in ascending or descending order. Two well known simple sorting algorithms are the Selection Sort and the Bubble Sort. Sorting algorithms make up part of many programs; for example, contact lists, search engines, spreadsheets, etc. In this laboratory experience, you will complete an application to process images and pratice the use of sorting algorithms. You will also learn about the `QImage` library from `Qt` and about the median filter used in image processing to remove noise, in this case, a pesky tourist.
8
+Two common tasks when working with arrays of data is to search for and sort the data in ascending or descending order. Two well known simple sorting algorithms are the Selection Sort and the Bubble Sort. Sorting algorithms make up part of many programs; for example, contact lists, search engines, spreadsheets, etc. In this laboratory experience, you will complete an application to process images and pratice the use of sorting algorithms. You will also learn about the `QImage` library from `Qt` and about the median filter used in image processing to remove noise, or in this case, a pesky tourist.
10
 
9
 
11
 
10
 
12
 ## Objectives:
11
 ## Objectives:
81
 
80
 
82
 ### Median
81
 ### Median
83
 
82
 
84
-The *median* of a list of numbers is the value that separates halve the numbers with a higher value from the half of the numbers with a lower value. To calculate it, the list is ordered in ascending order. If the number of elements is odd, the middle value is chosen. If the number of elements is even, the average of the two middle values is taken.
83
+The *median* of a list of numbers is the value that halves the list, seperating half the number with higher valuesfrom half the numbers with lower value. To calculate it, the list is ordered in ascending order. If the number of elements is odd, the middle value is chosen. If the number of elements is even, the average of the two middle values is taken.
85
 
84
 
86
 For example, the median of {3,5,2,7,11} is 5 since the ordered array is {2, 3, 5, 7, 11}. The median of {3,9,3,2,10,11} is 6 since the ordered array is {2, 3, 3, 9, 10, 11} and the average of 3 and 9 is 6.
85
 For example, the median of {3,5,2,7,11} is 5 since the ordered array is {2, 3, 5, 7, 11}. The median of {3,9,3,2,10,11} is 6 since the ordered array is {2, 3, 3, 9, 10, 11} and the average of 3 and 9 is 6.
87
 
86
 

+ 6
- 6
mainwindow.cpp Visa fil

22
     new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_O), this, SLOT(on_btnLoadImages_clicked()));
22
     new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_O), this, SLOT(on_btnLoadImages_clicked()));
23
     ///
23
     ///
24
     /// Removes noise from a image with cmd + r
24
     /// Removes noise from a image with cmd + r
25
-    /// Remueve el ruido de una imagen con cmd + r
25
+    /// Elimina el ruido de una imagen con cmd + r
26
     new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_R), this, SLOT(on_btnRemoveNoise_clicked()));
26
     new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_R), this, SLOT(on_btnRemoveNoise_clicked()));
27
     ///
27
     ///
28
     /// Saves an image without noise with cmd + s
28
     /// Saves an image without noise with cmd + s
55
                          // Guarda la informacion de el proximo archivo a revisar
55
                          // Guarda la informacion de el proximo archivo a revisar
56
 
56
 
57
     // String to store the path of the current file being checked
57
     // String to store the path of the current file being checked
58
-    // Cadena para guardar el camino del archivo actual a revisar
58
+    // Cadena para guardar el camino del archivo actual en revisión
59
     QString filePath;
59
     QString filePath;
60
 
60
 
61
     // String to store the name of the current file being checked
61
     // String to store the name of the current file being checked
64
 
64
 
65
     for(int i = 0; i < list.size(); i++){
65
     for(int i = 0; i < list.size(); i++){
66
         fileInfo = list.at(i);  // Get the file info at possition i
66
         fileInfo = list.at(i);  // Get the file info at possition i
67
-                                // Obtiene el la informacion del archivo en posicion i
67
+                                // Obtiene la informacion del archivo en posicion i
68
         filePath = fileInfo.filePath(); // Get the file path
68
         filePath = fileInfo.filePath(); // Get the file path
69
                                         // Obtiene el camino al archivo
69
                                         // Obtiene el camino al archivo
70
         fileName = fileInfo.fileName(); // Get the file name
70
         fileName = fileInfo.fileName(); // Get the file name
71
-                                        // Obtiene el nombre el archivo
71
+                                        // Obtiene el nombre del archivo
72
 
72
 
73
         QImage image(filePath); // Load the file as an image
73
         QImage image(filePath); // Load the file as an image
74
                                 // Carga el archivo como una imagen
74
                                 // Carga el archivo como una imagen
78
         if(image.isNull())
78
         if(image.isNull())
79
             continue;
79
             continue;
80
         // Add the image to the image_value vector
80
         // Add the image to the image_value vector
81
-        // Anade la imagen a el vector de imagenes.
81
+        // Anade la imagen al vector de imagenes.
82
         else
82
         else
83
             images.push_back(image) ;
83
             images.push_back(image) ;
84
     }
84
     }
116
     loadImages(images, directory);
116
     loadImages(images, directory);
117
 
117
 
118
     // Setting the image labels with the orinal images
118
     // Setting the image labels with the orinal images
119
-    // Ajusta la imageen a las etiquetas.
119
+    // Ajusta la imagen a las etiquetas.
120
 
120
 
121
     if(images.empty()){
121
     if(images.empty()){
122
         QMessageBox::information(this,"title goes here","Directory doesn't contain images");
122
         QMessageBox::information(this,"title goes here","Directory doesn't contain images");

+ 3
- 3
mainwindow.h Visa fil

38
         /// \param finalImage Image with the noise removed
38
         /// \param finalImage Image with the noise removed
39
         /// \param images Vector of images to remove the noise
39
         /// \param images Vector of images to remove the noise
40
         /// \~Spanish
40
         /// \~Spanish
41
-        /// \brief Funcion que remueve el ruido de un conjunto de imagenes.
41
+        /// \brief Funcion que elimina el ruido de un conjunto de imagenes.
42
         /// Por cada posicion (i, j) de los pixeles, inserta en un vector el pixel en
42
         /// Por cada posicion (i, j) de los pixeles, inserta en un vector el pixel en
43
         /// esa posicion por cada una de las imagenes, ordena el vector de pixeles, y finalmente
43
         /// esa posicion por cada una de las imagenes, ordena el vector de pixeles, y finalmente
44
         /// ajusta el pixel (i,j) de la nueva imagen al pixel en la media.
44
         /// ajusta el pixel (i,j) de la nueva imagen al pixel en la media.
64
         /// \fn void MainWindow::on_btnRemoveNoise_clicked()
64
         /// \fn void MainWindow::on_btnRemoveNoise_clicked()
65
         /// \~English
65
         /// \~English
66
         /// \brief Function that invokes the function that removes the noise from the images
66
         /// \brief Function that invokes the function that removes the noise from the images
67
-        /// and set the returned image in the GUI
67
+        /// and sets the returned image in the GUI
68
         /// \~Spanish
68
         /// \~Spanish
69
-        /// \brief Funcion que invoca la funcion que remueve el ruido de las imagenes y
69
+        /// \brief Funcion que invoca la funcion que elimina el ruido de las imagenes y
70
         /// ajusta la imagen que devuelve enn el GUI.
70
         /// ajusta la imagen que devuelve enn el GUI.
71
         void on_btnRemoveNoise_clicked();
71
         void on_btnRemoveNoise_clicked();
72
 
72