WIP: Build fixes und EXTERNAL_DEPENDENCIES.md
This commit is contained in:
300 files changed
+983
-417
No files matched your search
+9
-2
@@ -3,13 +3,18 @@
|
||||
|
||||
#include "mrk_marker.h"
|
||||
#include "ui_mrk_marker.h"
|
||||
#include "mrk_dialog_model.h"
|
||||
|
||||
#include <LtsUtils/dds_vector_to_pixmap.h>
|
||||
#ifdef BUILD_WITH_EXTERNAL_DDS
|
||||
#include "mrk_dialog_model.h"
|
||||
#endif
|
||||
|
||||
#include <LtsUtils/LtsUtilsCore/dds_vector_to_pixmap.h>
|
||||
|
||||
namespace MarkerManagement
|
||||
{
|
||||
|
||||
#ifdef BUILD_WITH_EXTERNAL_DDS
|
||||
|
||||
CustomViewMarker::CustomViewMarker(QWidget *parent)
|
||||
: AbstractDisplayWidget(parent)
|
||||
, m_ui(new Ui::CustomViewMarker)
|
||||
@@ -55,4 +60,6 @@ bool CustomViewMarker::init(const QModelIndex &idx)
|
||||
return true;
|
||||
}
|
||||
|
||||
#endif // BUILD_WITH_EXTERNAL_DDS
|
||||
|
||||
}
|
||||
+24
-5
@@ -5,9 +5,15 @@
|
||||
|
||||
#include "mrk_dialog_model.h"
|
||||
#include <utility>
|
||||
|
||||
#ifdef BUILD_WITH_EXTERNAL_DDS
|
||||
#include <OperatorManagement/opm_dtc.h>
|
||||
#include <MarkerManagement/mrk_dtc.h>
|
||||
#endif
|
||||
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include <LtsProjectionWorkstation/lts_projection_workstation.h>
|
||||
#include <QBuffer>
|
||||
#include <QSet>
|
||||
#include <QTimer>
|
||||
@@ -15,7 +21,7 @@
|
||||
namespace MarkerManagement
|
||||
{
|
||||
|
||||
|
||||
#ifdef BUILD_WITH_EXTERNAL_DDS
|
||||
|
||||
MarkerManagementDialogModel::MarkerManagementDialogModel(QObject *parent)
|
||||
: LtsWidgets::LtsAbstractTableModel<Marker>({tr("Note"),
|
||||
@@ -27,6 +33,7 @@ MarkerManagementDialogModel::MarkerManagementDialogModel(QObject *parent)
|
||||
tr("File Id"),
|
||||
tr("Image")},
|
||||
parent)
|
||||
, m_logger(LtsProjectionWorkstation::getLogger("MarkerManagementDialogModel"))
|
||||
{}
|
||||
|
||||
|
||||
@@ -35,6 +42,7 @@ bool MarkerManagementDialogModel::initModel(const std::shared_ptr<MarkerManageme
|
||||
const std::shared_ptr<FileManagement::ForeignGuiInterface> &flmGui,
|
||||
bool ignoreTimezone)
|
||||
{
|
||||
#ifdef BUILD_WITH_EXTERNAL_DDS
|
||||
m_ignoreTimezone = ignoreTimezone;
|
||||
|
||||
if (!dtc)
|
||||
@@ -62,6 +70,13 @@ bool MarkerManagementDialogModel::initModel(const std::shared_ptr<MarkerManageme
|
||||
updateOperatorNames();
|
||||
|
||||
return true;
|
||||
#else
|
||||
(void)dtc;
|
||||
(void)opmDtc;
|
||||
(void)flmGui;
|
||||
(void)ignoreTimezone;
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -199,7 +214,7 @@ QVariant MarkerManagementDialogModel::data(const QModelIndex &index, int role) c
|
||||
else
|
||||
return QDateTime::fromMSecsSinceEpoch(marker.timeStamp() - marker.timeStampOffset());
|
||||
case ColOffset:
|
||||
return QVariant(marker.timeStampOffset() / 1000);
|
||||
return QVariant::fromValue<qlonglong>(marker.timeStampOffset() / 1000);
|
||||
case ColFileId:
|
||||
return marker.fileContentId();
|
||||
case ColImage:
|
||||
@@ -242,7 +257,8 @@ void MarkerSortFilterProxyModel::setOperatorId(int operatorId)
|
||||
if (m_operatorId == operatorId)
|
||||
return;
|
||||
m_operatorId = operatorId;
|
||||
invalidateFilter();
|
||||
beginFilterChange();
|
||||
endFilterChange();
|
||||
}
|
||||
|
||||
bool MarkerSortFilterProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
|
||||
@@ -286,7 +302,10 @@ void MarkerSortFilterProxyModel::setShowOtherUsersMarkers(bool show)
|
||||
|
||||
m_showOtherUsersMarkers = show;
|
||||
|
||||
invalidateFilter();
|
||||
beginFilterChange();
|
||||
endFilterChange();
|
||||
}
|
||||
|
||||
}
|
||||
#endif // BUILD_WITH_EXTERNAL_DDS
|
||||
|
||||
} // namespace MarkerManagement
|
||||
+5
-10
@@ -3,6 +3,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#ifdef BUILD_WITH_EXTERNAL_DDS
|
||||
|
||||
#include <MarkerManagement/mrk_dtc.h>
|
||||
#include <MarkerManagement/mrk_marker.h>
|
||||
#include <MarkerManagement/logger.h>
|
||||
@@ -10,20 +12,11 @@
|
||||
#include <FileManagement/flm_explorer_gui_plugin_interface.h>
|
||||
#include <LtsWidgets/lts_abstract_table_model.h>
|
||||
#include <LtsWidgets/lts_column_filter_proxy_model.h>
|
||||
|
||||
namespace OperatorManagement
|
||||
{
|
||||
namespace Interface
|
||||
{
|
||||
class Dtc;
|
||||
}
|
||||
}
|
||||
#include <OperatorManagement/opm_dtc.h>
|
||||
|
||||
namespace MarkerManagement
|
||||
{
|
||||
|
||||
|
||||
|
||||
class MRKCOMMON_EXPORT MarkerManagementDialogModel : public LtsWidgets::LtsAbstractTableModel<Marker>
|
||||
{
|
||||
Q_OBJECT
|
||||
@@ -90,3 +83,5 @@ private:
|
||||
bool m_showOtherUsersMarkers {false};
|
||||
};
|
||||
}
|
||||
|
||||
#endif // BUILD_WITH_EXTERNAL_DDS
|
||||
+1
-1
@@ -13,7 +13,7 @@
|
||||
#include <FilterManagement/flt_building_cmpnt_settings.h>
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
#include <LtsUtilsCore/dds_vector.h>
|
||||
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
|
||||
#include <LtsUtils/dds_vector_to_pixmap.h>
|
||||
|
||||
#include <QDateTime>
|
||||
|
||||
+2
-2
@@ -3,9 +3,9 @@
|
||||
|
||||
#include <nglsettings/nglsettings_settings.h>
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <LtsUtilsCore/dds_vector.h>
|
||||
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
|
||||
#include <LtsUtils/dds_vector_to_pixmap.h>
|
||||
#include <LtsUtilsCore/await.h>
|
||||
#include <LtsUtils/LtsUtilsCore/await.h>
|
||||
#include <LtsWidgets/lts_global_wait_dialog.h>
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
#include "snapshot_dialog_model.h"
|
||||
#include "mrk_create_snapshot.h"
|
||||
|
||||
#include <LtsUtilsCore/dds_vector.h>
|
||||
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
|
||||
#include <LtsUtils/dds_vector_to_pixmap.h>
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
|
||||
Reference in new issue
Block a user