mirror of
https://github.com/introlab/rtabmap.git
synced 2026-09-02 09:30:25 +08:00
Added QT_NO_KEYWORDS definition to avoid conflicts between boost and qt macros
This commit is contained in:
4
guilib/src/3rdParty/QMultiComboBox.cpp
vendored
4
guilib/src/3rdParty/QMultiComboBox.cpp
vendored
@@ -192,7 +192,7 @@ void QMultiComboBox::setItemChecked(int row, bool checked)
|
||||
if (wasChecked != checked)
|
||||
{
|
||||
item->setCheckState(checked?Qt::Checked:Qt::Unchecked);
|
||||
emit itemChanged();
|
||||
Q_EMIT itemChanged();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -213,7 +213,7 @@ void QMultiComboBox::scanItemSelect(QListWidgetItem* item)
|
||||
}
|
||||
list[i]->setSelected(false);
|
||||
}
|
||||
emit itemChanged();
|
||||
Q_EMIT itemChanged();
|
||||
}
|
||||
|
||||
void QMultiComboBox::initStyleOption(QStyleOptionComboBox *option) const
|
||||
|
||||
4
guilib/src/3rdParty/QMultiComboBox.h
vendored
4
guilib/src/3rdParty/QMultiComboBox.h
vendored
@@ -56,11 +56,11 @@ public:
|
||||
QVariant itemData(int row);
|
||||
void setItemChecked(int row, bool checked);
|
||||
|
||||
signals:
|
||||
Q_SIGNALS:
|
||||
/// item changed
|
||||
void itemChanged();
|
||||
|
||||
public slots:
|
||||
public Q_SLOTS:
|
||||
|
||||
/// react on changes of the item checkbox
|
||||
void scanItemSelect(QListWidgetItem* item);
|
||||
|
||||
@@ -2908,7 +2908,7 @@ void CloudViewer::keyPressEvent(QKeyEvent * event)
|
||||
|
||||
update();
|
||||
|
||||
emit configChanged();
|
||||
Q_EMIT configChanged();
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -2966,7 +2966,7 @@ void CloudViewer::mouseMoveEvent(QMouseEvent * event)
|
||||
}
|
||||
this->update();
|
||||
|
||||
emit configChanged();
|
||||
Q_EMIT configChanged();
|
||||
}
|
||||
|
||||
void CloudViewer::wheelEvent(QWheelEvent * event)
|
||||
@@ -2978,7 +2978,7 @@ void CloudViewer::wheelEvent(QWheelEvent * event)
|
||||
_visualizer->getCameras(cameras);
|
||||
_lastCameraPose = cv::Vec3d(cameras.front().pos);
|
||||
}
|
||||
emit configChanged();
|
||||
Q_EMIT configChanged();
|
||||
}
|
||||
|
||||
void CloudViewer::contextMenuEvent(QContextMenuEvent * event)
|
||||
@@ -2987,7 +2987,7 @@ void CloudViewer::contextMenuEvent(QContextMenuEvent * event)
|
||||
if(a)
|
||||
{
|
||||
handleAction(a);
|
||||
emit configChanged();
|
||||
Q_EMIT configChanged();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1904,7 +1904,7 @@ void GraphViewer::contextMenuEvent(QContextMenuEvent * event)
|
||||
this->setGridMapVisible(!this->isGridMapVisible());
|
||||
if(_gridMap->isVisible())
|
||||
{
|
||||
emit mapShownRequested();
|
||||
mapShownRequested();
|
||||
}
|
||||
}
|
||||
else if(r == aShowHideOrigin)
|
||||
@@ -1954,7 +1954,7 @@ void GraphViewer::contextMenuEvent(QContextMenuEvent * event)
|
||||
|
||||
if(r)
|
||||
{
|
||||
emit configChanged();
|
||||
Q_EMIT configChanged();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -608,32 +608,32 @@ void ImageView::contextMenuEvent(QContextMenuEvent * e)
|
||||
else if(action == _showFeatures)
|
||||
{
|
||||
this->setFeaturesShown(_showFeatures->isChecked());
|
||||
emit configChanged();
|
||||
Q_EMIT configChanged();
|
||||
}
|
||||
else if(action == _showImage)
|
||||
{
|
||||
this->setImageShown(_showImage->isChecked());
|
||||
emit configChanged();
|
||||
Q_EMIT configChanged();
|
||||
}
|
||||
else if(action == _showImageDepth)
|
||||
{
|
||||
this->setImageDepthShown(_showImageDepth->isChecked());
|
||||
emit configChanged();
|
||||
Q_EMIT configChanged();
|
||||
}
|
||||
else if(action == _showLines)
|
||||
{
|
||||
this->setLinesShown(_showLines->isChecked());
|
||||
emit configChanged();
|
||||
Q_EMIT configChanged();
|
||||
}
|
||||
else if(action == _graphicsViewMode)
|
||||
{
|
||||
this->setGraphicsViewMode(_graphicsViewMode->isChecked());
|
||||
emit configChanged();
|
||||
Q_EMIT configChanged();
|
||||
}
|
||||
else if(action == _graphicsViewScaled)
|
||||
{
|
||||
this->setGraphicsViewScaled(_graphicsViewScaled->isChecked());
|
||||
emit configChanged();
|
||||
Q_EMIT configChanged();
|
||||
}
|
||||
else if(action == _setAlpha)
|
||||
{
|
||||
@@ -642,7 +642,7 @@ void ImageView::contextMenuEvent(QContextMenuEvent * e)
|
||||
if(ok)
|
||||
{
|
||||
this->setAlpha(value);
|
||||
emit configChanged();
|
||||
Q_EMIT configChanged();
|
||||
}
|
||||
}
|
||||
else if(action == _setFeaturesSize)
|
||||
@@ -652,14 +652,14 @@ void ImageView::contextMenuEvent(QContextMenuEvent * e)
|
||||
if(ok)
|
||||
{
|
||||
this->setFeaturesSize(value);
|
||||
emit configChanged();
|
||||
Q_EMIT configChanged();
|
||||
}
|
||||
}
|
||||
|
||||
if(action == _showImage || action ==_showImageDepth)
|
||||
{
|
||||
this->updateOpacity();
|
||||
emit configChanged();
|
||||
Q_EMIT configChanged();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -818,7 +818,7 @@ bool MainWindow::handleEvent(UEvent* anEvent)
|
||||
if(!_processingDownloadedMap)
|
||||
{
|
||||
_processingStatistics = true;
|
||||
emit statsReceived(stats);
|
||||
Q_EMIT statsReceived(stats);
|
||||
}
|
||||
}
|
||||
else if(anEvent->getClassName().compare("RtabmapEventInit") == 0)
|
||||
@@ -826,27 +826,27 @@ bool MainWindow::handleEvent(UEvent* anEvent)
|
||||
if(!_recovering)
|
||||
{
|
||||
RtabmapEventInit * rtabmapEventInit = (RtabmapEventInit*)anEvent;
|
||||
emit rtabmapEventInitReceived((int)rtabmapEventInit->getStatus(), rtabmapEventInit->getInfo().c_str());
|
||||
Q_EMIT rtabmapEventInitReceived((int)rtabmapEventInit->getStatus(), rtabmapEventInit->getInfo().c_str());
|
||||
}
|
||||
}
|
||||
else if(anEvent->getClassName().compare("RtabmapEvent3DMap") == 0)
|
||||
{
|
||||
RtabmapEvent3DMap * rtabmapEvent3DMap = (RtabmapEvent3DMap*)anEvent;
|
||||
emit rtabmapEvent3DMapReceived(*rtabmapEvent3DMap);
|
||||
Q_EMIT rtabmapEvent3DMapReceived(*rtabmapEvent3DMap);
|
||||
}
|
||||
else if(anEvent->getClassName().compare("RtabmapGlobalPathEvent") == 0)
|
||||
{
|
||||
RtabmapGlobalPathEvent * rtabmapGlobalPathEvent = (RtabmapGlobalPathEvent*)anEvent;
|
||||
emit rtabmapGlobalPathEventReceived(*rtabmapGlobalPathEvent);
|
||||
Q_EMIT rtabmapGlobalPathEventReceived(*rtabmapGlobalPathEvent);
|
||||
}
|
||||
else if(anEvent->getClassName().compare("RtabmapLabelErrorEvent") == 0)
|
||||
{
|
||||
RtabmapLabelErrorEvent * rtabmapLabelErrorEvent = (RtabmapLabelErrorEvent*)anEvent;
|
||||
emit rtabmapLabelErrorReceived(rtabmapLabelErrorEvent->id(), QString(rtabmapLabelErrorEvent->label().c_str()));
|
||||
Q_EMIT rtabmapLabelErrorReceived(rtabmapLabelErrorEvent->id(), QString(rtabmapLabelErrorEvent->label().c_str()));
|
||||
}
|
||||
else if(anEvent->getClassName().compare("RtabmapGoalStatusEvent") == 0)
|
||||
{
|
||||
emit rtabmapGoalStatusEventReceived(anEvent->getCode());
|
||||
Q_EMIT rtabmapGoalStatusEventReceived(anEvent->getCode());
|
||||
}
|
||||
else if(anEvent->getClassName().compare("CameraEvent") == 0)
|
||||
{
|
||||
@@ -857,11 +857,11 @@ bool MainWindow::handleEvent(UEvent* anEvent)
|
||||
{
|
||||
QMetaObject::invokeMethod(this, "beep");
|
||||
}
|
||||
emit noMoreImagesReceived();
|
||||
Q_EMIT noMoreImagesReceived();
|
||||
}
|
||||
else
|
||||
{
|
||||
emit cameraInfoReceived(cameraEvent->info());
|
||||
Q_EMIT cameraInfoReceived(cameraEvent->info());
|
||||
if (_odomThread == 0 && _camera->camera()->odomProvided() && _preferencesDialog->isRGBDMode())
|
||||
{
|
||||
OdometryInfo odomInfo;
|
||||
@@ -870,7 +870,7 @@ bool MainWindow::handleEvent(UEvent* anEvent)
|
||||
{
|
||||
_processingOdometry = true; // if we receive too many odometry events!
|
||||
OdometryEvent tmp(cameraEvent->data(), cameraEvent->info().odomPose, odomInfo);
|
||||
emit odometryReceived(tmp, false);
|
||||
Q_EMIT odometryReceived(tmp, false);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -885,7 +885,7 @@ bool MainWindow::handleEvent(UEvent* anEvent)
|
||||
if(!_processingOdometry && !_processingStatistics)
|
||||
{
|
||||
_processingOdometry = true; // if we receive too many odometry events!
|
||||
emit odometryReceived(*odomEvent, false);
|
||||
Q_EMIT odometryReceived(*odomEvent, false);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -895,7 +895,7 @@ bool MainWindow::handleEvent(UEvent* anEvent)
|
||||
data.setStereoCameraModel(odomEvent->data().stereoCameraModel());
|
||||
data.setGroundTruth(odomEvent->data().groundTruth());
|
||||
OdometryEvent tmp(data, odomEvent->pose(), odomEvent->info().copyWithoutData());
|
||||
emit odometryReceived(tmp, true);
|
||||
Q_EMIT odometryReceived(tmp, true);
|
||||
}
|
||||
}
|
||||
else if(anEvent->getClassName().compare("ULogEvent") == 0)
|
||||
@@ -935,7 +935,7 @@ void MainWindow::processCameraInfo(const rtabmap::CameraInfo & info)
|
||||
_ui->statsToolBox->updateStat("Camera/Time exposure compensation/ms", _preferencesDialog->isTimeUsedInFigures()?info.stamp-_firstStamp:(float)info.id, info.timeStereoExposureCompensation*1000.0f, _preferencesDialog->isCacheSavedInFigures());
|
||||
_ui->statsToolBox->updateStat("Camera/Time scan from depth/ms", _preferencesDialog->isTimeUsedInFigures()?info.stamp-_firstStamp:(float)info.id, info.timeScanFromDepth*1000.0f, _preferencesDialog->isCacheSavedInFigures());
|
||||
|
||||
emit(cameraInfoProcessed());
|
||||
Q_EMIT(cameraInfoProcessed());
|
||||
}
|
||||
|
||||
void MainWindow::processOdometry(const rtabmap::OdometryEvent & odom, bool dataIgnored)
|
||||
@@ -1521,7 +1521,7 @@ void MainWindow::processOdometry(const rtabmap::OdometryEvent & odom, bool dataI
|
||||
_ui->statsToolBox->updateStat("GUI/Refresh odom/ms", _preferencesDialog->isTimeUsedInFigures()?odom.data().stamp()-_firstStamp:(float)odom.data().id(), time.elapsed()*1000.0, _preferencesDialog->isCacheSavedInFigures());
|
||||
_processingOdometry = false;
|
||||
|
||||
emit(odometryProcessed());
|
||||
Q_EMIT(odometryProcessed());
|
||||
}
|
||||
|
||||
void MainWindow::processStats(const rtabmap::Statistics & stat)
|
||||
@@ -1829,7 +1829,7 @@ void MainWindow::processStats(const rtabmap::Statistics & stat)
|
||||
//Adjust thresholds
|
||||
float value;
|
||||
value = float(_preferencesDialog->getLoopThr());
|
||||
emit(loopClosureThrChanged(value));
|
||||
Q_EMIT(loopClosureThrChanged(value));
|
||||
}
|
||||
if(!stat.likelihood().empty() && _ui->dockWidget_likelihood->isVisible())
|
||||
{
|
||||
@@ -2017,7 +2017,7 @@ void MainWindow::processStats(const rtabmap::Statistics & stat)
|
||||
|
||||
_processingStatistics = false;
|
||||
|
||||
emit(statsProcessed());
|
||||
Q_EMIT(statsProcessed());
|
||||
}
|
||||
|
||||
void MainWindow::updateMapCloud(
|
||||
@@ -3811,7 +3811,7 @@ void MainWindow::processRtabmapEvent3DMap(const rtabmap::RtabmapEvent3DMap & eve
|
||||
_progressDialog->setCancelButtonVisible(false);
|
||||
_progressCanceled = false;
|
||||
|
||||
emit(rtabmapEvent3DMapProcessed());
|
||||
Q_EMIT(rtabmapEvent3DMapProcessed());
|
||||
}
|
||||
|
||||
void MainWindow::processRtabmapGlobalPathEvent(const rtabmap::RtabmapGlobalPathEvent & event)
|
||||
@@ -4008,7 +4008,7 @@ void MainWindow::applyPrefSettings(const rtabmap::ParametersMap & parameters, bo
|
||||
|
||||
float value;
|
||||
value = float(_preferencesDialog->getLoopThr());
|
||||
emit(loopClosureThrChanged(value));
|
||||
Q_EMIT(loopClosureThrChanged(value));
|
||||
}
|
||||
|
||||
void MainWindow::drawKeypoints(const std::multimap<int, cv::KeyPoint> & refWords, const std::multimap<int, cv::KeyPoint> & loopWords)
|
||||
@@ -4249,22 +4249,22 @@ void MainWindow::updateSelectSourceMenu()
|
||||
|
||||
void MainWindow::changeImgRateSetting()
|
||||
{
|
||||
emit imgRateChanged(_ui->doubleSpinBox_stats_imgRate->value());
|
||||
Q_EMIT imgRateChanged(_ui->doubleSpinBox_stats_imgRate->value());
|
||||
}
|
||||
|
||||
void MainWindow::changeDetectionRateSetting()
|
||||
{
|
||||
emit detectionRateChanged(_ui->doubleSpinBox_stats_detectionRate->value());
|
||||
Q_EMIT detectionRateChanged(_ui->doubleSpinBox_stats_detectionRate->value());
|
||||
}
|
||||
|
||||
void MainWindow::changeTimeLimitSetting()
|
||||
{
|
||||
emit timeLimitChanged((float)_ui->doubleSpinBox_stats_timeLimit->value());
|
||||
Q_EMIT timeLimitChanged((float)_ui->doubleSpinBox_stats_timeLimit->value());
|
||||
}
|
||||
|
||||
void MainWindow::changeMappingMode()
|
||||
{
|
||||
emit mappingModeChanged(_ui->actionSLAM_mode->isChecked());
|
||||
Q_EMIT mappingModeChanged(_ui->actionSLAM_mode->isChecked());
|
||||
}
|
||||
|
||||
QString MainWindow::captureScreen(bool cacheInRAM, bool png)
|
||||
@@ -4715,7 +4715,7 @@ void MainWindow::startDetection()
|
||||
}
|
||||
|
||||
UDEBUG("");
|
||||
emit stateChanged(kStartingDetection);
|
||||
Q_EMIT stateChanged(kStartingDetection);
|
||||
|
||||
if(_camera != 0)
|
||||
{
|
||||
@@ -4723,7 +4723,7 @@ void MainWindow::startDetection()
|
||||
tr("RTAB-Map"),
|
||||
tr("A camera is running, stop it first."));
|
||||
UWARN("_camera is not null... it must be stopped first");
|
||||
emit stateChanged(kInitialized);
|
||||
Q_EMIT stateChanged(kInitialized);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -4734,7 +4734,7 @@ void MainWindow::startDetection()
|
||||
tr("RTAB-Map"),
|
||||
tr("No sources are selected. See Preferences->Source panel."));
|
||||
UWARN("No sources are selected. See Preferences->Source panel.");
|
||||
emit stateChanged(kInitialized);
|
||||
Q_EMIT stateChanged(kInitialized);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -4742,7 +4742,7 @@ void MainWindow::startDetection()
|
||||
Camera * camera = _preferencesDialog->createCamera();
|
||||
if(!camera)
|
||||
{
|
||||
emit stateChanged(kInitialized);
|
||||
Q_EMIT stateChanged(kInitialized);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -4777,7 +4777,7 @@ void MainWindow::startDetection()
|
||||
if(!camera->isCalibrated())
|
||||
{
|
||||
UWARN("Camera is not calibrated!");
|
||||
emit stateChanged(kInitialized);
|
||||
Q_EMIT stateChanged(kInitialized);
|
||||
delete _camera;
|
||||
_camera = 0;
|
||||
|
||||
@@ -4901,7 +4901,7 @@ void MainWindow::startDetection()
|
||||
_cloudViewer->removeCloud("featuresOdom");
|
||||
_cloudViewer->setBackgroundColor(_cloudViewer->getDefaultBackgroundColor());
|
||||
|
||||
emit stateChanged(kDetecting);
|
||||
Q_EMIT stateChanged(kDetecting);
|
||||
}
|
||||
|
||||
// Could not be in the main thread here! (see handleEvents())
|
||||
@@ -4912,30 +4912,30 @@ void MainWindow::pauseDetection()
|
||||
if(_state == kPaused && (QApplication::keyboardModifiers() & Qt::ShiftModifier))
|
||||
{
|
||||
// On Ctrl-click, start the camera and pause it automatically
|
||||
emit stateChanged(kPaused);
|
||||
Q_EMIT stateChanged(kPaused);
|
||||
if(_preferencesDialog->getGeneralInputRate())
|
||||
{
|
||||
QTimer::singleShot(500.0/_preferencesDialog->getGeneralInputRate(), this, SLOT(pauseDetection()));
|
||||
}
|
||||
else
|
||||
{
|
||||
emit stateChanged(kPaused);
|
||||
Q_EMIT stateChanged(kPaused);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
emit stateChanged(kPaused);
|
||||
Q_EMIT stateChanged(kPaused);
|
||||
}
|
||||
}
|
||||
else if(_state == kMonitoring)
|
||||
{
|
||||
UINFO("Sending pause event!");
|
||||
emit stateChanged(kMonitoringPaused);
|
||||
Q_EMIT stateChanged(kMonitoringPaused);
|
||||
}
|
||||
else if(_state == kMonitoringPaused)
|
||||
{
|
||||
UINFO("Sending unpause event!");
|
||||
emit stateChanged(kMonitoring);
|
||||
Q_EMIT stateChanged(kMonitoring);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4998,7 +4998,7 @@ void MainWindow::stopDetection()
|
||||
_dataRecorder = 0;
|
||||
}
|
||||
|
||||
emit stateChanged(kInitialized);
|
||||
Q_EMIT stateChanged(kInitialized);
|
||||
}
|
||||
|
||||
void MainWindow::notifyNoMoreImages()
|
||||
|
||||
@@ -127,7 +127,7 @@ void MapVisibilityWidget::signalVisibility()
|
||||
{
|
||||
QCheckBox * check = qobject_cast<QCheckBox*>(sender());
|
||||
_mask.at(check->text().split('(').first().toInt()) = check->isChecked();
|
||||
emit visibilityChanged(check->text().split('(').first().toInt(), check->isChecked());
|
||||
Q_EMIT visibilityChanged(check->text().split('(').first().toInt(), check->isChecked());
|
||||
}
|
||||
|
||||
void MapVisibilityWidget::selectAll(bool checked)
|
||||
|
||||
@@ -169,7 +169,7 @@ void PdfPlotCurve::setData(const QMap<int, float> & dataMap, const QMap<int, int
|
||||
|
||||
//reset minMax, this will force the plot to update the axes
|
||||
this->updateMinMax();
|
||||
emit dataChanged(this);
|
||||
Q_EMIT dataChanged(this);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -2199,12 +2199,12 @@ void PreferencesDialog::writeSettings(const QString & filePath)
|
||||
|
||||
if(_modifiedParameters.size())
|
||||
{
|
||||
emit settingsChanged(_modifiedParameters);
|
||||
Q_EMIT settingsChanged(_modifiedParameters);
|
||||
}
|
||||
|
||||
if(_obsoletePanels)
|
||||
{
|
||||
emit settingsChanged(_obsoletePanels);
|
||||
Q_EMIT settingsChanged(_obsoletePanels);
|
||||
}
|
||||
|
||||
for(ParametersMap::iterator iter = _modifiedParameters.begin(); iter!=_modifiedParameters.end(); ++iter)
|
||||
|
||||
@@ -183,7 +183,7 @@ void ProgressDialog::closeEvent(QCloseEvent *event)
|
||||
void ProgressDialog::cancel()
|
||||
{
|
||||
_canceled = true;
|
||||
emit canceled();
|
||||
Q_EMIT canceled();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -91,7 +91,7 @@ void StatItem::addValue(float y)
|
||||
_y.push_back(y);
|
||||
}
|
||||
_value->setText(QString::number(y, 'g', 3));
|
||||
emit valueAdded(y);
|
||||
Q_EMIT valueAdded(y);
|
||||
}
|
||||
|
||||
void StatItem::addValue(float x, float y)
|
||||
@@ -108,7 +108,7 @@ void StatItem::addValue(float x, float y)
|
||||
}
|
||||
|
||||
_value->setText(QString::number(y, 'g', 3));
|
||||
emit valueAdded(x,y);
|
||||
Q_EMIT valueAdded(x,y);
|
||||
}
|
||||
|
||||
void StatItem::setValues(const std::vector<float> & x, const std::vector<float> & y)
|
||||
@@ -126,7 +126,7 @@ void StatItem::setValues(const std::vector<float> & x, const std::vector<float>
|
||||
{
|
||||
_value->setText("*");
|
||||
}
|
||||
emit valuesChanged(x,y);
|
||||
Q_EMIT valuesChanged(x,y);
|
||||
}
|
||||
|
||||
QString StatItem::value() const
|
||||
@@ -202,7 +202,7 @@ void StatItem::preparePlotRequest()
|
||||
QAction * action = qobject_cast<QAction*>(sender());
|
||||
if(action)
|
||||
{
|
||||
emit plotRequested(this, action->text());
|
||||
Q_EMIT plotRequested(this, action->text());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -415,7 +415,7 @@ void StatsToolBox::plot(const StatItem * stat, const QString & plotName)
|
||||
{
|
||||
ULOGGER_WARN("Already added to the figure");
|
||||
}
|
||||
emit figuresSetupChanged();
|
||||
Q_EMIT figuresSetupChanged();
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -479,9 +479,9 @@ void StatsToolBox::plot(const StatItem * stat, const QString & plotName)
|
||||
delete curve;
|
||||
}
|
||||
figure->show();
|
||||
emit figuresSetupChanged();
|
||||
Q_EMIT figuresSetupChanged();
|
||||
|
||||
emit menuChanged(_plotMenu);
|
||||
Q_EMIT menuChanged(_plotMenu);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -500,11 +500,11 @@ void StatsToolBox::figureDeleted(QObject * obj)
|
||||
{
|
||||
_plotMenu->removeAction(actions.at(i));
|
||||
delete actions[i];
|
||||
emit menuChanged(_plotMenu);
|
||||
Q_EMIT menuChanged(_plotMenu);
|
||||
break;
|
||||
}
|
||||
}
|
||||
emit figuresSetupChanged();
|
||||
Q_EMIT figuresSetupChanged();
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -423,7 +423,7 @@ void UPlotCurve::addValue(UPlotItem * data)
|
||||
if(data)
|
||||
{
|
||||
this->_addValue(data);
|
||||
emit dataChanged(this);
|
||||
Q_EMIT dataChanged(this);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -478,7 +478,7 @@ void UPlotCurve::addValues(QVector<UPlotItem *> & data)
|
||||
{
|
||||
this->_addValue(data.at(i));
|
||||
}
|
||||
emit dataChanged(this);
|
||||
Q_EMIT dataChanged(this);
|
||||
}
|
||||
|
||||
void UPlotCurve::addValues(const QVector<float> & xs, const QVector<float> & ys)
|
||||
@@ -488,7 +488,7 @@ void UPlotCurve::addValues(const QVector<float> & xs, const QVector<float> & ys)
|
||||
{
|
||||
this->_addValue(new UPlotItem(xs.at(i),ys.at(i),width));
|
||||
}
|
||||
emit dataChanged(this);
|
||||
Q_EMIT dataChanged(this);
|
||||
}
|
||||
|
||||
void UPlotCurve::addValues(const QVector<float> & ys)
|
||||
@@ -508,7 +508,7 @@ void UPlotCurve::addValues(const QVector<float> & ys)
|
||||
}
|
||||
this->_addValue(new UPlotItem(x,ys.at(i),width));
|
||||
}
|
||||
emit dataChanged(this);
|
||||
Q_EMIT dataChanged(this);
|
||||
}
|
||||
|
||||
void UPlotCurve::addValues(const QVector<int> & ys)
|
||||
@@ -528,7 +528,7 @@ void UPlotCurve::addValues(const QVector<int> & ys)
|
||||
}
|
||||
this->_addValue(new UPlotItem(x,ys.at(i),width));
|
||||
}
|
||||
emit dataChanged(this);
|
||||
Q_EMIT dataChanged(this);
|
||||
}
|
||||
|
||||
void UPlotCurve::addValues(const std::vector<int> & ys)
|
||||
@@ -548,7 +548,7 @@ void UPlotCurve::addValues(const std::vector<int> & ys)
|
||||
}
|
||||
this->_addValue(new UPlotItem(x,ys.at(i),width));
|
||||
}
|
||||
emit dataChanged(this);
|
||||
Q_EMIT dataChanged(this);
|
||||
}
|
||||
|
||||
void UPlotCurve::addValues(const std::vector<float> & ys)
|
||||
@@ -568,7 +568,7 @@ void UPlotCurve::addValues(const std::vector<float> & ys)
|
||||
}
|
||||
this->_addValue(new UPlotItem(x,ys.at(i),width));
|
||||
}
|
||||
emit dataChanged(this);
|
||||
Q_EMIT dataChanged(this);
|
||||
}
|
||||
|
||||
int UPlotCurve::removeItem(int index)
|
||||
@@ -911,7 +911,7 @@ void UPlotCurve::setData(const QVector<float> & x, const QVector<float> & y)
|
||||
|
||||
//reset minMax, this will force the plot to update the axes
|
||||
this->updateMinMax();
|
||||
emit dataChanged(this);
|
||||
Q_EMIT dataChanged(this);
|
||||
}
|
||||
else if(y.size()>0 && x.size()==0)
|
||||
{
|
||||
@@ -952,7 +952,7 @@ void UPlotCurve::setData(const std::vector<float> & x, const std::vector<float>
|
||||
|
||||
//reset minMax, this will force the plot to update the axes
|
||||
this->updateMinMax();
|
||||
emit dataChanged(this);
|
||||
Q_EMIT dataChanged(this);
|
||||
}
|
||||
else if(y.size()>0 && x.size()==0)
|
||||
{
|
||||
@@ -996,7 +996,7 @@ void UPlotCurve::setData(const std::vector<float> & y)
|
||||
|
||||
//reset minMax, this will force the plot to update the axes
|
||||
this->updateMinMax();
|
||||
emit dataChanged(this);
|
||||
Q_EMIT dataChanged(this);
|
||||
}
|
||||
|
||||
void UPlotCurve::getData(QVector<float> & x, QVector<float> & y) const
|
||||
@@ -1459,15 +1459,15 @@ void UPlotLegendItem::contextMenuEvent(QContextMenuEvent * event)
|
||||
}
|
||||
else if(action == _aRemoveCurve)
|
||||
{
|
||||
emit legendItemRemoved(_curve);
|
||||
Q_EMIT legendItemRemoved(_curve);
|
||||
}
|
||||
else if(action == _aMoveUp)
|
||||
{
|
||||
emit moveUpRequest(this);
|
||||
Q_EMIT moveUpRequest(this);
|
||||
}
|
||||
else if(action == _aMoveDown)
|
||||
{
|
||||
emit moveDownRequest(this);
|
||||
Q_EMIT moveDownRequest(this);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1584,7 +1584,7 @@ void UPlotLegend::removeLegendItem(const UPlotCurve * curve)
|
||||
{
|
||||
if(this->remove(curve))
|
||||
{
|
||||
emit legendItemRemoved(curve);
|
||||
Q_EMIT legendItemRemoved(curve);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1611,7 +1611,7 @@ void UPlotLegend::moveUp(UPlotLegendItem * item)
|
||||
hLayout->setMargin(0);
|
||||
((QVBoxLayout*)this->layout())->insertLayout(index-1, hLayout);
|
||||
delete layoutItem;
|
||||
emit legendItemMoved(item->curve(), index-1);
|
||||
Q_EMIT legendItemMoved(item->curve(), index-1);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1638,7 +1638,7 @@ void UPlotLegend::moveDown(UPlotLegendItem * item)
|
||||
hLayout->setMargin(0);
|
||||
((QVBoxLayout*)this->layout())->insertLayout(index+1, hLayout);
|
||||
delete layoutItem;
|
||||
emit legendItemMoved(item->curve(), index+1);
|
||||
Q_EMIT legendItemMoved(item->curve(), index+1);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1715,7 +1715,7 @@ void UPlotLegend::redirectToggled(bool toggled)
|
||||
UPlotLegendItem * item = qobject_cast<UPlotLegendItem*>(sender());
|
||||
if(item)
|
||||
{
|
||||
emit legendItemToggled(item->curve(), _flat?!toggled:toggled);
|
||||
Q_EMIT legendItemToggled(item->curve(), _flat?!toggled:toggled);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user