Trygve/contour-creator
1
0
Fork 0
mirror of https://gitlab.com/Trygve/contour-creator.git synced 2025-04-11 09:17:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: Trygve:040e011a66ca7d9bb46ab96a1e1a3a554b2654b0
Branches Tags
Trygve:main
Trygve:7-5-2024
Trygve:Statistics
Trygve:drawing-lines
Trygve:cli-arguments
Trygve:restructure
..
compare: Trygve:01ddd4e914fac6f07a719fd403d590dc01e55309
Branches Tags
Trygve:7-5-2024
Trygve:main
Trygve:Statistics
Trygve:drawing-lines
Trygve:cli-arguments
Trygve:restructure

No commits in common. "040e011a66ca7d9bb46ab96a1e1a3a554b2654b0" and "01ddd4e914fac6f07a719fd403d590dc01e55309" have entirely different histories.
040e011a66 ... 01ddd4e914

3 changed files with 150 additions and 180 deletions
Show Stats Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -1,15 +1,13 @@
project( project(
contour-creator contour-creator
LANGUAGES CXX) LANGUAGES CXX)
cmake_minimum_required(VERSION 3.0)
find_package(GDAL CONFIG REQUIRED) find_package(GDAL CONFIG REQUIRED)
add_executable(${PROJECT_NAME} add_executable(${PROJECT_NAME}
src/HeightMap.cpp src/CaseMap.cpp src/main.cpp 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) target_link_libraries(${PROJECT_NAME} GDAL::GDAL)

2
src/HeightMap.cpp
View File

@ -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 // all the pixels are in an array of floats from left to right, top to bottom
int offset = ((this->width * y) + x); int offset = ((this->width * y) + x);
//std::cout << " offset: " << offset << " " << x << ","<< y; std::cout << " " << x << ","<< y;
return *(this->data + offset); return *(this->data + offset);
} }

318
src/main.cpp
View File

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