Write all contours from vector

CMakeLists.txt

@@ -1,13 +1,15 @@
 project(
   contour-creator
-  LANGUAGES CXX)
-cmake_minimum_required(VERSION 3.0)
-
+  LANGUAGES CXX)    
+  
 find_package(GDAL CONFIG REQUIRED)
 
 add_executable(${PROJECT_NAME}
 	src/HeightMap.cpp src/CaseMap.cpp src/main.cpp
 )
-
+find_package(OpenMP)
+if(OpenMP_CXX_FOUND)
+    target_link_libraries(${PROJECT_NAME} PUBLIC OpenMP::OpenMP_CXX)
+endif()
 
 target_link_libraries(${PROJECT_NAME} GDAL::GDAL)

src/HeightMap.cpp

@@ -40,6 +40,6 @@ float HeightMap::get_pixel(int x, int y)
 {
     // all the pixels are in an array of floats from left to right, top to bottom
     int offset = ((this->width * y) + x);
-    std::cout << " " << x << ","<< y;
+    //std::cout << "  offset: " << offset << " " << x << ","<< y;
     return *(this->data + offset);
 } 

src/main.cpp

@@ -1,146 +1,174 @@
-#include "HeightMap.hh"
-#include "CaseMap.hh"
-#include <gdal/ogr_api.h>
-#include "ogrsf_frmts.h"
-#include <iostream>
-#include <ostream>
-#include <vector>
-#include <cstdint>
-#include <gdal/gdal.h>
-#include "gdal/gdal_priv.h"
-#include <gdal/gdal_frmts.h>
-
-CaseMap produce_casemap(HeightMap* heightmap, float z)
-{
-    int length = (heightmap->width-1)*(heightmap->height-1);
-    uint8_t *cases = (uint8_t *) CPLMalloc(sizeof(uint8_t)*length);
-    for (int i = 0; i<length; i++) {
-        int y = i/(heightmap->width-1);
-        int x = i%(heightmap->width-1);
-        uint8_t result = (heightmap->get_pixel(x,y)>z) + 
-        (heightmap->get_pixel(x+1,y)>z)*2 +
-        (heightmap->get_pixel(x+1,y+1)>z)*4 +
-        (heightmap->get_pixel(x,y+1)>z)*8;
-        *(cases + i) = result;
-    }
-    
-    return CaseMap(heightmap->width-1, heightmap->height-1, cases, heightmap->reference_system);
-
-
-}
-
-void write_output_file(CaseMap* casemap, const char *filepath)
-{
-
-    const char *pszDriverName = "ESRI Shapefile";
-    GDALDriver *poDriver;
-
-    GDALAllRegister();
-
-    poDriver = GetGDALDriverManager()->GetDriverByName(pszDriverName );
-    if( poDriver == NULL )
-    {
-        printf( "%s driver not available.\n", pszDriverName );
-        exit( 1 );
-    }
-
-    GDALDataset *poDS;
-
-    poDS = poDriver->Create( filepath, 0, 0, 0, GDT_Unknown, NULL );
-    if( poDS == NULL )
-    {
-        printf( "Creation of output file failed.\n" );
-        exit( 1 );
-    }
-
-    OGRLayer *poLayer;
-
-    poLayer = poDS->CreateLayer( "contours", &casemap->reference_system, wkbPoint, NULL );
-    if( poLayer == NULL )
-    {
-        printf( "Layer creation failed.\n" );
-        exit( 1 );
-    }
-
-    OGRFieldDefn oField( "Name", OFTString );
-
-    oField.SetWidth(32);
-
-    if( poLayer->CreateField( &oField ) != OGRERR_NONE )
-    {
-        printf( "Creating Name field failed.\n" );
-        exit( 1 );
-    }
-
-    for (int i = 0; i<casemap->height*casemap->width; i++) {
-        if (*(casemap->cases + i) != 0 && *(casemap->cases + i) != 15)
-        {
-            int x_int = i%casemap->width;
-            int y_int = casemap->height*casemap->width - i/casemap->width;
-            double x = double(x_int);
-            double y = double(y_int);
-
-            OGRFeature *poFeature;
-
-            poFeature = OGRFeature::CreateFeature( poLayer->GetLayerDefn() );
-            poFeature->SetField( "Name", *(casemap->cases + i) );
-
-            //OGRSpatialReference local;
-
-            //auto poCT = OGRCreateCoordinateTransformation( &local, &casemap->reference_system );
-            
-            /*
-            if( poCT == NULL || !poCT->Transform( 1, &x, &y ) )
-                printf( "Transformation failed.\n" );
-            */
-            OGRPoint pt;
-            pt.setX( x );
-            pt.setY( y );
-
-            poFeature->SetGeometry( &pt );
-
-            if( poLayer->CreateFeature( poFeature ) != OGRERR_NONE )
-            {
-                printf( "Failed to create feature in shapefile.\n" );
-                exit( 1 );
-            }
-
-            OGRFeature::DestroyFeature( poFeature );
-        }
-    }
-
-    GDALClose( poDS );
-    /*
-    OGRDataSourceH datasource = OGR_Dr_CreateDataSource(OGRGetDriverByName("GeoJSON"), "contour.geojson", new char*);
-    OGRSpatialReference reference_system = casemap->reference_system;
-    OGRLayerH layer = OGR_DS_CreateLayer(datasource, "contour", &reference_system, wkbLineString25D, new char*);
-    
-    auto feature = OGR_F_Create(OGR_L_GetLayerDefn(static_cast<OGRLayerH>(layer)));
-
-    OGRGeometryH geometry = OGR_G_CreateGeometry(wkbLineString25D);
-    */
-}
-
-int main(int argc, const char* argv[])
-{
-    const char* filepath = argv[1];
-    HeightMap map(filepath); 
-    
-    std::cout << "x: " << map.width << "    y: " << map.height << "\n";
-    std::cout << "max: " << map.max << "    min: " << map.min << "\n";
-    
-    auto casemap = produce_casemap(&map, 40);
-    /*
-    for (int y = 0; y < casemap.height; y++)
-    {
-        for (int x = 0; x < casemap.width; x++)
-        {
-            if (casemap.get_case(x, y) && casemap.get_case(x, y)!=15) {
-                std::cout << x << ","<< y << "=" << casemap.get_case(x, y) << " ";
-            }
-        }
-       //std::cout << "\n";
-    }
-    */
-    write_output_file(&casemap, "out.shp");
+#include "HeightMap.hh"
+#include "CaseMap.hh"
+#include <gdal/ogr_api.h>
+#include "ogrsf_frmts.h"
+#include <iostream>
+#include <ostream>
+#include <vector>
+#include <cstdint>
+#include <gdal/gdal.h>
+#include "gdal/gdal_priv.h"
+#include <gdal/gdal_frmts.h>
+#include <omp.h>
+
+CaseMap produce_casemap(HeightMap* heightmap, float z)
+{
+    int length = (heightmap->width-1)*(heightmap->height-1);
+    uint8_t *cases = (uint8_t *) CPLMalloc(sizeof(uint8_t)*length);
+    for (int i = 0; i<length; i++) {
+        int y = i/(heightmap->width-1);
+        int x = i%(heightmap->width-1);
+        uint8_t result = (heightmap->get_pixel(x,y)>z) + 
+        (heightmap->get_pixel(x+1,y)>z)*2 +
+        (heightmap->get_pixel(x+1,y+1)>z)*4 +
+        (heightmap->get_pixel(x,y+1)>z)*8;
+        *(cases + i) = result;
+    }
+    
+    return CaseMap(heightmap->width-1, heightmap->height-1, cases, heightmap->reference_system);
+
+
+}
+
+std::vector<CaseMap> vector_casemap(HeightMap* heightmap, int interval)
+{
+    int num_contours = (heightmap->max - heightmap->min)/interval;
+    std::vector<CaseMap> vector_contours;
+omp_set_num_threads(12);
+
+#pragma omp parallel
+{
+    std::vector<CaseMap> vec_private;
+    #pragma omp for
+    for (int i = 1; i <= num_contours; i++) 
+    {
+        vec_private.push_back(produce_casemap(heightmap, heightmap->min + interval*i));
+        std::cout << "Execute thread " << omp_get_num_threads() << " ";
+    }
+    #pragma omp critical
+    vector_contours.insert(vector_contours.end(), vec_private.begin(), vec_private.end());
+
+}
+    return vector_contours;
+}
+
+void write_output_file(std::vector<CaseMap> casemaps, const char *filepath)
+{
+
+    const char *pszDriverName = "ESRI Shapefile";
+    GDALDriver *poDriver;
+
+    GDALAllRegister();
+
+    poDriver = GetGDALDriverManager()->GetDriverByName(pszDriverName );
+    if( poDriver == NULL )
+    {
+        printf( "%s driver not available.\n", pszDriverName );
+        exit( 1 );
+    }
+
+    GDALDataset *poDS;
+
+    poDS = poDriver->Create( filepath, 0, 0, 0, GDT_Unknown, NULL );
+    if( poDS == NULL )
+    {
+        printf( "Creation of output file failed.\n" );
+        exit( 1 );
+    }
+
+    OGRLayer *poLayer;
+
+    poLayer = poDS->CreateLayer( "contours", &(casemaps[0]).reference_system, wkbPoint, NULL );
+    if( poLayer == NULL )
+    {
+        printf( "Layer creation failed.\n" );
+        exit( 1 );
+    }
+
+    OGRFieldDefn oField( "Name", OFTString );
+
+    oField.SetWidth(32);
+
+    if( poLayer->CreateField( &oField ) != OGRERR_NONE )
+    {
+        printf( "Creating Name field failed.\n" );
+        exit( 1 );
+    }
+    for (int j = 0; j < casemaps.size(); j++)
+    {
+        CaseMap* casemap = &casemaps[j];
+        for (int i = 0; i<casemap->height*casemap->width; i++) {
+            if (*(casemap->cases + i) != 0 && *(casemap->cases + i) != 15)
+            {
+                int x_int = i%casemap->width;
+                int y_int = casemap->height*casemap->width - i/casemap->width;
+                double x = double(x_int);
+                double y = double(y_int);
+
+                OGRFeature *poFeature;
+
+                poFeature = OGRFeature::CreateFeature( poLayer->GetLayerDefn() );
+                poFeature->SetField( "Name", *(casemap->cases + i) );
+
+                //OGRSpatialReference local;
+
+                //auto poCT = OGRCreateCoordinateTransformation( &local, &casemap->reference_system );
+                
+                /*
+                if( poCT == NULL || !poCT->Transform( 1, &x, &y ) )
+                    printf( "Transformation failed.\n" );
+                */
+                OGRPoint pt;
+                pt.setX( x );
+                pt.setY( y );
+
+                poFeature->SetGeometry( &pt );
+
+                if( poLayer->CreateFeature( poFeature ) != OGRERR_NONE )
+                {
+                    printf( "Failed to create feature in shapefile.\n" );
+                    exit( 1 );
+                }
+
+                OGRFeature::DestroyFeature( poFeature );
+            }
+        }
+    }
+
+    GDALClose( poDS );
+    /*
+    OGRDataSourceH datasource = OGR_Dr_CreateDataSource(OGRGetDriverByName("GeoJSON"), "contour.geojson", new char*);
+    OGRSpatialReference reference_system = casemap->reference_system;
+    OGRLayerH layer = OGR_DS_CreateLayer(datasource, "contour", &reference_system, wkbLineString25D, new char*);
+    
+    auto feature = OGR_F_Create(OGR_L_GetLayerDefn(static_cast<OGRLayerH>(layer)));
+
+    OGRGeometryH geometry = OGR_G_CreateGeometry(wkbLineString25D);
+    */
+}
+
+int main(int argc, const char* argv[])
+{
+    const char* filepath = argv[1];
+    HeightMap map(filepath); 
+    
+    std::cout << "x: " << map.width << "    y: " << map.height << "\n";
+    std::cout << "max: " << map.max << "    min: " << map.min << "\n";
+    
+    auto casemap = produce_casemap(&map, 40);
+    /*
+    for (int y = 0; y < casemap.height; y++)
+    {
+        for (int x = 0; x < casemap.width; x++)
+        {
+            if (casemap.get_case(x, y) && casemap.get_case(x, y)!=15) {
+                std::cout << x << ","<< y << "=" << casemap.get_case(x, y) << " ";
+            }
+        }
+       //std::cout << "\n";
+    }
+    */
+    
+    auto casemaps = vector_casemap(&map, 5);
+    write_output_file(casemaps, "out.shp");
 }