Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correct rounding error in number of pixel computation and grid drawing #259

Merged
merged 2 commits into from
Oct 14, 2024
Merged

Correct rounding error in number of pixel computation and grid drawing #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdd1084
correct rounding error in number of pixel computation and grid drawing
fabien-colonnier Oct 11, 2024
c39686e
add more space between graph to have the title visible
fabien-colonnier Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 17 additions & 16 deletions examples/grid_border.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,15 @@ int main()
#endif

// Create a grid to show in the scene
constexpr unsigned int Nside = 10;
constexpr unsigned int N_pix_w = 25;
constexpr unsigned int N_pix_h = 8;
constexpr morph::vec<float, 2> grid_spacing = {0.2f, 0.2f};

// The simplest declaration of Grid is:
// morph::Grid g(size_t n_x, size_t n_y);
// grid_spacing, grid_zero, use of memory, wrapping and ordering are all possible arguments to
// the constructor.
morph::Grid grid(Nside, Nside, grid_spacing);
morph::Grid<unsigned int, float> grid(N_pix_w, N_pix_h, grid_spacing);

std::cout << "Number of pixels in grid:" << grid.n << std::endl;

Expand All @@ -41,9 +42,9 @@ int main()
data[ri][0] = static_cast<double>(std::rand()) / RAND_MAX ; // Range 0->1
}

float step = 0.6f;
float step = 0.64f;
// Add a GridVisual to display the Grid within the morph::Visual scene
morph::vec<float, 3> offset = { -step * grid.width(), step * grid.width(), 0.0f };
morph::vec<float, 3> offset = { -step * grid.width(), step * grid.height(), 0.0f };

// 1) visualizing vector with GridVisMode = RectInterp
auto gv = std::make_unique<morph::GridVisual<float>>(&grid, offset);
Expand All @@ -56,7 +57,7 @@ int main()
v.addVisualModel (gv);

// 2) same as 1 with zScale set to 0
offset = { step * grid.width(), step * grid.width(), 0.0f };
offset = { step * grid.width(), step * grid.height(), 0.0f };
gv = std::make_unique<morph::GridVisual<float>>(&grid, offset);
v.bindmodel (gv);
gv->gridVisMode = morph::GridVisMode::RectInterp;
Expand All @@ -68,7 +69,7 @@ int main()
v.addVisualModel (gv);

// 3) same as 2 with border ON and border colour set to cyan
offset = { 3 * step * grid.width(), step * grid.width(), 0.0f };
offset = { 3 * step * grid.width(), step * grid.height(), 0.0f };
gv = std::make_unique<morph::GridVisual<float>>(&grid, offset);
v.bindmodel (gv);
gv->gridVisMode = morph::GridVisMode::RectInterp;
Expand All @@ -83,7 +84,7 @@ int main()
v.addVisualModel (gv);

// 4) same as 2 with border ON and border colour set to cyan
offset = { 5 * step * grid.width(), step * grid.width(), 0.0f };
offset = { 5 * step * grid.width(), step * grid.height(), 0.0f };
gv = std::make_unique<morph::GridVisual<float>>(&grid, offset);
v.bindmodel (gv);
gv->gridVisMode = morph::GridVisMode::RectInterp;
Expand All @@ -97,7 +98,7 @@ int main()
v.addVisualModel (gv);

// 5) same as 2 + grid
offset = { step * grid.width(), -step * grid.width(), 0.0f };
offset = { step * grid.width(), -step * grid.height(), 0.0f };
gv = std::make_unique<morph::GridVisual<float>>(&grid, offset);
v.bindmodel (gv);
gv->gridVisMode = morph::GridVisMode::RectInterp;
Expand All @@ -112,7 +113,7 @@ int main()
v.addVisualModel (gv);

// 6) show both border and grid
offset = { 3 * step * grid.width(), -step * grid.width(), 0.0f };
offset = { 3 * step * grid.width(), -step * grid.height(), 0.0f };
gv = std::make_unique<morph::GridVisual<float>>(&grid, offset);
v.bindmodel (gv);
gv->gridVisMode = morph::GridVisMode::RectInterp;
Expand All @@ -130,7 +131,7 @@ int main()
v.addVisualModel (gv);

