-
-
Notifications
You must be signed in to change notification settings - Fork 3k
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
Merge remote and local QgsEptPointCloudIndex classes #59279
base: master
Are you sure you want to change the base?
Conversation
🪟 Windows buildsDownload Windows builds of this PR for testing. 🪟 Windows Qt6 buildsDownload Windows Qt6 builds of this PR for testing. |
dcc243d
to
3cffbb2
Compare
c2101b3
to
37bbc44
Compare
37bbc44
to
aad96a7
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks great!
@@ -26,21 +26,31 @@ | |||
#include <QTime> | |||
#include <QtDebug> | |||
#include <QQueue> | |||
#include <qnetworkrequest.h> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
just for consistency...
#include <qnetworkrequest.h> | |
#include <QNetworkRequest> |
|
||
const QDir directory = QFileInfo( fileName ).absoluteDir(); | ||
mDirectory = directory.absolutePath(); | ||
QNetworkRequest nr = QNetworkRequest( QUrl( mUri ) ); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like in the previous implementation we have forgotten to add marker for the network request, e.g.
QgsSetRequestInitiatorClass( nr, QStringLiteral( "QgsEptPointCloudIndex" ) );
Could you please add it? (and one more when fetching manifest.json
and one in loadManifest())
Description
This PR implements part of qgis/QGIS-Enhancement-Proposals#290: It removes
QgsRemoteEptPointCloudIndex
, putting its code intoQgsEptPointCloudIndex
, which can now be used for both remote and local data.It also slightly refactors
QgsPointCloudIndex
, changingnodeChildren()
so it uses virtual methods and we don't have to override it, and removing a duplicatenodePointCount()
method (confusingly, two variants, const and non-const, existed in different parts of the file).