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

Jump to bottom

R function #27

Closed
wants to merge 94 commits into from
Closed

R function #27

wants to merge 94 commits into from

Commits on Oct 4, 2022

  1. WIP

    @nyalldawson
    nyalldawson committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    03c8e8a View commit details
    Browse the repository at this point in the history

  2. Vendor rinside

    @nyalldawson
    nyalldawson committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    0d105e4 View commit details
    Browse the repository at this point in the history

  3. Dock widget

    @nyalldawson
    nyalldawson committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    87306aa View commit details
    Browse the repository at this point in the history

  4. Fix object name

    @nyalldawson
    nyalldawson committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    d175cc3 View commit details
    Browse the repository at this point in the history

  5. Inject some functions

    @nyalldawson
    nyalldawson committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    0f61872 View commit details
    Browse the repository at this point in the history

  6. Monospace font

    @nyalldawson
    nyalldawson committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    a00262b View commit details
    Browse the repository at this point in the history

  7. Cmake cleanup

    @nyalldawson
    nyalldawson committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    6204f84 View commit details
    Browse the repository at this point in the history

  8. Fix linking to RCpp

    @nyalldawson
    nyalldawson committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    44d2421 View commit details
    Browse the repository at this point in the history

  9. Run R session in a background thread to avoid blocking ui

    @nyalldawson
    nyalldawson committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    7a30f11 View commit details
    Browse the repository at this point in the history

  10. Don't accept new commands while session is busy

    @nyalldawson
    nyalldawson committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    192b319 View commit details
    Browse the repository at this point in the history

  11. Fix error handling

    @nyalldawson
    nyalldawson committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    d528369 View commit details
    Browse the repository at this point in the history

  12. Fix result handling

    @nyalldawson
    nyalldawson committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    fd87e45 View commit details
    Browse the repository at this point in the history

  13. add functions to convert from SEXP to std::string

    @JanCaha @nyalldawson
    JanCaha authored and nyalldawson committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    15ab7ad View commit details
    Browse the repository at this point in the history

  14. when command is evaluated, send result to console, formatted by R

    @JanCaha @nyalldawson
    JanCaha authored and nyalldawson committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    831b110 View commit details
    Browse the repository at this point in the history

  15. only return value if there is 1, otherwise return nothing for now

    @JanCaha @nyalldawson
    JanCaha authored and nyalldawson committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    eacbb96 View commit details
    Browse the repository at this point in the history

  16. on command finished, do not add string to output, it is handled elsew… 

    …here
    @JanCaha @nyalldawson
    JanCaha authored and nyalldawson committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    a0ee8ea View commit details
    Browse the repository at this point in the history

  17. Add QgsCodeEditorR code editor subclass for R scripts

    @nyalldawson
    nyalldawson committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    628dd55 View commit details
    Browse the repository at this point in the history

  18. Fix code folding

    @nyalldawson
    nyalldawson committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    5434dda View commit details
    Browse the repository at this point in the history

  19. Remove unused code

    @nyalldawson
    nyalldawson committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    8e939a3 View commit details
    Browse the repository at this point in the history

  20. Formatting

    @nyalldawson
    nyalldawson committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    e9be712 View commit details
    Browse the repository at this point in the history

  21. Use R code editor

    @nyalldawson
    nyalldawson committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    7f3e699 View commit details
    Browse the repository at this point in the history

  22. Minor cleanup and add no-return execCommand method

    @nyalldawson
    nyalldawson committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    6fc7f39 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2022

  1. Cleanup error handling and some crash fixes

    @nyalldawson
    nyalldawson committed Oct 5, 2022
    Configuration menu
    Copy the full SHA
    37fb7c1 View commit details
    Browse the repository at this point in the history

  2. Code shuffle

    @nyalldawson
    nyalldawson committed Oct 5, 2022
    Configuration menu
    Copy the full SHA
    1ae57cd View commit details
    Browse the repository at this point in the history

  3. Show startup message

    @nyalldawson
    nyalldawson committed Oct 5, 2022
    Configuration menu
    Copy the full SHA
    1b36e7b View commit details
    Browse the repository at this point in the history

  4. Nicer ui

    @nyalldawson
    nyalldawson committed Oct 5, 2022
    Configuration menu
    Copy the full SHA
    b109717 View commit details
    Browse the repository at this point in the history

  5. Move some common code to base class

    @nyalldawson
    nyalldawson committed Oct 5, 2022
    Configuration menu
    Copy the full SHA
    b93e165 View commit details
    Browse the repository at this point in the history

  6. Fix build

    @nyalldawson
    nyalldawson committed Oct 5, 2022
    Configuration menu
    Copy the full SHA
    7b84c5c View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2022

  1. functions to get data from QGIS to R

    @JanCaha @nyalldawson
    JanCaha authored and nyalldawson committed Oct 6, 2022
    Configuration menu
    Copy the full SHA
    db88706 View commit details
    Browse the repository at this point in the history

  2. Setup test framework

    @nyalldawson
    nyalldawson committed Oct 6, 2022
    Configuration menu
    Copy the full SHA
    9d16d43 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2022

  1. Handle list values during conversion, add tests

    @nyalldawson
    nyalldawson committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    b1da7ba View commit details
    Browse the repository at this point in the history

  2. Add variant to SEXP methods

    @nyalldawson
    nyalldawson committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    d00def7 View commit details
    Browse the repository at this point in the history

  3. Support cancelation in QgsScopedProxyProgressTask

    @nyalldawson
    nyalldawson committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    682b06b View commit details
    Browse the repository at this point in the history

  4. Fix some crashes

    @nyalldawson
    nyalldawson committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    423e3bd View commit details
    Browse the repository at this point in the history

  5. Lots of stuff! 

    - Thread safe layer access