// 7) show how to use the selected pixel option
offset = { step * grid.width(), -3 * step * grid.width(), 0.0f };
offset = { step * grid.width(), -3 * step * grid.height(), 0.0f };
gv = std::make_unique<morph::GridVisual<float>>(&grid, offset);
v.bindmodel (gv);
gv->gridVisMode = morph::GridVisMode::RectInterp;
Expand All @@ -144,8 +145,8 @@ int main()
gv->selected_pix_indexes.push_back(0);
gv->selected_pix_indexes.push_back(9);
gv->selected_pix_indexes.push_back(10);
gv->selected_pix_indexes.push_back(45);
gv->selected_pix_indexes.push_back(46);
gv->selected_pix_indexes.push_back(124);
gv->selected_pix_indexes.push_back(125);
gv->selected_pix_indexes.push_back(49);
gv->selected_pix_indexes.push_back(90);
gv->selected_pix_indexes.push_back(99);
Expand All @@ -167,14 +168,14 @@ int main()
v.addVisualModel (gv);

// 8) show how to use the selected pixel option with grid
offset = { 3 * step * grid.width(), -3 * step * grid.width(), 0.0f };
offset = { 3 * step * grid.width(), -3 * step * grid.height(), 0.0f };
gv = std::make_unique<morph::GridVisual<float>>(&grid, offset);
v.bindmodel (gv);
gv->gridVisMode = morph::GridVisMode::RectInterp;
gv->setVectorData (&data);
gv->cm.setType (morph::ColourMapType::Twilight);
gv->zScale.setParams(0.0f, 0.0f);

gv->showgrid = true;
gv->grid_colour = morph::colour::red;
gv->grid_thickness = 0.2f;
Expand All @@ -185,8 +186,8 @@ int main()
gv->selected_pix_indexes.push_back(0);
gv->selected_pix_indexes.push_back(9);
gv->selected_pix_indexes.push_back(10);
gv->selected_pix_indexes.push_back(45);
gv->selected_pix_indexes.push_back(46);
gv->selected_pix_indexes.push_back(124);
gv->selected_pix_indexes.push_back(125);
gv->selected_pix_indexes.push_back(49);
gv->selected_pix_indexes.push_back(90);
gv->selected_pix_indexes.push_back(99);
Expand Down
8 changes: 4 additions & 4 deletions morph/GridVisual.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ namespace morph {
float gridthick = this->grid_thickness_fixed ? this->grid_thickness_fixed : dx[0] * this->grid_thickness;
float bz = 0.01f;
// loop through each pixel
for (float left = cg_extents[0] - (dx[0]/2.0f); left < cg_extents[1] + (dx[0]/2.0f); left += dx[0]) {
for (float left = cg_extents[0] - (dx[0]/2.0f); left < cg_extents[1]; left += dx[0]) {
for (float bot = cg_extents[2] - (dx[1]/2.0f); bot < cg_extents[3] + (dx[1]/2.0f); bot += dx[1]) {
float right = left + dx[0];
float top = bot + dx[1];
Expand All @@ -90,7 +90,7 @@ namespace morph {
this->computeFlatLine(rb, lb, rt, lt, this->uz, this->grid_colour, gridthick);

// complete the last right border (from bottom right to top right)
if (right >= cg_extents[1] + (dx[0]/2.0f)) {
if (right >= cg_extents[1]) {
this->computeFlatLine(rt, rb, lt, lb, this->uz, this->grid_colour, gridthick);
}
// complete the last top border (from top left to top right)
Expand All @@ -108,9 +108,9 @@ namespace morph {
morph::vec<float, 4> cg_extents = this->grid->extents(); // {xmin, xmax, ymin, ymax}
morph::vec<float, 2> dx = this->grid->get_dx();
float gridthick = this->grid_thickness_fixed ? this->grid_thickness_fixed : dx[0] * this->grid_thickness;
float bz = 0.03f;
float bz = 0.05f;

unsigned int pix_width = static_cast<unsigned int>(std::round(cg_extents[1] - cg_extents[0] + dx[0])/dx[0]);
unsigned int pix_width = static_cast<unsigned int>(std::round((cg_extents[1] - cg_extents[0] + dx[0])/dx[0]));

// check if the size of selected_pix_border_colour is the same as the size of selected_pix_indexes
if (selected_pix_indexes.size()>selected_pix_border_colour.size()){
Expand Down
Loading