From 775baf50519d052b94f2d1bd16ae4ab8cdcfe3be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaros=C5=82aw=20Wieczorek?= Date: Sat, 20 Mar 2021 17:53:58 +0100 Subject: [PATCH] Update of directories in 02 and 03. --- .../{ => cpp}/conversion_grayscale.cpp | 3 ++- 02/do_sprawdzenia/{ => cpp}/correction.cpp | 6 ++++-- 02/do_sprawdzenia/{ => cpp}/pic1.png | Bin 02/do_sprawdzenia/{ => cpp}/pic2.png | Bin 02/do_sprawdzenia/{ => cpp}/pic3.png | Bin 02/do_sprawdzenia/{ => cpp}/pic4.png | Bin 03/README.md | 2 +- 03/do_sprawdzenia/{ => cpp}/histogram.cpp | 0 .../{ => cpp}/histogram_equalization.cpp | 0 .../{ => cpp}/histogram_stretching.cpp | 0 10 files changed, 7 insertions(+), 4 deletions(-) rename 02/do_sprawdzenia/{ => cpp}/conversion_grayscale.cpp (97%) rename 02/do_sprawdzenia/{ => cpp}/correction.cpp (93%) rename 02/do_sprawdzenia/{ => cpp}/pic1.png (100%) rename 02/do_sprawdzenia/{ => cpp}/pic2.png (100%) rename 02/do_sprawdzenia/{ => cpp}/pic3.png (100%) rename 02/do_sprawdzenia/{ => cpp}/pic4.png (100%) rename 03/do_sprawdzenia/{ => cpp}/histogram.cpp (100%) rename 03/do_sprawdzenia/{ => cpp}/histogram_equalization.cpp (100%) rename 03/do_sprawdzenia/{ => cpp}/histogram_stretching.cpp (100%) diff --git a/02/do_sprawdzenia/conversion_grayscale.cpp b/02/do_sprawdzenia/cpp/conversion_grayscale.cpp similarity index 97% rename from 02/do_sprawdzenia/conversion_grayscale.cpp rename to 02/do_sprawdzenia/cpp/conversion_grayscale.cpp index f79b784..1661d5f 100644 --- a/02/do_sprawdzenia/conversion_grayscale.cpp +++ b/02/do_sprawdzenia/cpp/conversion_grayscale.cpp @@ -20,7 +20,8 @@ PNM* ConversionGrayscale::transform() if (image->format() == QImage::Format_Mono) { - for (int x=0; xpixel(x,y)); // Getting the pixel(x,y) value diff --git a/02/do_sprawdzenia/correction.cpp b/02/do_sprawdzenia/cpp/correction.cpp similarity index 93% rename from 02/do_sprawdzenia/correction.cpp rename to 02/do_sprawdzenia/cpp/correction.cpp index 4f6415f..6bd805e 100644 --- a/02/do_sprawdzenia/correction.cpp +++ b/02/do_sprawdzenia/cpp/correction.cpp @@ -45,8 +45,10 @@ PNM* Correction::transform() } // Set new pixels - for (int x = 0; x < width; x++) { - for (int y = 0; y < height; y++) { + for (int x = 0; x < width; x++) + { + for (int y = 0; y < height; y++) + { QRgb pixel = image->pixel(x,y); int r = qRed(pixel); int g = qGreen(pixel); diff --git a/02/do_sprawdzenia/pic1.png b/02/do_sprawdzenia/cpp/pic1.png similarity index 100% rename from 02/do_sprawdzenia/pic1.png rename to 02/do_sprawdzenia/cpp/pic1.png diff --git a/02/do_sprawdzenia/pic2.png b/02/do_sprawdzenia/cpp/pic2.png similarity index 100% rename from 02/do_sprawdzenia/pic2.png rename to 02/do_sprawdzenia/cpp/pic2.png diff --git a/02/do_sprawdzenia/pic3.png b/02/do_sprawdzenia/cpp/pic3.png similarity index 100% rename from 02/do_sprawdzenia/pic3.png rename to 02/do_sprawdzenia/cpp/pic3.png diff --git a/02/do_sprawdzenia/pic4.png b/02/do_sprawdzenia/cpp/pic4.png similarity index 100% rename from 02/do_sprawdzenia/pic4.png rename to 02/do_sprawdzenia/cpp/pic4.png diff --git a/03/README.md b/03/README.md index c029ba6..90d1fd5 100644 --- a/03/README.md +++ b/03/README.md @@ -1,5 +1,5 @@ # Rozwiązania laboratoria 03 Cały kod znajduje się w katalogu głównym ,,app/cpp/mysimplegimp'' -Zmienieone pliki projektu dla zadania 3-ego znajdują się w katalogu ,,03/do_sprawdzenia'' +Zmienieone pliki projektu dla zadania 3-ego znajdują się w katalogu ,,03/do_sprawdzenia/cpp'' diff --git a/03/do_sprawdzenia/histogram.cpp b/03/do_sprawdzenia/cpp/histogram.cpp similarity index 100% rename from 03/do_sprawdzenia/histogram.cpp rename to 03/do_sprawdzenia/cpp/histogram.cpp diff --git a/03/do_sprawdzenia/histogram_equalization.cpp b/03/do_sprawdzenia/cpp/histogram_equalization.cpp similarity index 100% rename from 03/do_sprawdzenia/histogram_equalization.cpp rename to 03/do_sprawdzenia/cpp/histogram_equalization.cpp diff --git a/03/do_sprawdzenia/histogram_stretching.cpp b/03/do_sprawdzenia/cpp/histogram_stretching.cpp similarity index 100% rename from 03/do_sprawdzenia/histogram_stretching.cpp rename to 03/do_sprawdzenia/cpp/histogram_stretching.cpp