- QGIS$mapLayerByName('...')
- QGIS$featureCount( a layer )
- QGIS$toDataFrame( a layer )

eg

summary(QGIS$toDataFrame(QGIS$activeLayer))
summary(QGIS$toDataFrame(QGIS$mapLayerByName('my layer')))
    @nyalldawson
    nyalldawson committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    3b8f669 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2022

  1. Minor optimisations

    @nyalldawson
    nyalldawson committed Oct 8, 2022
    Configuration menu
    Copy the full SHA
    a4bb08f View commit details
    Browse the repository at this point in the history

  2. Make QgsFeature::clearGeometry a no-op if feature already has no geom… 

    …etry
    @nyalldawson
    nyalldawson committed Oct 8, 2022
    Configuration menu
    Copy the full SHA
    259f1c0 View commit details
    Browse the repository at this point in the history

  3. [ogr] Optimise attribute population during feature iteration 

    Shaves a few percentage points off the execution time when
iterating over OGR layers
    @nyalldawson
    nyalldawson committed Oct 8, 2022
    Configuration menu
    Copy the full SHA
    796c5a6 View commit details
    Browse the repository at this point in the history

  4. Add "selectedOnly" argument to QGIS$toDataFrame 

    This involves quite a dance -- we can't have optional arguments
for cpp functions exposed via InternalFunction, so now we have
to create pure R wrappers for the exposed functions instead
and set the default values for optional arguments in those.

The nice thing is that this gives us the opportunity to add
R "sugar" to our functions so that they behave more like
standard R modules (eg we could add documentation for them)
    @nyalldawson
    nyalldawson committed Oct 8, 2022
    Configuration menu
    Copy the full SHA
    e7f795f View commit details
    Browse the repository at this point in the history

  5. Move some useful python console methods to base class

    @nyalldawson
    nyalldawson committed Oct 8, 2022
    Configuration menu
    Copy the full SHA
    98b03c6 View commit details
    Browse the repository at this point in the history

  6. Scroll to end of output automatically

    @nyalldawson
    nyalldawson committed Oct 8, 2022
    Configuration menu
    Copy the full SHA
    4372dc0 View commit details
    Browse the repository at this point in the history

  7. Cleanups

    @nyalldawson
    nyalldawson committed Oct 8, 2022
    Configuration menu
    Copy the full SHA
    9077168 View commit details
    Browse the repository at this point in the history

  8. Adapt activeLayerNumericField and readActiveLayerToSF to generic thre… 

    …ad-safe methods

Now available as:

