fly/terragear
1
0
Fork 0
Code Activity

Make min/max area work more reliably.

Browse source
This commit is contained in:
david 2002-08-03 14:10:35 +00:00
parent 8ab0a45ad7
commit 232d51333c
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/Prep/TGVPF/tgvpf.cxx
View file

@ -324,8 +324,6 @@ main (int argc, const char **argv)
else if (arg.find("--min-area=") == 0) {
min_area = strtod(arg.substr(11).c_str(), 0);
if (max_area < min_area)
max_area = 999999999999.0;
argPos++;
}
@ -414,12 +412,13 @@ main (int argc, const char **argv)
cout << "Coverage name: " << coverage_name << endl;
cout << "Feature name: " << feature_name << endl;
cout << "Working directory: " << work_dir << endl;
if (max_area > 0) {
if (min_area > -1)
cout << "Minimum area: " << min_area << endl;
if (max_area > -1)
cout << "Maximum area: " << max_area << endl;
}
cout << "Material type: " << get_area_name(material_type) << endl;
cout << "Point and line width (-1 for default): " << width << endl;
if (width > -1)
cout << "Point and line width: " << width << endl;
for (int x = 0; x < attributes.size(); x++) {
cout << "Attribute " << attributes[x].name
<< (attributes[x].state ? " = " : " != ")
@ -495,9 +494,11 @@ main (int argc, const char **argv)
continue;
shape = vpf2tg(polygon);
// Filter by area if requested
if (max_area > 0) {
if (max_area > -1 || min_area > -1) {
double area = getArea(shape);
if (area < min_area || area > max_area)
if (max_area > -1 && area > max_area)
continue;
if (min_area > -1 && area < min_area)
continue;
}
break;