Fix Qt6 deprecated APIs: QCheckBox::checkStateChanged, ExploratoryLocationViewshed
- Replace QCheckBox::stateChanged with checkStateChanged in: - lts_dialog.cpp - simple_esri_layer.cpp (2 occurrences) - layer_control_widget.cpp - symbol_dialog.cpp - Replace LocationViewshed with ExploratoryLocationViewshed (ArcGIS SDK v300): - viewshed_analysis.h/.cpp - ViewshedLocation.h/.cpp - function_dialog.cpp (include) - Update ViewshedLocation member variable type to ExploratoryLocationViewshed Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
1 parent
e581d1e91c
commit
124fbb4de8
1079 files changed
+111705
-17
No files matched your search
+2
-2
@@ -26,7 +26,7 @@
|
||||
#include "ArcGISTiledElevationSource.h"
|
||||
#include "Scene.h"
|
||||
#include "SceneGraphicsView.h"
|
||||
#include "LocationViewshed.h"
|
||||
#include "ExploratoryLocationViewshed.h"
|
||||
#include "Camera.h"
|
||||
#include "Point.h"
|
||||
#include "AnalysisOverlay.h"
|
||||
@@ -139,7 +139,7 @@ void ViewshedLocation::createViewshed(double x, double y)
|
||||
for (int i = 0; i < 3; ++i)
|
||||
{
|
||||
double heading = i * 120.0;
|
||||
m_locationViewshed[i] = new LocationViewshed(pt
|
||||
m_locationViewshed[i] = new ExploratoryLocationViewshed(pt
|
||||
, heading
|
||||
, 90.0 // pitch
|
||||
, 120.0 // horizontalAngle
|
||||
|
||||
+2
-2
@@ -33,7 +33,7 @@ namespace Esri
|
||||
namespace ArcGISRuntime
|
||||
{
|
||||
class SceneGraphicsView;
|
||||
class LocationViewshed;
|
||||
class ExploratoryLocationViewshed;
|
||||
class AnalysisOverlay;
|
||||
}
|
||||
}
|
||||
@@ -82,7 +82,7 @@ private:
|
||||
void createViewshed(double x, double y);
|
||||
|
||||
Esri::ArcGISRuntime::SceneGraphicsView *m_sceneView = nullptr;
|
||||
Esri::ArcGISRuntime::LocationViewshed *m_locationViewshed[3] = { nullptr, nullptr, nullptr };
|
||||
Esri::ArcGISRuntime::ExploratoryLocationViewshed *m_locationViewshed[3] = { nullptr, nullptr, nullptr };
|
||||
Esri::ArcGISRuntime::AnalysisOverlay *m_analysisOverlay = nullptr;
|
||||
|
||||
bool m_viewshedVisible = true;
|
||||
|
||||
+1
-1
@@ -103,7 +103,7 @@
|
||||
#include <Raster.h>
|
||||
#include <RasterLayer.h>
|
||||
#include <AnalysisOverlay.h>
|
||||
#include <LocationViewshed.h>
|
||||
#include <ExploratoryLocationViewshed.h>
|
||||
|
||||
// 3D
|
||||
#include <SimpleMarkerSceneSymbol.h>
|
||||
|
||||
+2
-2
@@ -176,7 +176,7 @@ bool SimpleEsriLayer::updatePanel()
|
||||
QCheckBox *cbOnOff = new QCheckBox(layername);
|
||||
cbOnOff->setChecked(gOverlay->isVisible());
|
||||
|
||||
connect(cbOnOff, &QCheckBox::stateChanged, this, &SimpleEsriLayer::layerOnOff);
|
||||
connect(cbOnOff, &QCheckBox::checkStateChanged, this, &SimpleEsriLayer::layerOnOff);
|
||||
d->m_layout->addWidget(cbOnOff, row, col++);
|
||||
|
||||
SimpleEsriLayerSlider *sl_opac = new SimpleEsriLayerSlider(layername, 0, 100);
|
||||
@@ -223,7 +223,7 @@ bool SimpleEsriLayer::updatePanel()
|
||||
// if (!tooltip.isEmpty())
|
||||
// cbOnOff->setToolTip(tooltip);
|
||||
|
||||
connect(cbOnOff, &QCheckBox::stateChanged, this, &SimpleEsriLayer::layerOnOff);
|
||||
connect(cbOnOff, &QCheckBox::checkStateChanged, this, &SimpleEsriLayer::layerOnOff);
|
||||
d->m_layout->addWidget(cbOnOff, row, col++);
|
||||
|
||||
SimpleEsriLayerSlider *sl_opac = new SimpleEsriLayerSlider(layername, 0, 100);
|
||||
|
||||
+1
-1
@@ -374,7 +374,7 @@ bool LayerControlWidget::updatePanelLayer()
|
||||
if (!tooltip.isEmpty())
|
||||
cbOnOff->setToolTip(tooltip);
|
||||
|
||||
connect(cbOnOff, &QCheckBox::stateChanged, this, &LayerControlWidget::layerOnOff);
|
||||
connect(cbOnOff, &QCheckBox::checkStateChanged, this, &LayerControlWidget::layerOnOff);
|
||||
d->m_mapLayerLayout->addWidget(cbOnOff, row, col++);
|
||||
|
||||
|
||||
|
||||
+3
-3
@@ -16,7 +16,7 @@
|
||||
|
||||
#include <AnalysisOverlay.h>
|
||||
#include <AnalysisListModel.h>
|
||||
#include <LocationViewshed.h>
|
||||
#include <ExploratoryLocationViewshed.h>
|
||||
|
||||
// Qt
|
||||
#include <QDebug>
|
||||
@@ -72,7 +72,7 @@ bool ViewshedAnalysis::execute(const QPointF &viewshedPoint_map_degree, double o
|
||||
|
||||
for (int i = 0; i < m_viewsheds.size(); ++i)
|
||||
{
|
||||
Esri::ArcGISRuntime::LocationViewshed *viewshed = m_viewsheds[i];
|
||||
Esri::ArcGISRuntime::ExploratoryLocationViewshed *viewshed = m_viewsheds[i];
|
||||
|
||||
if (viewshed)
|
||||
{
|
||||
@@ -80,7 +80,7 @@ bool ViewshedAnalysis::execute(const QPointF &viewshedPoint_map_degree, double o
|
||||
delete viewshed;
|
||||
}
|
||||
|
||||
viewshed = new Esri::ArcGISRuntime::LocationViewshed(viewshedCenter
|
||||
viewshed = new Esri::ArcGISRuntime::ExploratoryLocationViewshed(viewshedCenter
|
||||
, heading
|
||||
, 90.0 // pitch limited to 180
|
||||
, deltaHeading // horizontalAngle limited to 120, from release 100.3 maximum is 360 here
|
||||
|
||||
@@ -21,7 +21,7 @@ namespace ArcGISRuntime
|
||||
{
|
||||
class AnalysisOverlay;
|
||||
class AnalysisOverlayListModel;
|
||||
class LocationViewshed;
|
||||
class ExploratoryLocationViewshed;
|
||||
class SceneGraphicsView;
|
||||
}
|
||||
}
|
||||
@@ -51,11 +51,11 @@ protected slots:
|
||||
|
||||
private:
|
||||
|
||||
Esri::ArcGISRuntime::AnalysisOverlayListModel *m_analysisOverlayModel;
|
||||
Esri::ArcGISRuntime::AnalysisOverlay *m_analysisOverlay;
|
||||
QVector<Esri::ArcGISRuntime::LocationViewshed *> m_viewsheds;
|
||||
Esri::ArcGISRuntime::AnalysisOverlayListModel *m_analysisOverlayModel;
|
||||
Esri::ArcGISRuntime::AnalysisOverlay *m_analysisOverlay;
|
||||
QVector<Esri::ArcGISRuntime::ExploratoryLocationViewshed *> m_viewsheds;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -167,7 +167,7 @@ namespace SymbologyXML
|
||||
emit changed();
|
||||
} );
|
||||
|
||||
connect( m_internal->m_cbDir, &QCheckBox::stateChanged, this, [this](int)
|
||||
connect( m_internal->m_cbDir, &QCheckBox::checkStateChanged, this, [this](int)
|
||||
{
|
||||
m_internal->m_leDir->setEnabled( m_internal->m_cbDir->isChecked() );
|
||||
emit changed();
|
||||
|
||||
Reference in new issue
Block a user