Trygve/contour-creator
1
0
Fork 0
mirror of https://gitlab.com/Trygve/contour-creator.git synced 2024-11-24 16:10:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Write all contours from vector

Browse Source
This commit is contained in:
Trygve 2024-04-17 11:50:19 +02:00
parent cf72fbfefa
commit 040e011a66
1 changed files with 43 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main.cpp
View File

@ -34,7 +34,7 @@ std::vector<CaseMap> vector_casemap(HeightMap* heightmap, int interval)
{ {
int num_contours = (heightmap->max - heightmap->min)/interval; int num_contours = (heightmap->max - heightmap->min)/interval;
std::vector<CaseMap> vector_contours; std::vector<CaseMap> vector_contours;
omp_set_num_threads(8); omp_set_num_threads(12);
#pragma omp parallel #pragma omp parallel
{ {
@ -43,7 +43,7 @@ omp_set_num_threads(8);
for (int i = 1; i <= num_contours; i++) for (int i = 1; i <= num_contours; i++)
{ {
vec_private.push_back(produce_casemap(heightmap, heightmap->min + interval*i)); vec_private.push_back(produce_casemap(heightmap, heightmap->min + interval*i));
std::cout << "Execute thread " << omp_get_num_threads << " "; std::cout << "Execute thread " << omp_get_num_threads() << " ";
} }
#pragma omp critical #pragma omp critical
vector_contours.insert(vector_contours.end(), vec_private.begin(), vec_private.end()); vector_contours.insert(vector_contours.end(), vec_private.begin(), vec_private.end());
@ -52,7 +52,7 @@ omp_set_num_threads(8);
return vector_contours; return vector_contours;
} }
void write_output_file(CaseMap* casemap, const char *filepath) void write_output_file(std::vector<CaseMap> casemaps, const char *filepath)
{ {
const char *pszDriverName = "ESRI Shapefile"; const char *pszDriverName = "ESRI Shapefile";
@ -78,7 +78,7 @@ void write_output_file(CaseMap* casemap, const char *filepath)
OGRLayer *poLayer; OGRLayer *poLayer;
poLayer = poDS->CreateLayer( "contours", &casemap->reference_system, wkbPoint, NULL ); poLayer = poDS->CreateLayer( "contours", &(casemaps[0]).reference_system, wkbPoint, NULL );
if( poLayer == NULL ) if( poLayer == NULL )
{ {
printf( "Layer creation failed.\n" ); printf( "Layer creation failed.\n" );
@ -94,7 +94,9 @@ void write_output_file(CaseMap* casemap, const char *filepath)
printf( "Creating Name field failed.\n" ); printf( "Creating Name field failed.\n" );
exit( 1 ); exit( 1 );
} }
for (int j = 0; j < casemaps.size(); j++)
{
CaseMap* casemap = &casemaps[j];
for (int i = 0; i<casemap->height*casemap->width; i++) { for (int i = 0; i<casemap->height*casemap->width; i++) {
if (*(casemap->cases + i) != 0 && *(casemap->cases + i) != 15) if (*(casemap->cases + i) != 0 && *(casemap->cases + i) != 15)
{ {
@ -131,6 +133,7 @@ void write_output_file(CaseMap* casemap, const char *filepath)
OGRFeature::DestroyFeature( poFeature ); OGRFeature::DestroyFeature( poFeature );
} }
} }
}
GDALClose( poDS ); GDALClose( poDS );
/* /*
@ -165,6 +168,7 @@ int main(int argc, const char* argv[])
//std::cout << "\n"; //std::cout << "\n";
} }
*/ */
write_output_file(&casemap, "out.shp");
vector_casemap(&map, 1); auto casemaps = vector_casemap(&map, 5);
write_output_file(casemaps, "out.shp");
} }