Trygve
/
contour-creator
mirror of https://gitlab.com/Trygve/contour-creator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'drawing-lines'

This commit is contained in:
Trygve 2024-05-07 10:25:01 +02:00
parent 1ec3e8c778 95649f005b
commit 93fcbc6a39
2 changed files with 93 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/contour_creator.hh
View File

@ -45,6 +45,8 @@ class Point
int mscase; int mscase;
Point * next; Point * next;
Point * previous; Point * previous;
bool endpoint = false;
bool allocated = false;
Point(int x, int y, int mscase){ Point(int x, int y, int mscase){
this -> x = x; this -> x = x;
this -> y = y; this -> y = y;

133
src/main.cpp
View File

@ -7,12 +7,14 @@
#include <iostream> #include <iostream>
#include <iterator> #include <iterator>
#include <ostream> #include <ostream>
#include <string>
#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> #include <omp.h>
#include <fstream>
std::vector<Point> produce_cellmap(HeightMap* heightmap, float z) std::vector<Point> produce_cellmap(HeightMap* heightmap, float z)
{ {
@ -52,30 +54,74 @@ std::vector<std::vector<Point>> vector_cellmap(HeightMap* heightmap, int interva
for (int i = 1; i <= num_contours; i++) for (int i = 1; i <= num_contours; i++)
{ {
auto points = produce_cellmap(heightmap, heightmap->min + interval*i); auto points = produce_cellmap(heightmap, heightmap->min + interval*i);
std::vector<Point> line;
int x;
int y;
int points_allocated = 0;
x = points[0].x;
y = points[0].y;
points[0].allocated = true;
line.push_back(points[0]);
for (int j = 0; j < points.size(); j++){ for (int j = 0; j < points.size(); j++){
Point current = points[j];
//std::cout << points_allocated << " " << points.size() << "\n";
for (int k = 0; k < points.size(); k++){ for (int k = 0; k < points.size(); k++){
Point candidate = points[k]; Point* candidate = &points[k];
if (candidate.next != nullptr) { if (!candidate->allocated) {
if (candidate.x +1 == current.x) { if (candidate->x == x +1 && candidate->y == y) {
current.next = &candidate; candidate->allocated = true;
x = candidate->x;
y = candidate->y;
line.push_back(*candidate);
points_allocated++;
break;
} }
else if (candidate.x -1 == current.x) { else if (candidate->x == x -1 && candidate->y == y) {
current.next = &candidate; x = candidate->x;
y = candidate->y;
candidate->allocated = true;
line.push_back(*candidate);
points_allocated++;
break;
} }
else if (candidate.y +1 == current.x) { else if (candidate->x == x && candidate->y == y + 1) {
current.next = &candidate; x = candidate->x;
y = candidate->y;
candidate->allocated = true;
line.push_back(*candidate);
points_allocated++;
break;
} }
else if (candidate.y -1 == current.x) { else if (candidate->x == x && candidate->y == y - 1) {
current.next = &candidate; x = candidate->x;
y = candidate->y;
candidate->allocated = true;
line.push_back(*candidate);
points_allocated++;
break;
} }
} }
} }
if (j > points_allocated)
{
vec_private.push_back(line);
line.clear();
//std::cout << points.size() << " ";
for (int k = 0; k < points.size(); k++){
Point* candidate = &points[k];
if (!candidate->allocated)
{
line.push_back(*candidate);
x = candidate->x;
y = candidate->y;
points_allocated++;
break;
}
}
}
} }
//vec_private.push_back(points);
//vector_contours.push_back(points);
//std::cout << vector_contours.size();
} }
#pragma omp critical #pragma omp critical
@ -140,7 +186,7 @@ void write_output_file(std::vector<std::vector<Point>> all_points, const char *f
OGRLayer *poLayer; OGRLayer *poLayer;
poLayer = poDS->CreateLayer( "contours", /*&(cellmaps[0]).reference_system*/ NULL, wkbLineString, NULL ); poLayer = poDS->CreateLayer( "contours", &heightmap->reference_system, wkbLineString, NULL );
if( poLayer == NULL ) if( poLayer == NULL )
{ {
printf( "Layer creation failed.\n" ); printf( "Layer creation failed.\n" );
@ -162,47 +208,50 @@ void write_output_file(std::vector<std::vector<Point>> all_points, const char *f
for (int j = 0; j < all_points.size(); j++) for (int j = 0; j < all_points.size(); j++)
{ {
OGRFeature *feature; OGRFeature *feature;
OGRLineString *geometry = new OGRLineString(); OGRLineString *geometry = new OGRLineString();
feature = OGRFeature::CreateFeature( poLayer->GetLayerDefn() ); feature = OGRFeature::CreateFeature( poLayer->GetLayerDefn() );
feature->SetField( "Name", j ); feature->SetField( "Name", j );
std::vector<Point> points = all_points[j]; std::vector<Point> points = all_points[j];
for (int i = 0; i < points.size(); i++) for (int k = 0; k < points.size(); k++)
{ {
//int x_raw = i%width; //int x_raw = i%width;
//int y_raw = i/height; //int y_raw = i/height;
int x_raw = points[i].x; int x_raw = points[k].x;
int y_raw = points[i].y; int y_raw = points[k].y;
/*
if (x_raw > 500 || y_raw > 400)
{
std::cout << "🤯";std::cout.flush();
continue;
}
*/
auto [x, y] = local_to_projected(heightmap->geotransform, x_raw, y_raw); auto [x, y] = local_to_projected(heightmap->geotransform, x_raw, y_raw);
//auto [x_bl, y_bl, x_tr, y_tr] = marching_squares_lookup(*(cellmap->cells + i) ); //auto [x_bl, y_bl, x_tr, y_tr] = marching_squares_lookup(*(cellmap->cells + i) );
//std::cout << x << ", " << y << " "; //std::cout << x_raw << ", " << y_raw << " ";std::cout.flush();
//geometry->setPoint( geometry->getNumPoints(), x+x_tr*0.25, y+y_tr*0.25 ); //geometry->setPoint( geometry->getNumPoints(), x+x_tr*0.25, y+y_tr*0.25 );
//geometry->setPoint( geometry->getNumPoints(), x+x_bl*0.25, y+y_bl*0.25 ); //geometry->setPoint( geometry->getNumPoints(), x+x_bl*0.25, y+y_bl*0.25 );
geometry->setPoint(geometry->getNumPoints(),x ,y ); geometry->setPoint(geometry->getNumPoints(),x ,y );
//current sometimes becomes random pointer?????
} }
if ( feature->SetGeometry(geometry) != OGRERR_NONE) if ( feature->SetGeometry(geometry) != OGRERR_NONE)
{ {
printf( "Failed to set geometry.\n" ); printf( "Failed to set geometry.\n" );
exit( 1 ); exit( 1 );
} }
OGRGeometryFactory::destroyGeometry(geometry); OGRGeometryFactory::destroyGeometry(geometry);
if( poLayer->CreateFeature( feature ) != OGRERR_NONE ) if( poLayer->CreateFeature( feature ) != OGRERR_NONE )
{ {
printf( "Failed to create feature in shapefile.\n" ); printf( "Failed to create feature in shapefile.\n" );
exit( 1 ); exit( 1 );
} }
OGRFeature::DestroyFeature( feature ); OGRFeature::DestroyFeature( feature );
} }
GDALClose( poDS ); GDALClose( poDS );