Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • LidarView/lidarview-core
  • nick.laurenson/lidarview-core
  • aerezarang/lidarview-core
3 results
Show changes
Commits on Source (3)
Showing
with 28 additions and 34 deletions
......@@ -59,6 +59,14 @@ void lqLidarCameraReaction::onTriggered()
case pqCameraReaction::Mode::APPLY_ISOMETRIC_VIEW:
this->applyIsometricView();
break;
case pqCameraReaction::Mode::ZOOM_CLOSEST_TO_DATA:
this->zoomToData(true);
break;
case pqCameraReaction::Mode::RESET_CAMERA_CLOSEST:
this->resetCamera(true);
break;
}
}
......
......@@ -419,7 +419,7 @@ pqPipelineSource* lqSensorListWidget::getActiveLidarSource()
//-----------------------------------------------------------------------------
pqPipelineSource* lqSensorListWidget::getLidarSource(int index)
{
if (index < 0 || index >= this->sensorWidgets.size())
if (index < 0 || index >= static_cast<int>(this->sensorWidgets.size()))
{
return nullptr;
}
......
......@@ -691,10 +691,7 @@ void lqSensorWidget::onUpdateTransform()
vtkSMProxy* TransformProxy = SearchProxyByName(lidarProxy, TransformproxyName);
// update proxy properties
vtkSMProperty* prop = GetPropertyFromProxy(TransformProxy, propertyNameTranslation);
UpdateProxyProperty(TransformProxy, propertyNameTranslation, TranslationValues);
prop = GetPropertyFromProxy(TransformProxy, propertyNameRotation);
UpdateProxyProperty(TransformProxy, propertyNameRotation, RotationValues);
lidarProxy->UpdateSelfAndAllInputs();
......
......@@ -111,7 +111,7 @@ ctkRangeSliderPrivate::ctkRangeSliderPrivate(ctkRangeSlider& object)
this->m_SubclassClickOffset = 0;
this->m_SubclassPosition = 0;
this->m_SubclassWidth = 0.0;
this->m_SelectedHandles = 0;
this->m_SelectedHandles = QFlags<ctkRangeSliderPrivate::Handle>();
this->m_SymmetricMoves = false;
}
......@@ -769,7 +769,7 @@ void ctkRangeSlider::mouseReleaseEvent(QMouseEvent* mouseEvent)
this->QSlider::mouseReleaseEvent(mouseEvent);
setSliderDown(false);
d->m_SelectedHandles = 0;
d->m_SelectedHandles = QFlags<ctkRangeSliderPrivate::Handle>();
this->update();
}
......
......@@ -10,6 +10,7 @@
#include <QRect>
#include <QString>
#include <QObject>
#include <QGuiApplication>
#include <vtkSMSessionProxyManager.h>
#include <vtkSMBooleanDomain.h>
......@@ -365,7 +366,7 @@ bool GetInterpreterTransform(vtkSMProxy * proxy, std::vector<double>& translate,
void DisplayDialogOnActiveWindow(QDialog & dialog)
{
// If there is multiple screen, we need to ensure that the dialog pop up on the active screen
if (QApplication::desktop()->numScreens() > 1)
if (QGuiApplication::screens().size() > 1)
{
QRect oldGeometry = dialog.geometry();
if (QApplication::activeWindow() != nullptr)
......
......@@ -524,6 +524,10 @@ void lqLidarCoreManager::onResetDefaultSettings()
// Quit the current application instance and restart a new one.
qApp->quit();
QProcess::startDetached(qApp->arguments()[0]);
QStringList appArguments = qApp->arguments();
QString appName = appArguments.at(0);
appArguments.pop_front();
QProcess::startDetached(appName, appArguments);
}
}
......@@ -108,7 +108,7 @@ public Q_SLOTS:
void onResetCenterToLidarCenter();
private:
Q_DISABLE_COPY(lqLidarCoreManager);
Q_DISABLE_COPY(lqLidarCoreManager)
static QPointer<lqLidarCoreManager> Instance;
class pqInternal;
......
......@@ -242,7 +242,7 @@ void lqPlayerControlsToolbar::setFrameRanges(int min, int max)
this->UI->frameQSpinBox->setMaximum(max);
}
//-----------------------------------------------------------------------------
void lqPlayerControlsToolbar::onPlaying(bool playing, bool reversed)
void lqPlayerControlsToolbar::onPlaying(bool playing, bool)
{
// PV code, set custom Play/Pause icons
if (playing)
......
......@@ -9,7 +9,7 @@
class LQAPPLICATIONCOMPONENTS_EXPORT lqViewFrameActions : public pqStandardViewFrameActionsImplementation
{
Q_OBJECT
Q_INTERFACES(pqViewFrameActionsInterface);
Q_INTERFACES(pqViewFrameActionsInterface)
public:
lqViewFrameActions(QObject* parent = nullptr);
......
......@@ -26,7 +26,7 @@ class vtkLidarKITTIDataSetWriter : public vtkPolyDataAlgorithm
{
public:
static vtkLidarKITTIDataSetWriter* New();
vtkTypeMacro(vtkLidarKITTIDataSetWriter, vtkPolyDataAlgorithm);
vtkTypeMacro(vtkLidarKITTIDataSetWriter, vtkPolyDataAlgorithm)
// void PrintSelf(ostream& os, vtkIndent indent) override;
vtkGetMacro(FolderName, const std::string&)
......
......@@ -38,7 +38,7 @@
class LIDARCORE_EXPORT vtkCameraMapper : public vtkPolyDataAlgorithm
{
public:
EIGEN_MAKE_ALIGNED_OPERATOR_NEW;
EIGEN_MAKE_ALIGNED_OPERATOR_NEW
static vtkCameraMapper *New();
vtkTypeMacro(vtkCameraMapper, vtkPolyDataAlgorithm)
......
......@@ -41,7 +41,7 @@
class LIDARCORE_EXPORT vtkPlaneProjector : public vtkPolyDataAlgorithm
{
public:
EIGEN_MAKE_ALIGNED_OPERATOR_NEW;
EIGEN_MAKE_ALIGNED_OPERATOR_NEW
static vtkPlaneProjector *New();
vtkTypeMacro(vtkPlaneProjector, vtkPolyDataAlgorithm)
......
......@@ -34,7 +34,7 @@ class LIDARCORE_EXPORT vtkArduPilotDataFlashLogReader : public vtkPolyDataAlgori
{
public:
static vtkArduPilotDataFlashLogReader *New();
vtkTypeMacro(vtkArduPilotDataFlashLogReader, vtkPolyDataAlgorithm);
vtkTypeMacro(vtkArduPilotDataFlashLogReader, vtkPolyDataAlgorithm)
vtkGetStringMacro(FileName)
vtkSetStringMacro(FileName)
......
......@@ -38,22 +38,6 @@ int SignedUTMToEPSG(int signedUTM)
}
}
int EPSGToSignedUTM(int EPSG)
{
if (EPSG >= 32601 && EPSG <= 32660)
{
return EPSG - 32600;
}
else if (EPSG >= 32701 && EPSG <= 32760)
{
return -(EPSG - 32700);
}
else
{
return 0; // not an UTM zone
}
}
//-----------------------------------------------------------------------------
PJ* ProjFromEPSG(int epsg)
{
......
......@@ -29,7 +29,7 @@ class LIDARCORE_EXPORT vtkLidarReader : public vtkPolyDataAlgorithm
{
public:
static vtkLidarReader* New();
vtkTypeMacro(vtkLidarReader, vtkPolyDataAlgorithm);
vtkTypeMacro(vtkLidarReader, vtkPolyDataAlgorithm)
int GetNumberOfFrames() { return this->FrameCatalog.size(); }
......
......@@ -43,7 +43,7 @@ class vtkCustomPiecewiseFunction : public vtkDataObject
{
public:
static vtkCustomPiecewiseFunction *New();
vtkTypeMacro(vtkCustomPiecewiseFunction,vtkDataObject);
vtkTypeMacro(vtkCustomPiecewiseFunction,vtkDataObject)
void PrintSelf(ostream& os, vtkIndent indent) override;
void DeepCopy( vtkDataObject *f ) override;
......
......@@ -51,7 +51,7 @@ class vtkCustomPiecewiseFunction;
class vtkCustomTupleInterpolator : public vtkObject
{
public:
vtkTypeMacro(vtkCustomTupleInterpolator, vtkObject);
vtkTypeMacro(vtkCustomTupleInterpolator, vtkObject)
void PrintSelf(ostream& os, vtkIndent indent) override;
// Description:
......