Fix pixelateLine #336

ppiastucki · 2020-01-23T20:36:10Z

Add proper checks before advancing the position in the special case in pixelateLine to avoid creating pixels outside of the given range.

Here is a test case to reproduce the issue:

   QtRegion testRegion;   
   testRegion.encompass(Point2f(0.020345052078482695,0.03306070963481034));
   ShapeMap testShapeMap;
   testShapeMap.init(1, testRegion);
   Line line = Line(Point2f(0.000000,0.007629394531193157), Point2f(0.010172526039241347,0.000000));
   PixelRefVector pixels = testShapeMap.pixelateLine(line);
   for (size_t i = 0; i < pixels.size(); i++) {
       PixelRef pix = pixels[i];
       printf("Pixel %d, %d\n", pix.x, pix.y);
   }

Result:

Pixel 0, 4
Pixel 1, 4
Pixel 1, 3
Pixel 2, 3
Pixel 3, 3
Pixel 3, 2
Pixel 4, 2
Pixel 5, 2
Pixel 5, 1
Pixel 6, 1
Pixel 7, 1
Pixel 7, 0
Pixel 8, 0
Pixel 9, 0
Pixel 10, 0
Pixel 10, -1

Or by running the following command with the attached DXF file:

./depthmapXcli -m IMPORT -f ./shape_250_4810.dxf -o shape.graph

Result:

row out of range

shape_250_4810.zip

* Squash warnings on windows * Crank up warning level to /W4 on MSVC * Fix w4 warnings in MSVC * Remove some clang warnings * Remove psubvec - only used in one place and does not add real value. * Shut up warning about overload hiding in paftl (we know about it and the only way to get rid of it is getting rid of paftl) * Suppress warnings on mac as well.

…to another folder

…nto modularise_vga

…ity with previous versions

Change the actual getRows() and getCols() to size_t

Make casts explicit in readwritehelpers

Topomet no paftl

…nto apply_matrix_class

…/depthmapX into apply_matrix_class

…class Apply matrix class

…_version Add the current git-commit at the version

…nto axialmap_remove_paftl

…ve_paftl Axialmap remove paftl

…nto modularise_vga

…thmapX into modularise_vga

Modularise vga

…esh_interface Make sure the result of the analysis is used to refresh the interface

…esh_interface Replace "retvar" with appropriate variable names

Otherwise the progress dialog runs out much faster because the whole grid is tested

…lity_progress_fix Move the progress check inside the filled-point test

When an attribute is selected from the index, the table is sorted by the same column. When a column is sorted at the table it is also selected on the attribute index

Add special handling for diagonal lines to XAXIS in pixelateLineTouching.

* Silence OpenGL macOS warnings * Remove version variable from all read and write functions * Add default case handling to all switch statements * Remove 'const' type qualifiers that have no effect * Remove communicator variable name where not required * Remove unused functions * Remove all unused parameters * Remove unused variables * Properly order initialisation lists * Fix multi-line comment * Clear ambiguity of logical operations * Add missing virtual destructors * Replace old finite() with isfinite() * Remove the register specifier * Change __max to std::max * Use std::move for SalaErrors in SalaProgram * Fix operator order * Fix other minor issues * Squash all warnings when comparing integers of different signs and sizes * Read count as an integer * Remove unused variable * Remove last version signifiers * Reimplement various glu functions Apple's deprecation of OpenGL creates a different problem here because the 3DView is coded using the old OpenGL way. Once 3DView is adapted to work as the GLView (or merged into it) then the glureimpl.h file won't be required. The license of the original file and thus the code in glureimpl.h is the SGI Free Sofware License B, version 2 and it is compatible with the GPL according to https://www.gnu.org/licenses/license-list.html * Remove unnecessary code * Remove unused functions and reduntant file * Add missing math declarations * Remove non-existant file reference * Squash some gcc warnings * Restore and expose a hidden colourscale The colourscale g_nicecolorhsb along with the relevant comment "Test a range designed to try to keep consistent saturation and brightness of g_nicecolor, and only move hue" has been named "Hue Only Axmanesque" as it's a variation of that colourscale. On the interface it appears as "Equal Ranges (3-Colour Hue Only)" * Remove qt5_wrap_cpp as AUTOMOC is set to ON

…tom solution

Fix tableview

Add proper checks before advancing the position in the special case in pixelateLine to avoid creating pixels outside of the given range.

pklampros · 2020-09-02T20:31:39Z

Moved to #372

blsemo and others added 30 commits October 19, 2018 07:42

Split off local visibility analysis and put it (along with global) in…

bff1565

…to another folder

Replace functions in pointdata

438c020

Make .h and .cpp reference relative

ac6f881

Merge branch 'master' of https://github.com/SpaceGroupUCL/depthmapX i…

750e51f

…nto modularise_vga

Make miscs and extents local variables

cf6cdf0

Write the miscs and extents back into the nodes for binary compatibil…

8e9eb6a

…ity with previous versions