- QGIS$toNumericVector(layer, field, selectedOnly)
- QGIS$toSf(layer)
    @nyalldawson
    nyalldawson committed Oct 8, 2022
    Configuration menu
    Copy the full SHA
    8ab0978 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2022

  1. fix error

    @JanCaha
    JanCaha committed Oct 9, 2022
    Configuration menu
    Copy the full SHA
    370a56f View commit details
    Browse the repository at this point in the history

  2. load from sf to qgis

    @JanCaha
    JanCaha committed Oct 9, 2022
    Configuration menu
    Copy the full SHA
    0cceb43 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2022

  1. WIP

    @nyalldawson
    nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    8fcb608 View commit details
    Browse the repository at this point in the history

  2. Vendor rinside

    @nyalldawson
    nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    ddf5ff0 View commit details
    Browse the repository at this point in the history

  3. Dock widget

    @nyalldawson
    nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    a8c9480 View commit details
    Browse the repository at this point in the history

  4. Fix object name

    @nyalldawson
    nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    e5195c1 View commit details
    Browse the repository at this point in the history

  5. Inject some functions

    @nyalldawson
    nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    4b74cae View commit details
    Browse the repository at this point in the history

  6. Monospace font

    @nyalldawson
    nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    8da8f8f View commit details
    Browse the repository at this point in the history

  7. Cmake cleanup

    @nyalldawson
    nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    f7ca9b0 View commit details
    Browse the repository at this point in the history

  8. Fix linking to RCpp

    @nyalldawson
    nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    cf53d5b View commit details
    Browse the repository at this point in the history

  9. Run R session in a background thread to avoid blocking ui

    @nyalldawson
    nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    0677583 View commit details
    Browse the repository at this point in the history

  10. Don't accept new commands while session is busy

    @nyalldawson
    nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    f54f18b View commit details
    Browse the repository at this point in the history

  11. Fix error handling

    @nyalldawson
    nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    64748f9 View commit details
    Browse the repository at this point in the history

  12. Fix result handling

    @nyalldawson
    nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    5cc6696 View commit details
    Browse the repository at this point in the history

  13. add functions to convert from SEXP to std::string

    @JanCaha @nyalldawson
    JanCaha authored and nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    10fb9ca View commit details
    Browse the repository at this point in the history

  14. when command is evaluated, send result to console, formatted by R

    @JanCaha @nyalldawson
    JanCaha authored and nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    34366aa View commit details
    Browse the repository at this point in the history

  15. only return value if there is 1, otherwise return nothing for now

    @JanCaha @nyalldawson
    JanCaha authored and nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    fc83c20 View commit details
    Browse the repository at this point in the history

  16. on command finished, do not add string to output, it is handled elsew… 

    …here
    @JanCaha @nyalldawson
    JanCaha authored and nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    eb36576 View commit details
    Browse the repository at this point in the history

  17. Add QgsCodeEditorR code editor subclass for R scripts

    @nyalldawson
    nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    ed8a71a View commit details
    Browse the repository at this point in the history

  18. Remove unused code

    @nyalldawson
    nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    d68f6f8 View commit details
    Browse the repository at this point in the history

  19. Formatting

    @nyalldawson
    nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    53a2d6b View commit details
    Browse the repository at this point in the history

  20. Use R code editor

    @nyalldawson
    nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    e62d37c View commit details
    Browse the repository at this point in the history

  21. Minor cleanup and add no-return execCommand method

    @nyalldawson
    nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    421f95e View commit details
    Browse the repository at this point in the history

  22. Cleanup error handling and some crash fixes

    @nyalldawson
    nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    22ea294 View commit details
    Browse the repository at this point in the history

  23. Code shuffle

    @nyalldawson
    nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    e07b433 View commit details
    Browse the repository at this point in the history

  24. Show startup message

    @nyalldawson
    nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    d9da2fb View commit details
    Browse the repository at this point in the history

  25. Nicer ui

    @nyalldawson
    nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    3f84fd7 View commit details
    Browse the repository at this point in the history

  26. Move some common code to base class

    @nyalldawson
    nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    421b9e0 View commit details
    Browse the repository at this point in the history

  27. functions to get data from QGIS to R

    @JanCaha @nyalldawson
    JanCaha authored and nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    732fc19 View commit details
    Browse the repository at this point in the history

  28. Setup test framework

    @nyalldawson
    nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    e24063b View commit details
    Browse the repository at this point in the history

  29. Handle list values during conversion, add tests

    @nyalldawson
    nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    a407190 View commit details
    Browse the repository at this point in the history

  30. Add variant to SEXP methods

    @nyalldawson
    nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    28235a5 View commit details
    Browse the repository at this point in the history

  31. Support cancelation in QgsScopedProxyProgressTask

    @nyalldawson
    nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    423074d View commit details
    Browse the repository at this point in the history

  32. Fix some crashes

    @nyalldawson
    nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    1fd1ab7 View commit details
    Browse the repository at this point in the history

  33. Lots of stuff! 

    - Thread safe layer access
- QGIS$mapLayerByName('...')
- QGIS$featureCount( a layer )
- QGIS$toDataFrame( a layer )

eg

summary(QGIS$toDataFrame(QGIS$activeLayer))
summary(QGIS$toDataFrame(QGIS$mapLayerByName('my layer')))
    @nyalldawson
    nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    3665168 View commit details
    Browse the repository at this point in the history

  34. Minor optimisations

    @nyalldawson
    nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    33b4f70 View commit details
    Browse the repository at this point in the history

  35. [ogr] Optimise attribute population during feature iteration 

    Shaves a few percentage points off the execution time when
iterating over OGR layers
    @nyalldawson
    nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    7850f7b View commit details
    Browse the repository at this point in the history

  36. Add "selectedOnly" argument to QGIS$toDataFrame 

    This involves quite a dance -- we can't have optional arguments
for cpp functions exposed via InternalFunction, so now we have
to create pure R wrappers for the exposed functions instead
and set the default values for optional arguments in those.

The nice thing is that this gives us the opportunity to add
R "sugar" to our functions so that they behave more like
standard R modules (eg we could add documentation for them)
    @nyalldawson
    nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    766ee50 View commit details
    Browse the repository at this point in the history

  37. Scroll to end of output automatically

    @nyalldawson
    nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    96017ba View commit details
    Browse the repository at this point in the history

  38. Cleanups

    @nyalldawson
    nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    b32e3aa View commit details
    Browse the repository at this point in the history

  39. Adapt activeLayerNumericField and readActiveLayerToSF to generic thre… 

    …ad-safe methods

Now available as:

- QGIS$toNumericVector(layer, field, selectedOnly)
- QGIS$toSf(layer)
    @nyalldawson
    nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    0e350cd View commit details
    Browse the repository at this point in the history

  40. Fix some crashes

    @nyalldawson
    nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    f152959 View commit details
    Browse the repository at this point in the history

  41. Fix initialization

    @nyalldawson
    nyalldawson committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    d8f422d View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2022

  1. refactor and updates

    @JanCaha
    JanCaha committed Oct 11, 2022
    Configuration menu
    Copy the full SHA
    9b6909b View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'nyall_fork/r_console' into r_function

    @JanCaha
    JanCaha committed Oct 11, 2022
    Configuration menu
    Copy the full SHA
    2905b33 View commit details
    Browse the repository at this point in the history

  3. fix merge error

    @JanCaha
    JanCaha committed Oct 11, 2022
    Configuration menu
    Copy the full SHA
    5c82975 View commit details
    Browse the repository at this point in the history

  4. fix merge problem

    @JanCaha
    JanCaha committed Oct 11, 2022
    Configuration menu
    Copy the full SHA
    10392b8 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2022

  1. better way to handle loading of data

    @JanCaha
    JanCaha committed Oct 12, 2022
    Configuration menu
    Copy the full SHA
    271a7b6 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2022

  1. call functions properly with library environment

    @JanCaha
    JanCaha committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    7fb8669 View commit details
    Browse the repository at this point in the history

  2. convert sf dataframe using WKB to WKT translation ...significantly fa… 

    …ster then st_as_text
    @JanCaha
    JanCaha committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    89f9d71 View commit details
    Browse the repository at this point in the history

  3. remove empty line

    @JanCaha
    JanCaha committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    8d8e9c1 View commit details
    Browse the repository at this point in the history