Fix pixelateLine - #336

Closed

ppiastucki wants to merge 1440 commits into

SpaceGroupUCL:masterfrom

ppiastucki:master

This pull request is big! We're only showing the most recent 250 commits

Commits on Oct 19, 2018

Remove and suppress warnings in genlib and tests (#252)
blsemo
authored
147c56a

Commits on Oct 22, 2018

Split off local visibility analysis and put it (along with global) into another folder
Petros Koutsolampros
committed
bff1565

Commits on Oct 23, 2018

Replace functions in pointdata
Petros Koutsolampros
committed
438c020
Make .h and .cpp reference relative
Petros Koutsolampros
committed
ac6f881
Merge branch 'master' of https://github.com/SpaceGroupUCL/depthmapX into modularise_vga
Petros Koutsolampros
committed
750e51f
Make miscs and extents local variables
Petros Koutsolampros
committed
cf6cdf0
Write the miscs and extents back into the nodes for binary compatibility with previous versions
Petros Koutsolampros
committed
8e9eb6a
Add missing headers
Petros Koutsolampros
committed
27ebdda

Commits on Oct 24, 2018

Change the actual getRows() and getCols() to size_t
Petros Koutsolampros
committed
9a77819
Merge pull request #257 from orange-vertex/size_t_rows_cols
pklampros
authored
2308898

Commits on Oct 31, 2018

Merge pull request #253 from orange-vertex/explicit_casts
pklampros
authored
1de3a53
Merge pull request #251 from orange-vertex/topomet_no_paftl
pklampros
authored
e6a6892
Remove commented out code
pklampros
authored
9669066
Merge branch 'master' of https://github.com/SpaceGroupUCL/depthmapX into apply_matrix_class
Petros Koutsolampros
committed
1f81621
Merge branch 'apply_matrix_class' of https://github.com/orange-vertex/depthmapX into apply_matrix_class
Petros Koutsolampros
committed
a7e1ed6
Merge pull request #250 from orange-vertex/apply_matrix_class
pklampros
authored
5ab94fb
Merge pull request #255 from orange-vertex/git_commit_in_version
pklampros
authored
b357a3c
Merge branch 'master' of https://github.com/SpaceGroupUCL/depthmapX into axialmap_remove_paftl
Petros Koutsolampros
committed
dcb68f2
Remove debug leftover
Petros Koutsolampros
committed
d07f001
Rename variables to agree with types
Petros Koutsolampros
committed
eb9e377
Run ClangFormat on AxialAnalysisOptionsDlg.cpp
Petros Koutsolampros
committed
5b0e976
Move one-line function to header
Petros Koutsolampros
committed
76e8751
Better format of string
Petros Koutsolampros
committed
0d4ac43
Remove pointless computations
Petros Koutsolampros
committed
fb178f9
Remove comment
Petros Koutsolampros
committed
32c61f1
Merge pull request #254 from orange-vertex/axialmap_remove_paftl
pklampros
authored
f610094
Remove blank lines
pklampros
authored
b0fcd52
Merge branch 'master' of https://github.com/SpaceGroupUCL/depthmapX into modularise_vga
Petros Koutsolampros
committed
e7a9aa9
Merge branch 'modularise_vga' of https://github.com/orange-vertex/depthmapX into modularise_vga
Petros Koutsolampros
committed
821d608
Merge pull request #256 from orange-vertex/modularise_vga
pklampros
authored
babd255
Break metric analysis out of pointmap
Petros Koutsolampros
committed
1080286
Break angular analysis out of pointmap
Petros Koutsolampros
committed
3951758
Break through-vision analysis out of pointmap
Petros Koutsolampros
committed
6df67d6
Fix spacing
Petros Koutsolampros
committed
6b0af85
Remove some warnings
Petros Koutsolampros
committed
c8061fc
Break isovist analysis out of pointmap
Petros Koutsolampros
committed
3d4d3db

Commits on Nov 1, 2018

Break the various depth calculations out of pointmap
Petros Koutsolampros
committed
e05d39e
Break segment and axial analyses out of shapegraph
Petros Koutsolampros
committed
18470c6

Commits on Nov 2, 2018

Move the parsers in a separate folder
Petros Koutsolampros
committed
c07025d
Remove the MetaGraph input from the vga interface and for isovists take the drawing layers from the pointmap
Petros Koutsolampros
committed
9c79880
Fix formatting in genlib using ClangFormat
Petros Koutsolampros
committed
9f684d4

Commits on Nov 3, 2018

Move all the dialogs in a separate folder
Petros Koutsolampros
committed
58e1a6c
Move the dethmapX views into separate folders
Petros Koutsolampros
committed
beb1ef3
Update case for renamed headers
Petros Koutsolampros
committed
d98b17f

Commits on Nov 4, 2018

Do not write m_misc into the graph file
Petros Koutsolampros
committed
aa075a9
Actually don't write m_misc
Petros Koutsolampros
committed
2807638
Also test local visibility (map only)
Petros Koutsolampros
committed
75120e3
Add radius for metric vga test
Petros Koutsolampros
committed
b1981c1

Commits on Nov 8, 2018

Move the xml parser back into genlib
Petros Koutsolampros
committed
d50a8f2
Merge pull request #262 from orange-vertex/depthmapx_dialogs
pklampros
authored
8b710e4
Merge pull request #261 from orange-vertex/genlib_clangformat
pklampros
authored
de5c40e
Merge branch 'master' of https://github.com/SpaceGroupUCL/depthmapX into parsers_folder
Petros Koutsolampros
committed
2b03099
Return Base Matrix for points
Petros Koutsolampros
committed
ee07513
Move chunky functions in the .cpp file
Petros Koutsolampros
committed
325389f
Move helpers into the helpers file
Petros Koutsolampros
committed
a3e893b
Merge branch 'master' of https://github.com/SpaceGroupUCL/depthmapX into axial_analyses
Petros Koutsolampros
committed
33dfc0d
Merge pull request #258 from orange-vertex/parsers_folder
pklampros
authored
c857570
Merge branch 'master' into vga_analyses
pklampros
authored
0d8580a
Merge branch 'master' of https://github.com/SpaceGroupUCL/depthmapX into axial_analyses
Petros Koutsolampros
committed
d044c2f
Remove most c arrays from the transferred code
Petros Koutsolampros
committed
35a0274
Update the linux binary
Petros Koutsolampros
committed
9b9c722
Return a reference instead of a pointer to the pointmap drawing files
Petros Koutsolampros
committed
5c83b51
Merge branch 'vga_analyses' of https://github.com/orange-vertex/depthmapX into vga_analyses
Petros Koutsolampros
committed
19d9d96
Merge pull request #263 from orange-vertex/dont_write_m_misc
pklampros
authored
70fc6d4
Merge pull request #260 from orange-vertex/vga_analyses
pklampros
authored
ac410f3
Merge branch 'master' into axial_analyses
pklampros
authored
7fd4ab0
Merge pull request #259 from orange-vertex/axial_analyses
pklampros
authored
82ba21d

Commits on Nov 9, 2018

Fix compilation on Windows (#264)
blsemo
authored
8dd1fbe

Commits on Nov 15, 2018

Update the darwin binary
Petros Koutsolampros
committed
b75aad5
Merge pull request #265 from orange-vertex/master
pklampros
authored
b6d76e1
Remove all paftl containers except in attributes
Petros Koutsolampros
committed
88ad871

Commits on Nov 21, 2018

Make icon background transparent
Petros Koutsolampros
committed
e5b6ac8
Merge pull request #266 from orange-vertex/master
pklampros
authored
ab0be6d

Commits on Nov 28, 2018

Make the attribute map non-templated (#268)
blsemo
authored
8909fb7

Commits on Dec 1, 2018

Fix polygon shape selection
Petros Koutsolampros
committed
e406ef0
Merge pull request #269 from orange-vertex/fix_polygon_shape_selection
pklampros
authored
97b7c64

Commits on Dec 4, 2018

Make sure a displayed data map is set when importing or creating
Petros Koutsolampros
committed
330cdda

Commits on Dec 5, 2018

Show the Shapemap points in the GLView
Petros Koutsolampros
committed
b337829
Fix sala script (#270)
blsemo
authored
94956a6

Commits on Dec 15, 2018

Don't call MakeGraphTree twice
Petros Koutsolampros
committed
0a8144e

Commits on Jan 8, 2019

Actually calculate everything if not in simple mode
Petros Koutsolampros
committed
bf27de0

Commits on Jan 26, 2019

Include connector.h directly instead of forward declaring it
Petros Koutsolampros
committed
78874a6
Write agent trails to a map instead of to a file
Petros Koutsolampros
committed
5029523
Allow exporting the Agent trails (and another map) from the GUI
Petros Koutsolampros
committed
7ef6f68
Make g_trails a member of the agent program and remove the trails cap
Petros Koutsolampros
committed
23dd625

Commits on Jan 27, 2019

For agent trails store events instead of just points
Petros Koutsolampros
committed
ee8dc37
Revert to original capitalised version of CAT
Petros Koutsolampros
committed
f659423
Break apart nagent.h/.cpp
Petros Koutsolampros
committed
a53d990

Commits on Jan 31, 2019

Fix graph grammar to accept more layers
Petros Koutsolampros
committed
59678b5
Merge pull request #280 from orange-vertex/fix_grammar
pklampros
authored
80230ce

Commits on Feb 3, 2019

Change the codebase to use the new attributes table
Petros Koutsolampros
committed
cbf77bc
Merge branch 'master' of https://github.com/SpaceGroupUCL/depthmapX into apply_new_attrib
Petros Koutsolampros
committed
cc7cb34

Commits on Feb 13, 2019

Allow "unmaking" the VGA graph
Petros Koutsolampros
committed
6add59b
Inform the user that their data will be removed
Petros Koutsolampros
committed
ac20968

Commits on Feb 14, 2019

Provide a specific function for unmerging a pixel and unmerge the pixel if the point is not available anymore
Petros Koutsolampros
committed
095843f
Allow linking after filling the grid
Petros Koutsolampros
committed
588e437
Make removing links optional, and ask the user when unmaking the graph
Petros Koutsolampros
committed
554221d
Don't ask the user to remove links if there are no links
Petros Koutsolampros
committed
a287d10
Right-click to unfill a pixel in the GLView (as in the legacy view)
Petros Koutsolampros
committed
f577026

Commits on Feb 17, 2019

use the proper mouse event button
Petros Koutsolampros
committed
8e2691c

Commits on Feb 25, 2019

Allow defining the step depth type in the CLI
Petros Koutsolampros
committed
f7a33f6
Provide step-depth regression tests
Petros Koutsolampros
committed
66807b8

Commits on Mar 4, 2019

Make sure there are shapes before accessing first object
Petros Koutsolampros
committed
b0ffa96
Use empty() instead of size()
pklampros
authored
6114082

Commits on Mar 9, 2019

Make sure there are axes selected for regression line
Petros Koutsolampros
committed
a6697f8
Abstract away the function for finding keys in a range
Petros Koutsolampros
committed
8058c29
Remove unusued variable
Petros Koutsolampros
committed
d783b75
Use hasColumn to check if column exists
Petros Koutsolampros
committed
c17c0c1
Use clear instead of making a new table
Petros Koutsolampros
committed
1ae2a4f
Use pointers and references the rows themselves
Petros Koutsolampros
committed
3ba2180
Make all containers std in MapInfoData
Petros Koutsolampros
committed
eb96632
Fetch the last key-row pair from the attributes
Petros Koutsolampros
committed
f4dc6d7
Remove unnecessary ifdef
Petros Koutsolampros
committed
617e95e
Remove unused variables
Petros Koutsolampros
committed
24a96d0
Catch the specific exceptions thrown by stoi
Petros Koutsolampros
committed
d2d251c
Use the safe getline function
Petros Koutsolampros
committed
7b3fc79
Allow finding the index of a key in the index of the currently displayed column
Petros Koutsolampros
committed
9805499
Remove unused variable
Petros Koutsolampros
committed
a22ca6d
Make sorted column index retrieval more efficient
Petros Koutsolampros
committed
13d9a24
Convert pointer arrays to vectors
Petros Koutsolampros
committed
70549f3

Commits on Mar 13, 2019

Merge pull request #290 from orange-vertex/write_empty_shapemap
pklampros
authored
a8fc5c0

Commits on Mar 23, 2019

Minor cleanup
Petros Koutsolampros
committed
78b639f
Iterate the attribute rows directly
Petros Koutsolampros
committed
8faa95c
Update comment to add TODO
Petros Koutsolampros
committed
90763e3
Iterate directly on the attribute rows where possible
Petros Koutsolampros
committed
c641c60

Commits on Mar 24, 2019

Change all requests for attribute row from index to go through a function
Petros Koutsolampros
committed
980d996
Make sure shapemap POD fields are initialised
Petros Koutsolampros
committed
7b40b88
Merge pull request #276 from orange-vertex/isovists_calculate_all
pklampros
authored
e09100f
Merge pull request #274 from orange-vertex/layer_delete_dupes
pklampros
authored
96d19f5
Remove unused functions
Petros Koutsolampros
committed
eef2e46
Remove includes of attributes.h
Petros Koutsolampros
committed
e454f48
Remove attributes.h
Petros Koutsolampros
committed
77ae7ec
Add missing include
Petros Koutsolampros
committed
239fa40
Merge branch 'master' of https://github.com/SpaceGroupUCL/depthmapX into apply_new_attrib
Petros Koutsolampros
committed
a0ce49c
Update the linux binary
Petros Koutsolampros
committed
29da9c4
Merge pull request #281 from orange-vertex/apply_new_attrib
pklampros
authored
89aa2d9
Merge branch 'master' into interface_fixes
pklampros
authored
f251e75
Merge branch 'master' into gl_points
pklampros
authored
68c76b4
Update the darwin binary
Petros Koutsolampros
committed
d8d5a90
Merge pull request #291 from orange-vertex/master
pklampros
authored
0ca9ea3
Remove the dXreimpl namespace from the attributes table
Petros Koutsolampros
committed
e689d9e
Merge pull request #292 from orange-vertex/remove_dxreimpl
pklampros
authored
5d1c6d6
Merge branch 'master' of https://github.com/SpaceGroupUCL/depthmapX into breakup_nagent
Petros Koutsolampros
committed
d41bc17
Merge branch 'master' of https://github.com/SpaceGroupUCL/depthmapX into gl_points
Petros Koutsolampros
committed
f16ddff
Minor fix for last merge
Petros Koutsolampros
committed
be3f2fb
Merge branch 'master' of https://github.com/SpaceGroupUCL/depthmapX into no_paftl
Petros Koutsolampros
committed
4b4418c
Remove paftl.h includes from sala
Petros Koutsolampros
committed
a621d9c
Remove paftl entirely
Petros Koutsolampros
committed
c0ef9f1

Commits on Mar 25, 2019

Make sure we don't catch eof as bad
Petros Koutsolampros
committed
c978444
Fix the visual depth algorithm
Petros Koutsolampros
committed
65aeaa0

Commits on Apr 3, 2019

Cleanup commented code
Petros Koutsolampros
committed
646482e
Merge pull request #277 from orange-vertex/agent_trails_file
pklampros
authored
801b4fd
Use static std::string instead of char []
Petros Koutsolampros
committed
356d62a
Merge branch 'master' of https://github.com/SpaceGroupUCL/depthmapX into breakup_nagent
Petros Koutsolampros
committed
27bc26a
Write into existing shapemap as the copy does not save data
Petros Koutsolampros
committed
eccdc37
Merge pull request #279 from orange-vertex/breakup_nagent
pklampros
authored
689cd71
Merge pull request #271 from orange-vertex/gl_points
pklampros
authored
9d39a75
Merge branch 'master' of https://github.com/SpaceGroupUCL/depthmapX into interface_fixes
Petros Koutsolampros
committed
aa0d11e
Fix formatting according to ClangFormat
Petros Koutsolampros
committed
3eb14d3
Merge pull request #272 from orange-vertex/interface_fixes
pklampros
authored
3265966
Merge branch 'master' of https://github.com/SpaceGroupUCL/depthmapX into no_paftl
Petros Koutsolampros
committed
4123317
Apply ClangFormat
Petros Koutsolampros
committed
6886f5d
Replace multiple catch statements with catch(std::logic_error&) to catch anything thrown out of the STL
Petros Koutsolampros
committed
a54e64a
Check if a gate exists on the pixel and then look for the column
Petros Koutsolampros
committed
d971255
Use the existing findBinary function
Petros Koutsolampros
committed
3527d4b
Apply ClangFormat
Petros Koutsolampros
committed
aa1d497
Restore legacy converter and transfer paftl-related tests to mgraph440
Petros Koutsolampros
committed
e63c2dc
Change the order of subdirs to satisfy dependencies
Petros Koutsolampros
committed
76e4cd3
Merge pull request #273 from orange-vertex/no_paftl
pklampros
authored
d608b99
Merge branch 'master' of https://github.com/SpaceGroupUCL/depthmapX into unmake_vga
Petros Koutsolampros
committed
fd3db7b
Minor fix
Petros Koutsolampros
committed
b98ede3

Commits on Apr 5, 2019

Update travis to speak to the depthmapX matrix room
pklampros
authored
79d612a
Update .travis.yml
pklampros
authored
7c21574

Commits on Apr 6, 2019

Point to the depthmapX-build room instead
pklampros
authored
639f105
Allow the various output streams to be more generic
Petros Koutsolampros
committed
dd8b032

Commits on Apr 7, 2019

Merge pull request #285 from orange-vertex/step_depth_type
pklampros
authored
8232f30
Extend the CLI to make/unmake the graph
Petros Koutsolampros
committed
e17b9d5
Merge branch 'master' of https://github.com/SpaceGroupUCL/depthmapX into unmake_vga
Petros Koutsolampros
committed
09a7894
Update the darwin CLI
Petros Koutsolampros
committed
bdd8280
Merge pull request #283 from orange-vertex/unmake_vga
pklampros
authored
0c909b8
Update the linux binary
Petros Koutsolampros
committed
ad04260
Merge pull request #293 from orange-vertex/master
pklampros
authored
8243e37

Commits on Apr 9, 2019

Add a new file for testing point csv imports
Petros Koutsolampros
committed
f05bc2b
Merge pull request #295 from orange-vertex/master
pklampros
authored
513d327
Make sure the view_class is also cleared
pklampros
authored
d3483e1

Commits on Apr 10, 2019

Make all ifndefs MSVC specific
Petros Koutsolampros
committed
3ebbc09
Make warnings MSVC specific
Petros Koutsolampros
committed
245a083
Separate MSVC from GCC when including OpenGL
Petros Koutsolampros
committed
e48f2dc
Don't cast pointer to smaller type
Petros Koutsolampros
committed
0d1e1f9
Make sure depthmapX also has access to the OpenGL bindings
Petros Koutsolampros
committed
bdc67b1
Use the common QKeyEvent class
Petros Koutsolampros
committed
4c85bad
Remove unused function
Petros Koutsolampros
committed
45e448a
Search for -lopengl32
Petros Koutsolampros
committed
bcd9047
Revert to lowercase opengl for all win32 and acc c++11 to all libraries
Petros Koutsolampros
committed
c4a053f
Update README to include matrix/riot channels
pklampros
authored
792f12f
Actually move the various ShapeMap fields
Petros Koutsolampros
committed
6037913

Commits on May 1, 2019

Merge pull request #297 from orange-vertex/move_shapemap
pklampros
authored
e11cc43

Commits on May 8, 2019

Merge pull request #296 from orange-vertex/mingw_build
pklampros
authored
b94da19

Commits on May 12, 2019

Move the build system to CMake and the build to docker (#299)
blsemo
authored
3de0366

Commits on May 17, 2019

Allow attaching to existing attribute tables
Petros Koutsolampros
committed
80a8109
Expose attribute attachment via CLI
Petros Koutsolampros
committed
9c030c4
Make sure the input files are parsed
Petros Koutsolampros
committed
159cc34
Minor fix
Petros Koutsolampros
committed
2017b40

Commits on May 18, 2019

Delete mgraph440Test.pro
pklampros
authored
afa9534
Make the tooltips show as fixed notation
Petros Koutsolampros
committed
2193074
Merge pull request #301 from orange-vertex/tooltip_non_scientific
pklampros
authored
9caaff9

Commits on May 19, 2019

Create a macos bundle and reattach the Info.plist
Petros Koutsolampros
committed
87159d1
Merge pull request #302 from orange-vertex/apple_bundle_cmake
pklampros
authored
aec2a45
Fix File->Exit
Petros Koutsolampros
committed
e03fff9
Merge pull request #303 from orange-vertex/fix_file_exit
pklampros
authored
3cd0b46

Commits on May 20, 2019

Put the options directly in the analysis object (VGA)
Petros Koutsolampros
committed
a048200
Put the options directly in the analysis object (Segment)
Petros Koutsolampros
committed
236c748
Put the options directly in the analysis object (Axial)
Petros Koutsolampros
committed
2b58645
Remove options.h inclusion where unnecessary
Petros Koutsolampros
committed
07b2caa

Commits on May 22, 2019

Merge pull request #304 from orange-vertex/options_in_analysis
pklampros
authored
7f87006

Commits on May 23, 2019

Also time adding attributes
Petros Koutsolampros
committed
56d697a
Merge pull request #300 from orange-vertex/attach_attributes
pklampros
authored
d681356
Update build_and_upload.sh to call cmake instead
pklampros
authored
41a4544

Commits on Jun 5, 2019

Fix bug on copying attributes axial to segment
pklampros
authored
83b91e4
Bump up version number
Petros Koutsolampros
committed
1e86386
Merge pull request #305 from orange-vertex/master
pklampros
authored
8fd6133
Remove duplicate version.h
Petros Koutsolampros
committed
fb1e21b
Merge pull request #306 from orange-vertex/master
pklampros
authored
750becc
Remove reference to duplicate version.h
Petros Koutsolampros
committed
49858d2
Merge pull request #307 from orange-vertex/master
pklampros
authored
c8acc43
Fix application icon on windows
pklampros
authored
705d6c6
Make sure no command line appears in windows GUI
pklampros
authored
ff970de

Commits on Jun 7, 2019

Make sure the result of the analysis is used to refresh the interface
Petros Koutsolampros
committed
4ef2daf

Commits on Jun 8, 2019

Replace "retvar" with appropriate variable names
Petros Koutsolampros
committed
d0fd363
Merge pull request #308 from orange-vertex/analysis_refresh_interface
pklampros
authored
c54902f
Replace "retvar" with appropriate variable names
Petros Koutsolampros
committed
bbb82ba
Merge pull request #309 from orange-vertex/analysis_refresh_interface
pklampros
authored
eab8c2b

Commits on Jul 21, 2019

Move the progress check inside the filled-point test
Petros Koutsolampros
committed
22bd6c4
Merge pull request #323 from orange-vertex/global_visibility_progress_fix
pklampros
authored
c113675

Commits on Aug 17, 2019

Rename tableView to TableView
Petros Koutsolampros
committed
902e110
Get the default size from the depthmapView
Petros Koutsolampros
committed
48aca55
Match table and attribute index
Petros Koutsolampros
committed
7fbce63
Choose the correct graphDoc to match to newly focused table
Petros Koutsolampros
committed
c0f6e77
Auto-format tableview.h/.cpp and add copyright header
Petros Koutsolampros
committed
e9b7c0e

Commits on Dec 5, 2019

Fix diagonal line handling (#326)

ppiastucki
authored and
blsemo
committed
98a6e1e

Commits on Dec 18, 2019

Cleanup warnings (#294)

pklampros
authored and
blsemo
committed
1aa902a
Fix minor import
Petros Koutsolampros
committed
43f9a00

Commits on Jan 21, 2020

Remove unecessary destructor
Petros Koutsolampros
committed
fd36dfe
Move i in the for-loop and remove unnecessary variable
Petros Koutsolampros
committed
9d7e350
Move updating variable inside the class
Petros Koutsolampros
committed
433ec2c
Reformulate conditional to make it more readable
Petros Koutsolampros
committed
16a4420
Use the qt interface for changing attributes
Petros Koutsolampros
committed
c481656

Commits on Jan 22, 2020

Use Qt's internal focus system for redoing the table instead of a custom solution
Petros Koutsolampros
committed
73750f4
Merge pull request #327 from orange-vertex/fix_tableview
pklampros
authored
e2288ba

Commits on Jan 23, 2020

Fix pixelateLine
Piotr Piastucki
committed
4575805