README-en.md edited online with Bitbucket

README-en.md

@@ -1,22 +1,24 @@
-# Pesky Tourist: Sorting and Nested Loops
+# Sorting Algorithms - Pesky Tourist
 
 ![main1.png](images/main1.png)
 ![main2.png](images/main2-small.png)
 ![main3.png](images/main3-small.png)
 
+[Verano 2016 - Ive]
+
 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 Selection Sort and Bubble Sort. Sorting algorithms make up part of many programs; for example, contact lists, search engines, 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.
 
 ##Objectives
 
-1) Practice sorting arrays by selection and the bubble method.
+1. Practice sorting arrays by selection and the bubble method.
 
-2) Practice the use of decision and repetition structures.
+2. Practice the use of decision and repetition structures.
 
-3) Use methods from the `vector` C++ class.
+3. Use methods from the `vector` C++ class.
 
-4) Use the methods of the `QImage` class from `Qt` to manipulate an image’s pixels.
+4.Use the methods of the `QImage` class from `Qt` to manipulate an image’s pixels.
 
-5) Learn about the median filter for image processing.
+5. Learn about the median filter for image processing.
 
 This laboratory experience is an adaptation of the nifty assignment presented by John Nicholson in [1].
 
@@ -24,15 +26,15 @@ This laboratory experience is an adaptation of the nifty assignment presented by
 
 Before arriving at the laboratory you should have:
 
-1) Reviewed the selection sort and bubble sort algorithms.
+1. Reviewed the selection sort and bubble sort algorithms.
 
-2) Familiarized yourself with the `push_back()`, `at(i)`,  `size()`, `clear()` methods in the C++ `vector` class.
+2. Familiarized yourself with the `push_back()`, `at(i)`,  `size()`, `clear()` methods in the C++ `vector` class.
 
-3) Familiariezed yourself with the `width()`, `height()`, `pixel(i, j)`, `setPixel(i,j, pixel)` methods in the `QImage` class from `Qt`.
+3. Familiariezed yourself with the `width()`, `height()`, `pixel(i, j)`, `setPixel(i,j, pixel)` methods in the `QImage` class from `Qt`.
 
-4) Studied the concepts and instructions for the laboratory session.
+4. Studied the concepts and instructions for the laboratory session.
 
-5) Taken the Pre-Lab quiz that can be found on Moodle.
+5. Taken the Pre-Lab quiz, available in Moodle.
 
 ---
 
@@ -126,25 +128,25 @@ The objects of the `QImage` class have the following methods that will be useful
 
 ### Examples:
 
-1) `QRgb myRgb = qRgb(0xff, 0x00, 0xff);`: Assigns to `myRgb` the value `0xff00ff` that represents the color ![figure3.png](images/figure3.png)
+1. `QRgb myRgb = qRgb(0xff, 0x00, 0xff);`: Assigns to `myRgb` the value `0xff00ff` that represents the color ![figure3.png](images/figure3.png)
 
-Notice that the value of `0xff00ff` represents the values `0xff`, `0x00`, `0xff`, that correspond to the red, green and blue components of `myRgb`.
+	Notice that the value of `0xff00ff` represents the values `0xff`, `0x00`, `0xff`, that correspond to the red, green and blue components of `myRgb`.
 
-2) If the following `4 x 4` image of pixels represents the object `originalImage`,
+2. If the following `4 x 4` image of pixels represents the object `originalImage`,
 
-![main1.png](images/main1.png)
+	![main1.png](images/main1.png)
 
-then `originalImage.pixel(2,1)` returns the `rgb` value that represents the color blue (`0x0000ff`).
+	then `originalImage.pixel(2,1)` returns the `rgb` value that represents the color blue (`0x0000ff`).
 
-3) The following instruction assigns the red color to the pixel in position `(2, 3)` in the edited image: 
+3. The following instruction assigns the red color to the pixel in position `(2, 3)` in the edited image: 
 
-`editedImage.setPixel(2,3,qRgb(0xff,0x00,0x00));`.
+	`editedImage.setPixel(2,3,qRgb(0xff,0x00,0x00));`.
 
-4) The following instruction assigns a `greenContent` the value of the green value contained in the pixel `(1, 1)` of the `originalImage`:
+4. The following instruction assigns a `greenContent` the value of the green value contained in the pixel `(1, 1)` of the `originalImage`:
 
-`int greenContent = qGreen(originalImage.pixel(1,1));`.
+	`int greenContent = qGreen(originalImage.pixel(1,1));`.
 
-5) The following code assigns to the red component of the pixel `(1, 1)` of `editedImage` the average of the values of the red tone that are in pixel `(1, 1)` of `originalImage1` and `originalImage2` and does the same to the green and blue components.
+5. The following code assigns to the red component of the pixel `(1, 1)` of `editedImage` the average of the values of the red tone that are in pixel `(1, 1)` of `originalImage1` and `originalImage2` and does the same to the green and blue components.
 
 ---
 
@@ -188,7 +190,7 @@ int main() {
 
 The project `PeskyTourist` contains the skeleton for the application to remove the noise from an image. In today’s laboratory experience yu will complete the application to process images using the median filter to remove the noise of an image, in this case a pesky tourist. You will be working in the `Filter.cpp` file.
 
-#### General algorithm to remove the noise from an image
+#### General algorithm to remove  noise from an image
 
 ```
 
@@ -262,7 +264,7 @@ When you complete the function, the `Remove Noise` button will execute your algo
 
 ##Deliverables
 
-Use "Deliverables" in Moodle to upload the `Filter.cpp` file that contains the functions you implemented in this laboratory experience. Remember to use good programming techniques, include the names of the programmers involved, and to document your program.
+Use "Deliverable" in Moodle to upload the `Filter.cpp` file that contains the functions you implemented in this laboratory experience. Remember to use good programming techniques, include the names of the programmers involved, and to document your program.
 
 ---