open byte raster

ARPA-SIMC · Oct 20, 2023 · 87d9750 · 87d9750
1 parent 730f732
commit 87d9750
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 11 deletions.
diff --git a/agrolib/gis/gis.cpp b/agrolib/gis/gis.cpp
@@ -160,6 +160,7 @@ namespace gis
     {
         nrRows = 0;
         nrCols = 0;
+        nrBytes = 4;
         cellSize = NODATA;
         flag = NODATA;
     }
@@ -168,6 +169,7 @@ namespace gis
     {
         nrRows = 0;
         nrCols = 0;
+        nrBytes = 4;
         dx = NODATA;
         dy = NODATA;
         flag = NODATA;
@@ -358,8 +360,10 @@ namespace gis
         mapTime.setNullTime();
         minimum = NODATA;
         maximum = NODATA;
+
         header->nrRows = 0;
         header->nrCols = 0;
+        header->nrBytes = 4;
         header->cellSize = NODATA;
         header->llCorner.initialize();
 

diff --git a/agrolib/gis/gis.h b/agrolib/gis/gis.h
@@ -103,6 +103,7 @@
         public:
             int nrRows;
             int nrCols;
+            int nrBytes;
             double dx, dy;
             float flag;
             Crit3DGeoPoint llCorner;
@@ -116,6 +117,7 @@
         public:
             int nrRows;
             int nrCols;
+            int nrBytes;
             double cellSize;
             float flag;
             Crit3DUtmPoint llCorner;

diff --git a/agrolib/gis/gisIO.cpp b/agrolib/gis/gisIO.cpp
@@ -30,7 +30,6 @@
 #include <math.h>
 #include <algorithm>
 
-#include "commonConstants.h"
 #include "gis.h"
 
 using namespace std;
@@ -113,7 +112,7 @@ namespace gis
      * \param error       string
      * \return true on success, false otherwise
      */
-    bool readEsriGridHeader(string fileName, gis::Crit3DRasterHeader *header, string &error)
+    bool readEsriGridHeader(string fileName, gis::Crit3DRasterHeader *header, string &errorStr)
     {
         string myLine, myKey, upKey, valueStr;
         int nrKeys = 0;
@@ -123,7 +122,7 @@ namespace gis
 
         if (!myFile.is_open())
         {
-            error = "Missing file: " + fileName;
+            errorStr = "Missing file: " + fileName;
             return false;
         }
 
@@ -145,7 +144,18 @@ namespace gis
                 else if (upKey == "NROWS")
                     header->nrRows = stoi(valueStr);
 
-                // LLCORNER is the lower-left corner
+                else if (upKey == "DATATYPE")
+                {
+                    // non standard key - derived from envi
+                    header->nrBytes = stoi(valueStr);
+                    if (header->nrBytes > 4)
+                    {
+                        errorStr = "Wrong data type:" + valueStr + " The maximum allowed is 4 (float).";
+                        return false;
+                    }
+                }
+
+                // LLCORNER = Lower Left corner
                 else if (upKey == "XLLCORNER")
                     header->llCorner.x = stod(valueStr);
 
@@ -163,7 +173,7 @@ namespace gis
 
         if (nrKeys < 6)
         {
-            error = "Missing keys in header file.";
+            errorStr = "Missing keys in header file.";
             return false;
         }
 
@@ -214,10 +224,10 @@ namespace gis
 
                 else if (upKey == "DATATYPE")
                 {
-                    int type = stoi(valueStr);
-                    if (type != 4)
+                    header->nrBytes = stoi(valueStr);
+                    if (header->nrBytes > 4)
                     {
-                        errorStr = "Only data type 4 (float) is allowed.";
+                        errorStr = "Wrong data type:" + valueStr + " The maximum allowed is 4 (float).";
                         return false;
                     }
                 }
@@ -315,9 +325,41 @@ namespace gis
             return false;
         }
 
-        for (int row = 0; row < rasterGrid->header->nrRows; row++)
+        if (rasterGrid->header->nrBytes == 4)
         {
-            fread (rasterGrid->value[row], sizeof(float), unsigned(rasterGrid->header->nrCols), filePointer);
+            // float
+            for (int row = 0; row < rasterGrid->header->nrRows; row++)
+            {
+                fread (rasterGrid->value[row], sizeof(float), unsigned(rasterGrid->header->nrCols), filePointer);
+            }
+        }
+        else if (rasterGrid->header->nrBytes == 1)
+        {
+            // byte
+            byte *rowValues = new byte[unsigned(rasterGrid->header->nrCols)];
+            for (int row = 0; row < rasterGrid->header->nrRows; row++)
+            {
+                fread (rowValues, sizeof(byte), unsigned(rasterGrid->header->nrCols), filePointer);
+                for(int col = 0; col < rasterGrid->header->nrCols; col++)
+                {
+                    rasterGrid->value[row][col] = float(rowValues[col]);
+                }
+            }
+            delete[] rowValues;
+        }
+        else if (rasterGrid->header->nrBytes == 2)
+        {
+            // short
+            short int *rowValues = new short int[unsigned(rasterGrid->header->nrCols)];
+            for (int row = 0; row < rasterGrid->header->nrRows; row++)
+            {
+                fread (rowValues, sizeof(short int), unsigned(rasterGrid->header->nrCols), filePointer);
+                for(int col = 0; col < rasterGrid->header->nrCols; col++)
+                {
+                    rasterGrid->value[row][col] = float(rowValues[col]);
+                }
+            }
+            delete[] rowValues;
         }
 
         fclose (filePointer);

diff --git a/agrolib/project/project.cpp b/agrolib/project/project.cpp
@@ -980,7 +980,7 @@ bool Project::loadDEM(QString myFileName)
     logInfo("Digital Elevation Model = " + myFileName);
 
     // check nodata
-    if (DEM.header->flag != NODATA)
+    if (! isEqual(DEM.header->flag, NODATA))
     {
         QString infoStr = "WARNING: " + QString::number(DEM.header->flag) + " is not a valid NODATA value for DEM!";
         infoStr += " It will be converted in: " + QString::number(NODATA);