Commit 533cb2a
Merging map2loop plugin into LoopStructural (#51)
* initial commit
* adding pyproject.toml for ruff
* change linter to ruff
* adding release please action
* linting
* Bump dawidd6/action-download-artifact from 9 to 11
Bumps [dawidd6/action-download-artifact](https://github.com/dawidd6/action-download-artifact) from 9 to 11.
- [Release notes](https://github.com/dawidd6/action-download-artifact/releases)
- [Commits](dawidd6/action-download-artifact@v9...v11)
---
updated-dependencies:
- dependency-name: dawidd6/action-download-artifact
dependency-version: '11'
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
* ci: fix formatting of release-please
* Update linter.yml
* Update release-please.yml
* fixing syntax
* adding release please files
* fix: import typo
* template for basal contacts processing tool
* Update linter.yml
* disable qgis testing for now
* Update release-please.yml
* Update release-please.yml
* feature: Implement StratigraphySorterAlgorithm
* feature: functions to convert layers to GeoDataFrame and DataFrame
* feature: add geodataframe to qgsLayer conversion
* refactor: update GeoDataFrameToQgsLayer
* fix: GeoDataFrameToQgsLayer to FeatureSink
* refactor: clean up imports in vectorLayerWrapper.py
* feature: add basal contacts extraction algorithm
* refactor: add imports in sorter.py
* feature: implement sampler algorithm
* feature: add thickness calculator algorithms
* fix: correct return value
* feature: add support SamplerSpacing
* fix: update sampler type strings for consistency
* fix: convert dataframe to qgis layer
* feature: add dataframe to point sink conversion
* fix: add input parameters
* refactor: rename to dataframeToQgsLayer
* refactor: update thickness calculator parameters and processing logic
* update BasalContactsAlgorithm
* fix import in vectorLayerWrapper.py
* rename unused loop idx in vectorLayerWrapper
* rename directory to m2l to avoid import conflicts
* fix linter.yml
* fix: add QgsPoint import
* fix: add QgsPointXY import
* fix: enforce str type
* refactor: handling of string fields
* fix: add missing import for wkb_loads
* refactor: implementation and enforce string dtype
* fix: QGIS string fields are converted to str
* fix: remove type conversion issues
* fix: simplify string field handling
* fix: ensure string fields are explicitly converted
* sampler
* fix: enhance contact rextraction tool
* fix: update algorithm imports and registration in provider
* fix: correct parameter types
* fix: standardize algorithm group ID
* fix: add user-defined sorting option
* input files
* fix: change stratigraphic column QgsProcessingParameterFeatureSink description parameter to string
* feat add formation column mapping and validation for strat column
* delete input files
* fix sorter
* fix data type of spacing and decimator in sampler
* rename unused loop idx in sampler
* add dtm to input
* add validation in sampler
* spacing decimator test
* refactor sampler tests for cicd compatibility
* update tester.yml workflow for all branches
* change image
* update testing.txt
* install map2loop in tester.yml
* tester.yml
* input file
* test_basal_contacts
* fix import in test_basal_contacts.py
* fix strati_column in test_basal_contacts
* add structure and dtm parameters for SorterObservationProjections and column mapping
* add contact as output layer
* change contacts_df and relationships_df
* add contact layer in sorter
* handle dip, dipdir, orientation type for structure in sorter.py
* fix syntax in sampler
* update basal contact test
* update basal contact test to include contacts layer
* feat: thickness calculator tool
* feat: raster and dataframe handling
* fix clean up process for tests
* fix remove duplicated units_df in sorter
* fix build_input_frames in sorter
* add contacts and basal contacts data for testing
* add validation in sorter
* handle user defined strati column and add validation
* add json file output for sorter
* refactor: remove user defined column
* feat: add qvariantToFloat function
* feat: Processing/processing tools sampler (#19)
* sampler
* fix sorter
* fix data type of spacing and decimator in sampler
* rename unused loop idx in sampler
* add dtm to input
* add validation in sampler
* spacing decimator test
* refactor sampler tests for cicd compatibility
* update tester.yml workflow for all branches
* change image
* update testing.txt
* install map2loop in tester.yml
* fix: update field types to use QVariant
* fix optional dtm parameter in decimator
---------
Co-authored-by: Rabii Chaarani <50892556+rabii-chaarani@users.noreply.github.com>
* Processing/processing tools basal contacts test (#21)
* input files
* fix: change stratigraphic column QgsProcessingParameterFeatureSink description parameter to string
* feat add formation column mapping and validation for strat column
* tester.yml
* input file
* test_basal_contacts
* fix import in test_basal_contacts.py
* fix strati_column in test_basal_contacts
* removed duplicated input files
* fix: fix syntac error
* fix: remove redundant parameters in SamplerAlgorithm
* fix: remove redundant imports
* fix: remove unused QgsSettings
* fix: updated tearDownClass
* fix: add pass statement
* update sampler tests
* update sampler
* update strati column and bounding box
* fix sample contacts data type
* add orientation type for structure data
* Processing/thickness calculator (#23)
* feat: thickness calculator tool
* feat: raster and dataframe handling
* fix: remove unused QgsSettings
* fix: updated tearDownClass
* fix: add pass statement
* update sampler tests
* update sampler
---------
Co-authored-by: Noelle Cheng <noelle.cheng@monash.edu>
* feat: add UserDefinedStratigraphyAlgorithm to provider
* feat: import UserDefinedStratigraphyAlgorithm
* refactor: update BasalContactsAlgorithm
* refactor: update SamplerAlgorithm
* refactor: update sorter
* refactor: update ThicknessCalculatorAlgorithm
* feat: implement UserDefinedStratigraphyAlgorithm
* refactor: remove redundant algo
* fix: use correct strati table
* fix: correct variable assignment
* fix units in ThicknessCalculatorAlgorithm
* update extract_basal_contacts and test_basal_contacts
* Revert "update extract_basal_contacts and test_basal_contacts"
This reverts commit b1bb23f.
* fix test_basal_contacts
* fix input file name in test_basal_contacts
* feat dynamic field handling in Sampler
* fix strat column data in ThicknessCalculator
* merge with processing/processing_tools
* add user defined boundingbox in ThicknessCalculatorAlgorithm
* replace QMetaType with QVariant in sampler
* change orientation type variable name in ThicknessCalculatorAlgorithm
* Initial commit
* rename for folder for merge with loopstructural plugin
* add agent.md file with initial content. (#53)
* Fix: revert building qgs Table
* Refactor: remove unnecessary formation field
---------
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: rabii-chaarani <rabii.chaarani@monash.edu>
Co-authored-by: Noelle Cheng <noelle.cheng@monash.edu>
Co-authored-by: Rabii Chaarani <50892556+rabii-chaarani@users.noreply.github.com>
Co-authored-by: noellehmcheng <143368485+noellehmcheng@users.noreply.github.com>1 parent 7e511a3 commit 533cb2a
File tree
59 files changed
+2994
-95
lines changed- .github
- workflows
- docs
- development
- static
- loopstructural
- main
- processing
- algorithms
- resources/i18n
- toolbelt
- requirements
- scripts
- tests/qgis
- input
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
59 files changed
+2994
-95
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
48 | | - | |
49 | 48 | | |
50 | 49 | | |
51 | 50 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
22 | | - | |
23 | 22 | | |
24 | 23 | | |
25 | 24 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | 1 | | |
3 | 2 | | |
4 | 3 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
4 | | - | |
| 3 | + | |
5 | 4 | | |
6 | 5 | | |
7 | 6 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
11 | | - | |
12 | 11 | | |
13 | 12 | | |
14 | 13 | | |
| |||
Loading
0 commit comments