Add progress bar

Makefile

@@ -17,7 +17,7 @@ pn_imager:
 .PHONY: windows
 windows: pn_imager.exe
 pn_imager.exe:
-	$(MINGW) -o $@ $^ ${INC}
+	$(MINGW) ${CFLAGS} -o $@ $^ ${INC}
 
 # both
 .PHONY: all 

src/main.cpp

@@ -3,12 +3,14 @@
 #include <string>
 #include "ppm.h"
 #include "PerlinNoise.h"
+#include "progressbar.h"
 
 using namespace std;
 
+#define VERSION "v0.15"
+
 int main(int argc, char *argv[])
 {
-	string VERSION = "v0.1";
 	string filename = "perlin_noise";
 
 	// Define the size of the image
@@ -50,47 +52,47 @@ int main(int argc, char *argv[])
 			cout << "perlin noise imager " << VERSION << endl;
 			return 0;
 		}
-		if (input.compare("-o") == 0 || input.compare("--output") == 0)
+		else if (input.compare("-o") == 0 || input.compare("--output") == 0)
 		{
 			filename = argv[count + 1];
 		}
-		if (input.compare("-f") == 0 || input.compare("--factor") == 0)
+		else if (input.compare("-f") == 0 || input.compare("--factor") == 0)
 		{
 			factor = stoi(argv[count + 1]);
 		}
-		if (input.compare("-w") == 0 || input.compare("--width") == 0)
+		else if (input.compare("-w") == 0 || input.compare("--width") == 0)
 		{
 			width = stoi(argv[count + 1]);
 		}
-		if (input.compare("-h") == 0 || input.compare("--height") == 0)
+		else if (input.compare("-h") == 0 || input.compare("--height") == 0)
 		{
 			height = stoi(argv[count + 1]);
 		}
-		if (input.compare("-z") == 0 || input.compare("--zoom") == 0)
+		else if (input.compare("-z") == 0 || input.compare("--zoom") == 0)
 		{
 			zoom = stoi(argv[count + 1]);
 		}
-		if (input.compare("-c") == 0 || input.compare("--contour") == 0)
+		else if (input.compare("-c") == 0 || input.compare("--contour") == 0)
 		{
 			contour_lines = stoi(argv[count + 1]);
 		}
-		if (input.compare("-s") == 0 || input.compare("--seed") == 0)
+		else if (input.compare("-s") == 0 || input.compare("--seed") == 0)
 		{
 			seed = stof(argv[count + 1]);
 		}
-		if (input.compare("-n") == 0 || input.compare("--normalize") == 0)
+		else if (input.compare("-n") == 0 || input.compare("--normalize") == 0)
 		{
 			normalize = !normalize;
 		}
-		if (input.compare("-r") == 0 || input.compare("--red") == 0)
+		else if (input.compare("-r") == 0 || input.compare("--red") == 0)
 		{
 			red = stoi(argv[count + 1]);
 		}
-		if (input.compare("-g") == 0 || input.compare("--green") == 0)
+		else if (input.compare("-g") == 0 || input.compare("--green") == 0)
 		{
 			green = stoi(argv[count + 1]);
 		}
-		if (input.compare("-b") == 0 || input.compare("--blue") == 0)
+		else if (input.compare("-b") == 0 || input.compare("--blue") == 0)
 		{
 			blue = stoi(argv[count + 1]);
 		}
@@ -111,6 +113,7 @@ int main(int argc, char *argv[])
 	PerlinNoise pn;
 
 	unsigned int kk = 0;
+	unsigned long total_pixel_count = width * height;
 	// Visit every pixel of the image and assign a color generated with Perlin noise
 	for (unsigned int i = 0; i < height; ++i)
 	{ // y
@@ -135,12 +138,15 @@ int main(int argc, char *argv[])
 			image.b[kk] = floor(blue * n);	// 50
 			kk++;
 		}
+
+		if (kk % 100000 == 0)
+			printProgress(0.5 * (double)kk / (double)total_pixel_count);
 	}
 
 	// Save the image in a binary PPM file
 	image.write(filename + ".ppm");
 
-	cout << "Crated perlin noise image with:\n"
+	cout << "\nCrated perlin noise image with:\n"
 		 << endl
 		 << "Image size in pixel: \t" << width << " x " << height << endl
 		 << "Color weighting: \tred[" << red << "/255]\tgreen[" << green << "/255]\tblue[" << blue << "/255]" << endl

src/ppm.cpp

@@ -4,6 +4,7 @@
 #include <exception>
 
 #include "ppm.h"
+#include "progressbar.h"
 
 // init with default values
 
@@ -139,7 +140,11 @@ void ppm::write(const std::string &fname)
             inp.write(&aux, 1);
             aux = (char)b[i];
             inp.write(&aux, 1);
+
+            if (i % 1000000 == 0)
+                printProgress(0.5 + 0.5 * (double)i / (double)size);
         }
+        printProgress(1);
     }
     else
     {

src/progressbar.cpp

@@ -0,0 +1,15 @@
+#include <stdio.h>
+
+#define PBSTR "||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||"
+#define PBWIDTH 60
+#define GRN "\x1B[32m"
+#define RESET "\x1B[0m"
+
+void printProgress(double percentage)
+{
+    int val = (int)(percentage * 100);
+    int lpad = (int)(percentage * PBWIDTH);
+    int rpad = PBWIDTH - lpad;
+    printf("\r%3d%% [" GRN "%.*s%*s" RESET "]", val, lpad, PBSTR, rpad, "");
+    fflush(stdout);
+}

src/progressbar.h

@@ -0,0 +1,6 @@
+#ifndef PROGRESSBAR_H
+#define PROGRESSBAR_H
+
+void printProgress(double percentage);
+
+#endif