Commit 24678321 authored by kraus's avatar kraus
Browse files

The user can now specify a width and height of the mask in meters

parent 1c812354
...@@ -599,7 +599,7 @@ namespace mslang { ...@@ -599,7 +599,7 @@ namespace mslang {
Mask *pixmap = static_cast<Mask*>(fun); Mask *pixmap = static_cast<Mask*>(fun);
std::string str(it, end); std::string str(it, end);
boost::regex argument("'([^\\0]+)'(\\).*)"); boost::regex argument("'([^,]+)'," + UDouble + "," + UDouble + "(\\).*)");
boost::smatch what; boost::smatch what;
if (!boost::regex_match(str, what, argument)) return false; if (!boost::regex_match(str, what, argument)) return false;
...@@ -612,8 +612,8 @@ namespace mslang { ...@@ -612,8 +612,8 @@ namespace mslang {
PortableBitmapReader reader(filename); PortableBitmapReader reader(filename);
unsigned int width = reader.getWidth(); unsigned int width = reader.getWidth();
unsigned int height = reader.getHeight(); unsigned int height = reader.getHeight();
double pixel_width = 0.001; double pixel_width = atof(std::string(what[2]).c_str()) / width;
double pixel_height = 0.001; double pixel_height = atof(std::string(what[4]).c_str()) / height;
for (unsigned int i = 0; i < height; ++ i) { for (unsigned int i = 0; i < height; ++ i) {
for (unsigned int j = 0; j < width; ++ j) { for (unsigned int j = 0; j < width; ++ j) {
...@@ -631,7 +631,7 @@ namespace mslang { ...@@ -631,7 +631,7 @@ namespace mslang {
} }
std::string fullMatch = what[0]; std::string fullMatch = what[0];
std::string rest = what[2]; std::string rest = what[6];
it += (fullMatch.size() - rest.size() + 1); it += (fullMatch.size() - rest.size() + 1);
return true; return true;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment