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

function dfToQGIS #29

Open
wants to merge 44 commits into
base: r_console
Choose a base branch
from
Open

function dfToQGIS #29

wants to merge 44 commits into from

Commits on Oct 12, 2022

  1. WIP

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

  2. Vendor rinside

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

  3. Dock widget

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

  4. Fix object name

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

  5. Inject some functions

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

  6. Monospace font

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

  7. Cmake cleanup

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

  8. Fix linking to RCpp

    @nyalldawson
    nyalldawson committed Oct 12, 2022
    Configuration menu
    Copy the full SHA
    273fc87 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 12, 2022
    Configuration menu
    Copy the full SHA
    8968f44 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 12, 2022
    Configuration menu
    Copy the full SHA
    2aa294b View commit details
    Browse the repository at this point in the history

  11. Fix error handling

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

  12. Fix result handling

    @nyalldawson
    nyalldawson committed Oct 12, 2022
    Configuration menu
    Copy the full SHA
    9225332 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 12, 2022
    Configuration menu
    Copy the full SHA
    620d21a 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 12, 2022
    Configuration menu
    Copy the full SHA
    f3c7d45 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 12, 2022
    Configuration menu
    Copy the full SHA
    d3b6c7d 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 12, 2022
    Configuration menu
    Copy the full SHA
    b8c9065 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 12, 2022
    Configuration menu
    Copy the full SHA
    badf5d7 View commit details
    Browse the repository at this point in the history

  18. Remove unused code

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

  19. Formatting

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

  20. Use R code editor

    @nyalldawson
    nyalldawson committed Oct 12, 2022
    Configuration menu
    Copy the full SHA
    d351050 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 12, 2022
    Configuration menu
    Copy the full SHA
    da78775 View commit details
    Browse the repository at this point in the history

  22. Cleanup error handling and some crash fixes

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

  23. Code shuffle

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

  24. Show startup message

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

  25. Nicer ui

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

  26. Move some common code to base class

    @nyalldawson
    nyalldawson committed Oct 12, 2022
    Configuration menu
    Copy the full SHA
    203d2cd 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 12, 2022
    Configuration menu
    Copy the full SHA
    e5f9f12 View commit details
    Browse the repository at this point in the history

  28. Setup test framework

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

  29. Handle list values during conversion, add tests

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

  30. Add variant to SEXP methods

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

  31. Support cancelation in QgsScopedProxyProgressTask

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

  32. Fix some crashes

    @nyalldawson
    nyalldawson committed Oct 12, 2022
    Configuration menu
    Copy the full SHA
    de6155a 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 12, 2022
    Configuration menu
    Copy the full SHA
    405491a View commit details
    Browse the repository at this point in the history

  34. Minor optimisations

    @nyalldawson
    nyalldawson committed Oct 12, 2022
    Configuration menu
    Copy the full SHA
    bb07da8 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 12, 2022
    Configuration menu
    Copy the full SHA
    9671958 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 12, 2022
    Configuration menu
    Copy the full SHA
    590d32c View commit details
    Browse the repository at this point in the history

  37. Scroll to end of output automatically

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

  38. Cleanups

    @nyalldawson
    nyalldawson committed Oct 12, 2022
    Configuration menu
    Copy the full SHA
    197c815 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 12, 2022
    Configuration menu
    Copy the full SHA
    b0c9943 View commit details
    Browse the repository at this point in the history

  40. Fix some crashes

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

  41. Fix initialization

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

Commits on Oct 13, 2022

  1. Add a script language enum

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

  2. Move python console history handling to base QgsCodeEditor class 

    So that other non-python-console code editors can utilise this too
    @nyalldawson
    nyalldawson committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    60002cb View commit details
    Browse the repository at this point in the history

  3. function dfToQGIS

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