Add missing headers

27ebdda

Change the actual getRows() and getCols() to size_t

9a77819

Merge pull request SpaceGroupUCL#257 from orange-vertex/size_t_rows_cols

2308898

Change the actual getRows() and getCols() to size_t

Merge pull request SpaceGroupUCL#253 from orange-vertex/explicit_casts

1de3a53

Make casts explicit in readwritehelpers

Merge pull request SpaceGroupUCL#251 from orange-vertex/topomet_no_paftl

e6a6892

Topomet no paftl

Remove commented out code

9669066

Merge branch 'master' of https://github.com/SpaceGroupUCL/depthmapX i…

1f81621

…nto apply_matrix_class

Merge branch 'apply_matrix_class' of https://github.com/orange-vertex…

a7e1ed6

…/depthmapX into apply_matrix_class

Merge pull request SpaceGroupUCL#250 from orange-vertex/apply_matrix_…

5ab94fb

…class Apply matrix class

Merge pull request SpaceGroupUCL#255 from orange-vertex/git_commit_in…

b357a3c

…_version Add the current git-commit at the version

Merge branch 'master' of https://github.com/SpaceGroupUCL/depthmapX i…

dcb68f2

…nto axialmap_remove_paftl

Remove debug leftover

d07f001

Rename variables to agree with types

eb9e377

Run ClangFormat on AxialAnalysisOptionsDlg.cpp

5b0e976

Move one-line function to header

76e8751

Better format of string

0d4ac43

Remove pointless computations

fb178f9

Remove comment

32c61f1

Merge pull request SpaceGroupUCL#254 from orange-vertex/axialmap_remo…

f610094

…ve_paftl Axialmap remove paftl

Remove blank lines

b0fcd52

Merge branch 'master' of https://github.com/SpaceGroupUCL/depthmapX i…

e7a9aa9

…nto modularise_vga

Merge branch 'modularise_vga' of https://github.com/orange-vertex/dep…

821d608

…thmapX into modularise_vga

Merge pull request SpaceGroupUCL#256 from orange-vertex/modularise_vga

babd255

Modularise vga

pklampros and others added 25 commits June 5, 2019 23:33

Fix application icon on windows

705d6c6

Make sure no command line appears in windows GUI

ff970de

Make sure the result of the analysis is used to refresh the interface

4ef2daf

Replace "retvar" with appropriate variable names

d0fd363

Merge pull request SpaceGroupUCL#308 from orange-vertex/analysis_refr…

c54902f

…esh_interface Make sure the result of the analysis is used to refresh the interface

Replace "retvar" with appropriate variable names

bbb82ba

Merge pull request SpaceGroupUCL#309 from orange-vertex/analysis_refr…

eab8c2b

…esh_interface Replace "retvar" with appropriate variable names

Move the progress check inside the filled-point test

22bd6c4

Otherwise the progress dialog runs out much faster because the whole grid is tested

Merge pull request SpaceGroupUCL#323 from orange-vertex/global_visibi…

c113675

…lity_progress_fix Move the progress check inside the filled-point test

Rename tableView to TableView

902e110

Get the default size from the depthmapView

48aca55

Match table and attribute index

7fbce63

When an attribute is selected from the index, the table is sorted by the same column. When a column is sorted at the table it is also selected on the attribute index

Choose the correct graphDoc to match to newly focused table

c0f6e77

Auto-format tableview.h/.cpp and add copyright header

e9b7c0e

Fix diagonal line handling (SpaceGroupUCL#326)

98a6e1e

Add special handling for diagonal lines to XAXIS in pixelateLineTouching.

Fix minor import

43f9a00

Remove unecessary destructor

fd36dfe

Move i in the for-loop and remove unnecessary variable

9d7e350

Move updating variable inside the class

433ec2c

Reformulate conditional to make it more readable

16a4420

Use the qt interface for changing attributes

c481656

Use Qt's internal focus system for redoing the table instead of a cus…

73750f4

…tom solution

Merge pull request SpaceGroupUCL#327 from orange-vertex/fix_tableview

e2288ba

Fix tableview

Fix pixelateLine

4575805

Add proper checks before advancing the position in the special case in pixelateLine to avoid creating pixels outside of the given range.

pklampros force-pushed the master branch from aad7688 to 055e8d6 Compare September 2, 2020 18:28

pklampros mentioned this pull request Sep 2, 2020

Fix pixelateLine #372

Open

pklampros closed this Sep 2, 2020

pklampros mentioned this pull request Sep 12, 2021

Fix pixelateLine spatialnous/acanthis#8

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix pixelateLine #336

Fix pixelateLine #336

ppiastucki commented Jan 23, 2020 •

edited

Loading

pklampros commented Sep 2, 2020

Fix pixelateLine #336

Fix pixelateLine #336

Conversation

ppiastucki commented Jan 23, 2020 • edited Loading

pklampros commented Sep 2, 2020

ppiastucki commented Jan 23, 2020 •

edited

Loading