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.

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

geometry editing #348

Merged
merged 94 commits into from Sep 28, 2018

Conversation

Projects
None yet
5 participants
@3nids
Member

3nids commented Aug 29, 2018

rebased version of #331

Does not work on multi geometry layer (geometry will be left unchanged)

Coming later:

  • adding points
  • disable tool for multi layer
  • better colors for toolbar
  • icons for attributes vs geom editing

TODO:

  • test with layer CRS != map CRS

https://youtu.be/v4xseL2elfE

Test APK

Last test apks for armv7 and x86

@3nids 3nids referenced this pull request Aug 29, 2018

Closed

Geometry editing + testing #331

3 of 5 tasks complete
@3nids

This comment has been minimized.

Member

3nids commented Aug 31, 2018

image

ping @m-kuhn

@3nids

This comment has been minimized.

Member

3nids commented Aug 31, 2018

and for the tests
image

I have no issue when compiling locally

@3nids 3nids closed this Sep 3, 2018

@3nids 3nids reopened this Sep 3, 2018

MapSettings *mapSettings = new MapSettings();
mapSettings->setDestinationCrs( QgsCoordinateReferenceSystem::fromEpsgId( 21781 ) );
mModel->setMapSettings( mapSettings );
QCOMPARE( mModel->mapSettings()->destinationCrs().authid(), "EPSG:21781" );

This comment has been minimized.

@m-kuhn

m-kuhn Sep 3, 2018

Member

QStringLiteral( ) and the error should be gone

This comment has been minimized.

@3nids

3nids Sep 3, 2018

Member

fixed

@@ -39,15 +39,15 @@
<meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>

This comment has been minimized.

@m-kuhn

m-kuhn Sep 3, 2018

Member

Changes in this file should be reverted

This comment has been minimized.

@3nids

3nids Sep 3, 2018

Member

fixed

Show resolved Hide resolved scripts/astyle.sh
: QObject( parent )
{
connect( this, &FeatureListExtentController::autoZoomChanged, this, &FeatureListExtentController::zoomToSelected );
connect( this, &FeatureListExtentController::autoZoomChanged, this, [ = ]() {this->zoomToSelected();} );

This comment has been minimized.

@m-kuhn

m-kuhn Sep 3, 2018

Member

No need for the this-> part

Q_ENUM( EditingMode )
struct Centroid

This comment has been minimized.

@m-kuhn

m-kuhn Sep 3, 2018

Member

Can this be put into the private section?

//! \copydoc mapSettings
MapSettings *mapSettings();
Q_INVOKABLE void setGeometry( const QgsGeometry &geometry, const QgsCoordinateReferenceSystem &crs );

This comment has been minimized.

@m-kuhn

m-kuhn Sep 3, 2018

Member

Should the CRS be a property? It somehow feels weird to have the geometry setter different to the getter.

This comment has been minimized.

@3nids

3nids Sep 3, 2018

Member

I don't mind adding CRS as a property (getter).
But I like the setter like this. Otherwise, this means reconstructing geometry on CRS chance? Or do you expect it to be strictly done in a precise order (set CRS, then set geom)?
How do you see it?

This comment has been minimized.

@m-kuhn

m-kuhn Sep 3, 2018

Member

what I did for something similar recently was this
https://github.com/opengisch/QField/pull/349/files#diff-42599fbe3ce295020d476f85594b8868R125

it basically would not reconstruct the geometry immediately, but only in the next event loop run. If multiple properties are set at once, that will only trigger one expensive recalculation.

But I'd be happy with a simple getter as you propose too.

@qfield-fairy

This comment has been minimized.

Collaborator

qfield-fairy commented Sep 3, 2018

Uploaded test apks for armv7 and x86

@m-kuhn

This comment has been minimized.

Member

m-kuhn commented Sep 3, 2018

  •  09-03 11:59:22.226 10576 10595 I Qt JAVA : Can't find '/data/app/ch.opengis.qfield-eAA8hV9872TwFGJ4Fz6BLQ==/lib/arm/libqgis_gui.so
     09-03 11:59:22.226 10576 10595 I Qt JAVA : Can't find '/system/lib/libqgis_gui.so
    
  • It doesn't ask for multimedia permissions yet

@qfield-fairy

This comment has been minimized.

Collaborator

qfield-fairy commented Sep 3, 2018

Uploaded test apks for armv7 and x86

@giedrioks26

This comment has been minimized.

giedrioks26 commented Sep 3, 2018

Test apk crashes when opening qfield

@qfield-fairy

This comment has been minimized.

Collaborator

qfield-fairy commented Sep 4, 2018

Uploaded test apks for armv7 and x86

@m-kuhn

This comment has been minimized.

Member

m-kuhn commented Sep 4, 2018

packaging works 🎉
but I don't manage to edit the geometries.
as soon as I click on the "edit geometry" button, the feature form disappears, but then nothing happens.

@3nids

This comment has been minimized.

Member

3nids commented Sep 4, 2018

so do I....I'll check what's going on

@3nids

This comment has been minimized.

Member

3nids commented Sep 4, 2018

works on the computer, but not on the phone

@giedrioks26

This comment has been minimized.

giedrioks26 commented Sep 4, 2018

packaging works tada
but I don't manage to edit the geometries.
as soon as I click on the "edit geometry" button, the feature form disappears, but then nothing happens.

same for me

@Naturtecnica

This comment has been minimized.

Naturtecnica commented Sep 14, 2018

Hi guys, any news about this new skill? When will the new release be on Google Play?
I look forward to testing it.
Thanx, your work's great

@m-kuhn

This comment has been minimized.

Member

m-kuhn commented Sep 17, 2018

Soon, just had to do some other cleanups.

@3nids 3nids closed this Sep 18, 2018

@3nids 3nids reopened this Sep 18, 2018

@qfield-fairy

This comment has been minimized.

Collaborator

qfield-fairy commented Sep 18, 2018

Uploaded test apks for armv7 and x86

@qfield-fairy

This comment has been minimized.

Collaborator

qfield-fairy commented Sep 19, 2018

Uploaded test apks for armv7 and x86

@opengisch opengisch deleted a comment from qfield-fairy Sep 19, 2018

@qfield-fairy

This comment has been minimized.

Collaborator

qfield-fairy commented Sep 28, 2018

Uploaded test apks for armv7 and x86

@3nids 3nids merged commit c6c9012 into master Sep 28, 2018

1 check was pending

continuous-integration/travis-ci/pr The Travis CI build is in progress
Details

@3nids 3nids deleted the digit_4 branch Sep 28, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment