Add Reading .dat

Add Error handler
Fixed bugs

ImageView/Parser.hpp

@@ -28,7 +28,7 @@ std::map<int, std::wstring> type_size = {
     { 1, L"KUSLAU"}
 };
 
-static int CurrentTypeExtFile = static_cast<int>(TypeExtFile::NONE);
+static int CurrentTypeExtFile = static_cast<int>(TypeExtFile::TXT);
 static int CurrentTypeMatrixSize = static_cast<int>(MatrixSize::IG);
 static int CurrentTypeImage = static_cast<int>(TypeImage::BMP);
 static std::string expansion;
@@ -109,68 +109,132 @@ class Parser
     plugin_string Creat_Parser(PathFiles _path);
 };
 
-plugin_string Parser::Creat_Parser(PathFiles _path) {
+plugin_string Parser::Creat_Parser(PathFiles _path) {    
     std::ifstream fin;
+    FILE* f;
+    std::ofstream out("D:\\hello.txt");
     if (_path.SizeMatrix == 0) {
         switch (CurrentTypeMatrixSize)
         {
         case 0:
-            fin.open(_path.fig);
-            if (!fin.is_open()) return MErrorFileIG;
-            size_t temp;
-            while (fin >> temp)
-                ig.push_back(temp);
-            fin.close();
-            _size = ig.size() - 1;
+            if (expansion == ".dat") {
+                f = fopen(_path.fig.string().c_str(), "rb");
+                if (!f) return MErrorFileIG;
+                int temp;
+                fread(&temp, sizeof(int), 1, f);
+                do {
+                    ig.push_back(temp);
+                    fread(&temp, sizeof(int), 1, f);
+                } while (!feof(f));
+                fclose(f);
+                _size = ig.size() - 1;
+            }
+            else {
+                fin.open(_path.fig);
+                if (!fin.is_open()) return MErrorFileIG;
+                size_t temp;
+                while (fin >> temp)
+                    ig.push_back(temp);
+                if (ig.empty()) return MErrorIncorrectIG;
+                fin.close();
+                _size = ig.size() - 1;
+            }
             break;
         case 1:
-            fin.open(_path.fkuslau);
-            if (!fin.is_open()) return MErrorFileKUSLAU;
-            fin >> _size;
-            fin.close();
+            if (expansion == ".dat") {
+                f = fopen(_path.fkuslau.string().c_str(), "rb");
+                if (!f) return MErrorFileKUSLAU;
+                fread(&_size, sizeof(int), 1, f);
+                fclose(f);
+
+                ig.resize(_size + 1);
+                f = fopen(_path.fig.string().c_str(), "rb");
+                if (!f) return MErrorFileIG;
+                for (int i = 0; i < _size + 1; i++) {
+                    fread(&ig[i], sizeof(int), 1, f);
+                }
+                fclose(f);
+            }
+            else {
+                fin.open(_path.fkuslau);
+                if (!fin.is_open()) return MErrorFileKUSLAU;
+                fin >> _size;
+                fin.close();
+
+                ig.resize(_size + 1);
+                fin.open(_path.fig);
+                if (!fin.is_open()) return MErrorFileIG;
+                for (size_t i = 0; i < _size + 1; i++)
+                    fin >> ig[i];
+                fin.close();
+            }
 
-            ig.resize(_size + 1);
-            fin.open(_path.fig);
-            if (!fin.is_open()) return MErrorFileIG;
-            for (size_t i = 0; i < _size + 1; i++)
-                fin >> ig[i];
-            fin.close();
             break;
         }
     }
     else {
         _size = _path.SizeMatrix;
         ig.resize(_size + 1);
-        fin.open(_path.fig);
-        if (!fin.is_open()) return MErrorFileIG;
-        for (size_t i = 0; i < _size + 1; i++)
-            fin >> ig[i];
-        fin.close();
+        if (expansion == ".dat") {
+            f = fopen(_path.fig.string().c_str(), "rb");
+            if (!f) return MErrorFileIG;
+            for (size_t i = 0; i < _size + 1; i++)
+                fread(&ig[i], sizeof(int), 1, f);
+            fclose(f);
+        }
+        else {
+            fin.open(_path.fig);
+            if (!fin.is_open()) return MErrorFileIG;
+            for (size_t i = 0; i < _size + 1; i++)
+                fin >> ig[i];
+            fin.close();
+        }
+
     }
 
     di.resize(_size);
     jg.resize(ig[_size]);
     gg.resize(ig[_size]);
 
-    fin.open(_path.fdi);
-    if (!fin.is_open()) return MErrorFileDI;
-    for (size_t i = 0; i < _size; i++)
-        fin >> di[i];
-    fin.close();
-
-    fin.open(_path.fjg);
-    if (!fin.is_open()) return MErrorFileJG;
-    for (size_t i = 0; i < ig[_size]; i++)
-        fin >> jg[i];
-    fin.close();
-
-    fin.open(_path.fgg);
-    if (!fin.is_open()) return MErrorFileGG;
-    for (size_t i = 0; i < ig[_size]; i++)
-        fin >> gg[i];
-    fin.close();
+    if (expansion == ".dat") {
+        f = fopen(_path.fdi.string().c_str(), "rb");
+        if (!f) return MErrorFileDI;
+        for (size_t i = 0; i < _size; i++)
+            fread(&di[i], sizeof(double), 1, f);
+        fclose(f);
+
+        f = fopen(_path.fjg.string().c_str(), "rb");
+        if (!f) return MErrorFileJG;
+        for (size_t i = 0; i < ig[_size]; i++)
+            fread(&jg[i], sizeof(int), 1, f);
+        fclose(f);
+
+        f = fopen(_path.fgg.string().c_str(), "rb");
+        if (!f) return MErrorFileGG;
+        for (size_t i = 0; i < ig[_size]; i++)
+            fread(&gg[i], sizeof(double), 1, f);
+        fclose(f);
+    }
+    else {
+        fin.open(_path.fdi);
+        if (!fin.is_open()) return MErrorFileDI;
+        for (size_t i = 0; i < _size; i++)
+            fin >> di[i];
+        fin.close();
 
+        fin.open(_path.fjg);
+        if (!fin.is_open()) return MErrorFileJG;
+        for (size_t i = 0; i < ig[_size]; i++)
+            fin >> jg[i];
+        fin.close();
 
+        fin.open(_path.fgg);
+        if (!fin.is_open()) return MErrorFileGG;
+        for (size_t i = 0; i < ig[_size]; i++)
+            fin >> gg[i];
+        fin.close();
+    }
+    out.close();
     return ps_title; // ps_title = 0;
 }
 

ImageView/PortraitUI.hpp

@@ -104,6 +104,7 @@ bool ShowDialog(path path, bool isDir) {
 		switch (CurrentTypeExtFile)
 		{
 		case 0:
+			expansion = ".txt";
 			pathfiles.fdi = path / "di.txt";
 			pathfiles.fgg = path / "gg.txt";
 			pathfiles.fig = path / "ig.txt";
@@ -112,6 +113,7 @@ bool ShowDialog(path path, bool isDir) {
 				pathfiles.fkuslau = path / "kuslau.txt";
 			break;
 		case 1:
+			expansion = ".dat";
 			pathfiles.fdi = path / "di.dat";
 			pathfiles.fgg = path / "gg.dat";
 			pathfiles.fig = path / "ig.dat";
@@ -166,17 +168,36 @@ bool ShowDialog(path path, bool isDir) {
 		filesystem::create_directory(path.string() + "/output");
 
 		// Ñîõðàíÿåì êàðòèíêó â ôàéë
-		Image.save_image(path.string() + "/output/portrait.bmp");
-
-		// Ïîêàçàòü ñðàçó êàðòèíêó
-		if (isShowImage) {
-			image* img = open_image((path.wstring() + L"/output/portrait.bmp").c_str(), false);
-			if (img) {
-				viewer v(img);
-				v.show();
+		switch (CurrentTypeImage)
+		{
+		case 0: 
+			Image.save_image(path.string() + "/output/portrait.bmp");
+
+			// Ïîêàçàòü ñðàçó êàðòèíêó
+			if (isShowImage) {
+				image* img = open_image((path.wstring() + L"/output/portrait.bmp").c_str(), false);
+				if (img) {
+					viewer v(img);
+					v.show();
+				}
 			}
+			break;
+		case 1:
+			Image.save_image(path.string() + "/output/portrait.png");
+
+			// Ïîêàçàòü ñðàçó êàðòèíêó
+			//if (isShowImage) {
+			//	image* img = open_image((path.wstring() + L"/output/portrait.png").c_str(), false);
+			//	if (img) {
+			//		viewer v(img);
+			//		v.show();
+			//	}
+			//}
+			//break;
 		}
 
+
+
 		// Çàïèñü èíôîðìàöèè î ìàòðèöå
 		InfoSparse MatInfo = parser.GetInfo();
 		std::ofstream fout(path.string() + "/output/info.txt");

ImageView/dist/PortraitMatrixEng.lng

@@ -117,9 +117,11 @@
 "Ok"
 
 "File di not found!"
-"File gg not found"
-"File ig not found"
-"File jg not found"
+"File gg not found!"
+"File ig not found!"
+"File jg not found!"
 "File kuslau not found"
 
-"Select an "ig" file or folder!"
+"Select an "ig" file or folder!"
+
+"File ig incorrect!"

ImageView/dist/PortraitMatrixRus.lng

@@ -122,4 +122,6 @@
 "Файл jg не найден!"
 "Файл kuslau не найден!"
 
-"Выберите файл "ig" или папку!"
+"Выберите файл "ig" или папку!"
+
+"Неккоректные данные (ig)"

ImageView/libfreeimage/Win32_Debug_v16.0/FreeImageLib/FreeImageLib.Build.CppClean.log

@@ -1,60 +1,60 @@
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib.pdb
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\conversionfloat.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\conversion8.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\conversion4.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\conversion32.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\conversion24.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\conversion16_565.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\conversion16_555.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\conversion.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\wuquantizer.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\nnquantizer.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\pixelaccess.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\memoryio.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\lfpquantizer.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\gettype.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\freeimageio.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\freeimage.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\conversionrgbaf.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\conversionrgba16.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\colorlookup.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\bitmapaccess.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\tagconversion.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\iptc.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\freeimagetag.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\firational.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\exif.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\multipage.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\cachefile.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\pluginbmp.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\plugin.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\mnghelper.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\tonemapping.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\tmoreinhard05.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\tmofattal02.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\tmodrago03.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\tmocolorconvert.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\halftoning.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\conversionuint16.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\conversiontype.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\conversionrgbf.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\conversionrgb16.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\resize.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\rescale.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\multigridpoissonsolver.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\flip.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\display.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\copypaste.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\colors.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\classicrotate.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\channels.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\bsplinerotate.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\background.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\taglib.obj
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib.lib
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\freeimagelib.tlog\cl.command.1.tlog
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\freeimagelib.tlog\cl.read.1.tlog
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\freeimagelib.tlog\cl.write.1.tlog
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\freeimagelib.tlog\lib-link.read.1.tlog
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\freeimagelib.tlog\lib-link.write.1.tlog
-d:\portrait\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\freeimagelib.tlog\lib.command.1.tlog
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib.pdb
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\conversionfloat.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\conversion8.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\conversion4.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\conversion32.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\conversion24.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\conversion16_565.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\conversion16_555.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\conversion.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\wuquantizer.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\nnquantizer.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\pixelaccess.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\memoryio.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\lfpquantizer.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\gettype.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\freeimageio.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\freeimage.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\conversionrgbaf.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\conversionrgba16.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\colorlookup.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\bitmapaccess.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\tagconversion.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\iptc.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\freeimagetag.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\firational.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\exif.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\multipage.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\cachefile.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\pluginbmp.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\plugin.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\mnghelper.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\tonemapping.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\tmoreinhard05.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\tmofattal02.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\tmodrago03.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\tmocolorconvert.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\halftoning.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\conversionuint16.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\conversiontype.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\conversionrgbf.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\conversionrgb16.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\resize.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\rescale.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\multigridpoissonsolver.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\flip.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\display.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\copypaste.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\colors.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\classicrotate.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\channels.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\bsplinerotate.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\background.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\taglib.obj
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib.lib
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\freeimagelib.tlog\cl.command.1.tlog
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\freeimagelib.tlog\cl.read.1.tlog
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\freeimagelib.tlog\cl.write.1.tlog
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\freeimagelib.tlog\lib-link.read.1.tlog
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\freeimagelib.tlog\lib-link.write.1.tlog
+d:\portraitmatrix\imageview\libfreeimage\win32_debug_v16.0\freeimagelib\freeimagelib.tlog\lib.command.1.tlog