Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
@@ -171,7 +171,7 @@ class TestMainWindow : public QMainWindow
|
||||
if (!QFile::exists(initFilePath))
|
||||
FATAL_LOG(m_logger) << Q_FUNC_INFO << " MapIniFile location Failed";
|
||||
else
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " MapIniFile found: " << initFilePath;
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " MapIniFile found: " << initFilePath;
|
||||
|
||||
SituationMap::MapSettings * mapSettings = new SituationMap::MapSettings(initFilePath, m_map);
|
||||
MapInitializer *mapInitializer = new MapInitializer(*m_map, *mapSettings, QLatin1String("PlanEditorTest"), m_map);
|
||||
|
||||
@@ -261,7 +261,7 @@ public:
|
||||
|
||||
if (partyColors.size() > customColorCount)
|
||||
{
|
||||
WARNING_LOG() << Q_FUNC_INFO << " To much party colors ("
|
||||
WARNING_LOG(m_logger) << Q_FUNC_INFO << " To much party colors ("
|
||||
<< partyColors.size()
|
||||
<< ") color dialog custom colors are limited to "
|
||||
<< customColorCount
|
||||
@@ -602,7 +602,7 @@ void AttributeDialogManager::onResetWidgets()
|
||||
|
||||
AdvancedSymbology::Gui::SymbolModificationDialog *AttributeDialogManager::InternalData::buildSymbolModifyDialog(QWidget *parent, bool isParticipant)
|
||||
{
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START "
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START "
|
||||
<< ", isParticipant=" << isParticipant
|
||||
<< ", this=" << this;
|
||||
|
||||
@@ -641,7 +641,7 @@ static void colorizeButton(QAbstractButton *button, const QColor color)
|
||||
|
||||
SymbologyXML::SymbolDialog *AttributeDialogManager::InternalData::buildSymbolXMLDialog(QWidget *parent)
|
||||
{
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START " << ", this=" << this;
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START " << ", this=" << this;
|
||||
|
||||
SymbologyXML::SymbolDialog *dlg = new SymbologyXML::SymbolDialog(m_map->symbolDictionary(),m_geoModel,true,parent);
|
||||
if(dlg)
|
||||
@@ -1106,7 +1106,7 @@ LtsWidgets::LtsDialog *AttributeDialogManager::InternalData::buildTextAttrBox(QW
|
||||
|
||||
LtsWidgets::LtsDialog * AttributeDialogManager::InternalData::buildParticipantBox(QWidget *parent)
|
||||
{
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START, this=" << this;
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, this=" << this;
|
||||
Dialog *dlg = new Dialog(parent);
|
||||
|
||||
dlg->setObjectName(QLatin1String("PlanEditor::ParticipantData"));
|
||||
@@ -1334,7 +1334,7 @@ LtsWidgets::LtsDialog * AttributeDialogManager::InternalData::buildParticipantBo
|
||||
m_self->onCloseDialog();
|
||||
});
|
||||
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END, this=" << this;
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, this=" << this;
|
||||
return dlg;
|
||||
}
|
||||
|
||||
|
||||
@@ -158,7 +158,7 @@ template<class RubberbandClass> GeometryPlacer<RubberbandClass>::GeometryPlacer(
|
||||
|
||||
if (m_uidList.isEmpty())
|
||||
{
|
||||
WARNING_LOG() << Q_FUNC_INFO << "Object list of GeometryPlacer is empty.";
|
||||
WARNING_LOG(m_logger) << Q_FUNC_INFO << "Object list of GeometryPlacer is empty.";
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -167,7 +167,7 @@ template<class RubberbandClass> GeometryPlacer<RubberbandClass>::GeometryPlacer(
|
||||
|
||||
|
||||
|
||||
ERROR_LOG() << Q_FUNC_INFO << "Can't determine bounding box of selected features";
|
||||
ERROR_LOG(m_logger) << Q_FUNC_INFO << "Can't determine bounding box of selected features";
|
||||
|
||||
#ifdef LTS_DEBUG
|
||||
|
||||
|
||||
@@ -137,7 +137,7 @@ public:
|
||||
if (lineNo > 1)
|
||||
{
|
||||
if (!parseLine(stripLeadingAndTrailingQuotes(line)))
|
||||
ERROR_LOG() << "Error while parsing MIL2525D_toMIL2525C.def in line " << lineNo << ENDLOG();
|
||||
ERROR_LOG(m_logger) << "Error while parsing MIL2525D_toMIL2525C.def in line " << lineNo << ENDLOG();
|
||||
}
|
||||
}
|
||||
file.close();
|
||||
@@ -186,9 +186,9 @@ public:
|
||||
}
|
||||
#endif
|
||||
}
|
||||
else ERROR_LOG() << "Open file for reading failed: " << file.fileName() << ENDLOG();
|
||||
else ERROR_LOG(m_logger) << "Open file for reading failed: " << file.fileName() << ENDLOG();
|
||||
}
|
||||
else ERROR_LOG() << "File doesn't exist: " << file.fileName() << ENDLOG();
|
||||
else ERROR_LOG(m_logger) << "File doesn't exist: " << file.fileName() << ENDLOG();
|
||||
}
|
||||
|
||||
~Internal()
|
||||
|
||||
@@ -286,6 +286,8 @@ public slots:
|
||||
|
||||
protected:
|
||||
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
bool eventFilter(QObject *obj, QEvent *event) override;
|
||||
|
||||
void initializePlan();
|
||||
|
||||
@@ -308,12 +308,12 @@ public:
|
||||
|
||||
if (m_geoModel == nullptr)
|
||||
{
|
||||
ERROR_LOG() << Q_FUNC_INFO << " Creating Geometry Model failed.";
|
||||
ERROR_LOG(m_logger) << Q_FUNC_INFO << " Creating Geometry Model failed.";
|
||||
return;
|
||||
}
|
||||
if (m_geoModelRenderer == nullptr)
|
||||
{
|
||||
ERROR_LOG() << Q_FUNC_INFO << " Creating Geometry Model Renderer failed.";
|
||||
ERROR_LOG(m_logger) << Q_FUNC_INFO << " Creating Geometry Model Renderer failed.";
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -19,13 +19,12 @@ SelectionWorker::SelectionWorker(PlanEditor *planEditor
|
||||
, SituationMap::GeometryModel *geometryModel
|
||||
, SituationMap::Map *map
|
||||
, SelectionMode mode
|
||||
, const QPointF &viewPortPosition)
|
||||
: QObject(planEditor)
|
||||
, const QPointF &viewPortPosition) : QObject(planEditor)
|
||||
, m_planEditor(planEditor)
|
||||
, m_geometryModel(geometryModel)
|
||||
, m_map(map)
|
||||
, m_rubberband(nullptr)
|
||||
{
|
||||
, m_rubberband(nullptr),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
|
||||
switch (mode)
|
||||
{
|
||||
@@ -47,7 +46,7 @@ SelectionWorker::SelectionWorker(PlanEditor *planEditor
|
||||
connect(rubberband, &SituationMap::RB::Rubberband::apply, this, &SelectionWorker::onLineSelect);
|
||||
connect(rubberband, &SituationMap::RB::Rubberband::abort, this, &SelectionWorker::onAbortSelect);
|
||||
}
|
||||
else ERROR_LOG() << Q_FUNC_INFO << "Creating rubberband for line selection failed.";
|
||||
else ERROR_LOG(m_logger) << Q_FUNC_INFO << "Creating rubberband for line selection failed.";
|
||||
} break;
|
||||
|
||||
case SelectionMode::Lasso :
|
||||
@@ -65,7 +64,7 @@ SelectionWorker::SelectionWorker(PlanEditor *planEditor
|
||||
connect(rubberband, &SituationMap::RB::Rubberband::apply, this, &SelectionWorker::onLassoSelect);
|
||||
connect(rubberband, &SituationMap::RB::Rubberband::abort, this, &SelectionWorker::onAbortSelect);
|
||||
}
|
||||
else ERROR_LOG() << Q_FUNC_INFO << "Creating rubberband for lasso selection failed.";
|
||||
else ERROR_LOG(m_logger) << Q_FUNC_INFO << "Creating rubberband for lasso selection failed.";
|
||||
} break;
|
||||
|
||||
case SelectionMode::Rectangle :
|
||||
@@ -82,7 +81,7 @@ SelectionWorker::SelectionWorker(PlanEditor *planEditor
|
||||
connect(rubberband, &SituationMap::RB::Rubberband::apply, this, &SelectionWorker::onRectSelect);
|
||||
connect(rubberband, &SituationMap::RB::Rubberband::abort, this, &SelectionWorker::onAbortSelect);
|
||||
}
|
||||
else ERROR_LOG() << Q_FUNC_INFO << "Creating rubberband for rectangle selection failed.";
|
||||
else ERROR_LOG(m_logger) << Q_FUNC_INFO << "Creating rubberband for rectangle selection failed.";
|
||||
} break;
|
||||
|
||||
case SelectionMode::Picking :
|
||||
|
||||
@@ -391,7 +391,7 @@ public:
|
||||
|
||||
if (!setContent(xml, &errorMsg, &errorLine, &errorColumn))
|
||||
{
|
||||
ERROR_LOG() << Q_FUNC_INFO << " parsing xml input failed: " << errorMsg << " at line " << errorLine << " , column " << errorColumn;
|
||||
ERROR_LOG(m_logger) << Q_FUNC_INFO << " parsing xml input failed: " << errorMsg << " at line " << errorLine << " , column " << errorColumn;
|
||||
setContent(backup);
|
||||
return false;
|
||||
}
|
||||
@@ -412,7 +412,7 @@ public:
|
||||
|
||||
if (!setContent(device, &errorMsg, &errorLine, &errorColumn))
|
||||
{
|
||||
ERROR_LOG() << Q_FUNC_INFO << " parsing xml input failed: " << errorMsg << " at line " << errorLine << " , column " << errorColumn;
|
||||
ERROR_LOG(m_logger) << Q_FUNC_INFO << " parsing xml input failed: " << errorMsg << " at line " << errorLine << " , column " << errorColumn;
|
||||
setContent(backup);
|
||||
return false;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user