Skip to content
Snippets Groups Projects
Commit d3bea639 authored by moenck's avatar moenck
Browse files

Updated naming scheme, toolchain and versioning

Replaced ifdef with pragmas

Signed-off-by: default avatarHauke Moenck <hauke_moenck@gmx.de>
parent fd0331af
Branches
No related tags found
No related merge requests found
Showing
with 146 additions and 201 deletions
...@@ -4,65 +4,68 @@ stages: ...@@ -4,65 +4,68 @@ stages:
- deploy - deploy
.base ubuntu-18.04: &base_ubuntu_18_04 .ubuntu-18.04:
tags: [ linux, docker ] tags: [ linux, docker ]
image: git.imp.fu-berlin.de:5000/bioroboticslab/robofish/docker:ubuntu-18.04 image: git.imp.fu-berlin.de:5000/bioroboticslab/robofish/docker:devel-ubuntu18.04
.base windows: &base_windows .windows:
tags: [ windows, docker ] tags: [ windows, docker ]
image: git.imp.fu-berlin.de:5000/bioroboticslab/robofish/docker:windows image: git.imp.fu-berlin.de:5000/bioroboticslab/robofish/docker:devel-windows
.build ubuntu-18.04: &build_ubuntu_18_04 .gcc8: &gcc8
stage: build
<<: *base_ubuntu_18_04
variables:
CC: gcc-8 CC: gcc-8
CXX: g++-8 CXX: g++-8
.msvc15.9: &msvc15_9
VSDevEnv -arch=amd64 -vcvars_ver="14.16"
.debug: &debug
CMAKE_BUILD_TYPE: Debug
.release: &release
CMAKE_BUILD_TYPE: Release
.build ubuntu-18.04:
extends: .ubuntu-18.04
stage: build
artifacts: artifacts:
paths: paths:
- build - build
expire_in: 1 day expire_in: 1 day
script:
- cmake -Bbuild -H. -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" -G Ninja -DCMAKE_SUPPRESS_REGENERATION=ON -DCMAKE_SKIP_PACKAGE_ALL_DEPENDENCY=ON
- ninja -C build
.build windows: &build_windows .build windows:
extends: .windows
stage: build stage: build
<<: *base_windows
artifacts: artifacts:
paths: paths:
- build - build
expire_in: 1 day expire_in: 1 day
before_script: before_script:
- C:/VsDevEnv.ps1 -arch=amd64 - . $Profile
- *msvc15_9
build ubuntu-18.04:
<<: *build_ubuntu_18_04
script: script:
- cmake -Bbuild -H. -DCMAKE_BUILD_TYPE=Release -G Ninja - cmake -Bbuild "-H." -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" -G Ninja -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_DIR/scripts/buildsystems/vcpkg.cmake" -DVCPKG_TARGET_TRIPLET="$env:VCPKG_TRIPLET" -DCMAKE_SUPPRESS_REGENERATION=ON -DCMAKE_SKIP_PACKAGE_ALL_DEPENDENCY=ON
- ninja -C build - ninja -C build
build windows: build ubuntu-18.04:
<<: *build_windows extends: .build ubuntu-18.04
script: variables:
- cmake -Bbuild "-H." -DCMAKE_BUILD_TYPE=Release -G Ninja -DCMAKE_PREFIX_PATH="$Env:VCPKG_INSTALL_DIR" <<: [ *gcc8, *release ]
- ninja -C build
build windows[cuda]: build windows:
<<: *build_windows extends: .build windows
script: variables:
- cmake -Bbuild "-H." -DCMAKE_BUILD_TYPE=Release -G Ninja -DCMAKE_PREFIX_PATH="$Env:VCPKG_CUDA_INSTALL_DIR" <<: [ *release ]
- ninja -C build
build windows[debug]: build windows[debug]:
<<: *build_windows extends: .build windows
script: variables:
- cmake -Bbuild "-H." -DCMAKE_BUILD_TYPE=Debug -G Ninja -DCMAKE_PREFIX_PATH="$Env:VCPKG_INSTALL_DIR" <<: [ *debug ]
- ninja -C build
build windows[debug,cuda]:
<<: *build_windows
script:
- cmake -Bbuild "-H." -DCMAKE_BUILD_TYPE=Debug -G Ninja -DCMAKE_PREFIX_PATH="$Env:VCPKG_CUDA_INSTALL_DIR"
- ninja -C build
.package: &package .package: &package
...@@ -75,32 +78,27 @@ build windows[debug,cuda]: ...@@ -75,32 +78,27 @@ build windows[debug,cuda]:
- ninja -C build package - ninja -C build package
package ubuntu-18.04: package ubuntu-18.04:
<<: *base_ubuntu_18_04 extends: .ubuntu-18.04
dependencies: dependencies:
- build ubuntu-18.04 - build ubuntu-18.04
<<: *package <<: *package
package windows: package windows:
<<: *base_windows extends: .windows
dependencies: dependencies:
- build windows - build windows
<<: *package <<: *package
package windows[cuda]:
<<: *base_windows
dependencies:
- build windows[cuda]
<<: *package
package windows[debug]: package windows[debug]:
<<: *base_windows extends: .windows
dependencies: dependencies:
- build windows[debug] - build windows[debug]
<<: *package <<: *package
package windows[debug,cuda]:
<<: *base_windows
dependencies:
- build windows[debug,cuda]
<<: *package
trigger dependents:
extends: .ubuntu-18.04
stage: deploy
script:
- . /etc/profile.d/robofish.sh
- gitlab-trigger-pipeline bioroboticslab%2Fbiotracker%2Futility $CI_JOB_TOKEN master
cmake_minimum_required(VERSION 3.12) cmake_minimum_required(VERSION 3.13)
exec_program("git" ${CMAKE_CURRENT_SOURCE_DIR} ARGS "describe --tags --abbrev=0" OUTPUT_VARIABLE GIT_TAG) file(READ version.txt Version)
#exec_program("git" ${CMAKE_CURRENT_SOURCE_DIR} ARGS "describe --tags --abbrev=0" OUTPUT_VARIABLE GIT_TAG)
project(BT_Interfaces project(biotracker-interfaces
VERSION ${GIT_TAG} VERSION ${Version}
LANGUAGES CXX) LANGUAGES CXX)
include(GNUInstallDirs) include(GNUInstallDirs)
...@@ -13,33 +14,14 @@ set(INSTALL_LIBDIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Installation directory fo ...@@ -13,33 +14,14 @@ set(INSTALL_LIBDIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Installation directory fo
set(INSTALL_INCLUDEDIR ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME} CACHE PATH "Installation directory for header files") set(INSTALL_INCLUDEDIR ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME} CACHE PATH "Installation directory for header files")
set(INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} CACHE STRING "Installation directory for cmake configuration files") set(INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} CACHE STRING "Installation directory for cmake configuration files")
set(TN BT_Interfaces) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake)
add_library(${TN} SHARED) include(Headers)
set_target_properties(${TN} PROPERTIES OUTPUT_NAME bt_interfaces)
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
set_target_properties(${TN} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS true)
endif()
include(Src/CMakeLists.txt) add_subdirectory(Src)
install(
TARGETS
BT_Interfaces
EXPORT
${PROJECT_NAME}Targets
RUNTIME DESTINATION "${INSTALL_BINDIR}"
LIBRARY DESTINATION "${INSTALL_LIBDIR}"
ARCHIVE DESTINATION "${INSTALL_LIBDIR}"
)
foreach(file ${BT_Interfaces_PUBLIC_HEADERS})
file(RELATIVE_PATH rel_path "${CMAKE_CURRENT_LIST_DIR}/Src" ${file})
get_filename_component(install_path ${rel_path} DIRECTORY)
install(FILES ${file} DESTINATION "${INSTALL_INCLUDEDIR}/${install_path}")
endforeach()
export( export(
TARGETS TARGETS
BT_Interfaces ${PROJECT_NAME}
FILE "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Targets.cmake" FILE "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Targets.cmake"
) )
...@@ -69,14 +51,7 @@ install( ...@@ -69,14 +51,7 @@ install(
DESTINATION ${INSTALL_CONFIGDIR} DESTINATION ${INSTALL_CONFIGDIR}
) )
install(
FILES
${CMAKE_CURRENT_SOURCE_DIR}/cmake/Deploy.cmake
${CMAKE_CURRENT_SOURCE_DIR}/cmake/Windeployqt.cmake
DESTINATION ${INSTALL_CONFIGDIR}/Modules/${PROJECT_NAME}
)
set(CPACK_GENERATOR "TXZ") set(CPACK_GENERATOR "TXZ")
set(CPACK_PACKAGE_VERSION ${GIT_TAG}) set(CPACK_PACKAGE_VERSION ${Version})
include(CPack) include(CPack)
...@@ -2,73 +2,91 @@ ...@@ -2,73 +2,91 @@
#### Biotracker: Interfaces #### Biotracker: Interfaces
############################################################## ##############################################################
target_include_directories(${TN} PUBLIC set(target ${PROJECT_NAME})
add_library(${target} SHARED)
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
set_target_properties(${target} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS true)
endif()
install(
TARGETS
${PROJECT_NAME}
EXPORT
${PROJECT_NAME}Targets
RUNTIME DESTINATION "${INSTALL_BINDIR}"
LIBRARY DESTINATION "${INSTALL_LIBDIR}"
ARCHIVE DESTINATION "${INSTALL_LIBDIR}"
)
target_include_directories(${target} PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>
$<INSTALL_INTERFACE:${INSTALL_INCLUDEDIR}> $<INSTALL_INTERFACE:${INSTALL_INCLUDEDIR}>
) )
find_package(Qt5 REQUIRED COMPONENTS Core Gui Widgets OpenGL Xml Network) find_package(Qt5 REQUIRED COMPONENTS Core Gui Widgets OpenGL)
target_link_libraries(${TN} Qt5::Core Qt5::Gui Qt5::Xml Qt5::Network Qt5::Widgets) target_link_libraries(${target} Qt5::Core Qt5::Gui Qt5::Widgets)
find_package(OpenCV 3 REQUIRED) find_package(OpenCV 3 REQUIRED)
target_link_libraries(${TN} ${OpenCV_LIBS}) target_link_libraries(${target} ${OpenCV_LIBS})
set_target_properties(${TN} PROPERTIES POSITION_INDEPENDENT_CODE ON) set_target_properties(${target} PROPERTIES AUTOMOC ON AUTOUIC ON AUTORCC ON)
set_target_properties(${TN} PROPERTIES AUTOMOC ON AUTOUIC ON AUTORCC ON) set_target_properties(${target} PROPERTIES
set_target_properties(${TN} PROPERTIES
CXX_STANDARD 17 CXX_STANDARD 17
CXX_STANDARD_REQUIRED YES CXX_STANDARD_REQUIRED YES
CXX_EXTENSIONS NO CXX_EXTENSIONS NO
) )
target_compile_definitions(${TN} PRIVATE BT_INTERFACES_EXPORT) target_compile_definitions(${target} PRIVATE BT_INTERFACES_EXPORT)
target_sources(${TN} target_sources(${target}
PRIVATE PRIVATE
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/ENUMS.cpp" "Interfaces/ENUMS.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IBioTrackerContext.cpp" "Interfaces/IBioTrackerContext.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IBioTrackerPlugin.cpp" "Interfaces/IBioTrackerPlugin.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IController/IController.cpp" "Interfaces/IController/IController.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IModel/IModel.cpp" "Interfaces/IModel/IModel.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IModel/IModelAreaDescriptor.cpp" "Interfaces/IModel/IModelAreaDescriptor.h"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IModel/IModelDataExporter.cpp" "Interfaces/IModel/IModelDataExporter.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IModel/IModelTrackedComponent.cpp" "Interfaces/IModel/IModelTrackedComponent.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IModel/IModelTrackedComponentFactory.cpp" "Interfaces/IModel/IModelTrackedComponentFactory.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IModel/IModelTrackedTrajectory.cpp" "Interfaces/IModel/IModelTrackedTrajectory.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IModel/IModelTrackingAlgorithm.cpp" "Interfaces/IModel/IModelTrackingAlgorithm.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IModel/IObject.cpp" "Interfaces/IModel/IObject.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IModel/Serializable.cpp" "Interfaces/IModel/Serializable.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IView/IView.cpp" "Interfaces/IView/IView.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IView/IViewGraphicsPixmapItem.cpp" "Interfaces/IView/IViewGraphicsPixmapItem.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IView/IViewGraphicsScene.cpp" "Interfaces/IView/IViewGraphicsScene.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IView/IViewGraphicsView.cpp" "Interfaces/IView/IViewGraphicsView.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IView/IViewMainWindow.cpp" "Interfaces/IView/IViewMainWindow.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IView/IViewOpenGLWidget.cpp" "Interfaces/IView/IViewOpenGLWidget.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IView/IViewTrackedComponent.cpp" "Interfaces/IView/IViewTrackedComponent.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IView/IViewWidget.cpp" "Interfaces/IView/IViewWidget.cpp"
) )
set(${TN}_PUBLIC_HEADERS install_headers(
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/API.h" HEADERS
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/ENUMS.h" "Interfaces/API.h"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IBioTrackerContext.h" "Interfaces/ENUMS.h"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IBioTrackerPlugin.h" "Interfaces/IBioTrackerContext.h"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IController/IController.h" "Interfaces/IBioTrackerPlugin.h"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IModel/IModel.h" "Interfaces/IController/IController.h"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IModel/IModelAreaDescriptor.h" "Interfaces/IModel/IModel.h"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IModel/IModelDataExporter.h" "Interfaces/IModel/IModelAreaDescriptor.h"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IModel/IModelTrackedComponent.h" "Interfaces/IModel/IModelDataExporter.h"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IModel/IModelTrackedComponentFactory.h" "Interfaces/IModel/IModelTrackedComponent.h"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IModel/IModelTrackedTrajectory.h" "Interfaces/IModel/IModelTrackedComponentFactory.h"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IModel/IModelTrackingAlgorithm.h" "Interfaces/IModel/IModelTrackedTrajectory.h"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IModel/IObject.h" "Interfaces/IModel/IModelTrackingAlgorithm.h"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IModel/Serializable.h" "Interfaces/IModel/IObject.h"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IView/IView.h" "Interfaces/IModel/Serializable.h"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IView/IViewGraphicsPixmapItem.h" "Interfaces/IView/IView.h"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IView/IViewGraphicsScene.h" "Interfaces/IView/IViewGraphicsPixmapItem.h"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IView/IViewGraphicsView.h" "Interfaces/IView/IViewGraphicsScene.h"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IView/IViewMainWindow.h" "Interfaces/IView/IViewGraphicsView.h"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IView/IViewOpenGLWidget.h" "Interfaces/IView/IViewMainWindow.h"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IView/IViewTrackedComponent.h" "Interfaces/IView/IViewOpenGLWidget.h"
"${CMAKE_CURRENT_LIST_DIR}/Interfaces/IView/IViewWidget.h" "Interfaces/IView/IViewTrackedComponent.h"
"Interfaces/IView/IViewWidget.h"
DESTINATION "${INSTALL_INCLUDEDIR}"
) )
#ifndef ENUMS_H #pragma once
#define ENUMS_H
#include <QObject> #include <QObject>
#include <Interfaces/API.h> #include <Interfaces/API.h>
...@@ -40,4 +39,3 @@ public: ...@@ -40,4 +39,3 @@ public:
Q_ENUM(COREPERMISSIONS) Q_ENUM(COREPERMISSIONS)
}; };
#endif // ENUMS_H
#ifndef IBIOTRACKERCONTEXT_H #pragma once
#define IBIOTRACKERCONTEXT_H
#include <QObject> #include <QObject>
#include "QMap" #include "QMap"
...@@ -30,5 +29,3 @@ protected: ...@@ -30,5 +29,3 @@ protected:
}; };
#endif // IBIOTRACKERCONTEXT_H
#ifndef IBIOTRACKERPLUGIN_H #pragma once
#define IBIOTRACKERPLUGIN_H
#include "QObject" #include "QObject"
...@@ -68,5 +67,3 @@ public Q_SLOTS: ...@@ -68,5 +67,3 @@ public Q_SLOTS:
#define IBioTrackerPlugin_iid "de.fu-berlin.mi.biorobotics.IBioTrackerPlugin" #define IBioTrackerPlugin_iid "de.fu-berlin.mi.biorobotics.IBioTrackerPlugin"
Q_DECLARE_INTERFACE(IBioTrackerPlugin, IBioTrackerPlugin_iid) Q_DECLARE_INTERFACE(IBioTrackerPlugin, IBioTrackerPlugin_iid)
#endif // IBIOTRACKERPLUGIN_H
#ifndef IMODEL_H #pragma once
#define IMODEL_H
#include <QObject> #include <QObject>
...@@ -17,5 +16,3 @@ class BT_INTERFACES_API IModel : public QObject { ...@@ -17,5 +16,3 @@ class BT_INTERFACES_API IModel : public QObject {
public Q_SLOTS: public Q_SLOTS:
}; };
#endif // IMODEL_H
#ifndef ITRACKEDCOMPONENT_H #pragma once
#define ITRACKEDCOMPONENT_H
#include "IModel.h" #include "IModel.h"
#include <chrono> #include <chrono>
...@@ -337,5 +336,3 @@ public: ...@@ -337,5 +336,3 @@ public:
*/ */
IModelTrackedRectangle(QObject *parent = 0); IModelTrackedRectangle(QObject *parent = 0);
}; };
#endif // ITRACKEDCOMPONENT_H
#ifndef ITRACKEDCOMPONENTFACTORY_H #pragma once
#define ITRACKEDCOMPONENTFACTORY_H
#include "IModel.h" #include "IModel.h"
#include "IModelTrackedComponent.h" #include "IModelTrackedComponent.h"
...@@ -23,5 +22,3 @@ protected: ...@@ -23,5 +22,3 @@ protected:
virtual IModelTrackedComponent *createTrackedTrajectory(QString name) = 0; virtual IModelTrackedComponent *createTrackedTrajectory(QString name) = 0;
}; };
#endif // ITRACKEDCOMPONENTFACTORY_H
#ifndef ITRACKEDOTRAJECTORY_H #pragma once
#define ITRACKEDOTRAJECTORY_H
#include "Interfaces/IModel/IModelTrackedComponent.h" #include "Interfaces/IModel/IModelTrackedComponent.h"
...@@ -72,5 +71,3 @@ protected: ...@@ -72,5 +71,3 @@ protected:
std::chrono::system_clock::time_point _time; std::chrono::system_clock::time_point _time;
}; };
#endif // ITRACKEDOTRAJECTORY_H
#ifndef ITRACKINGALGORITHM_H #pragma once
#define ITRACKINGALGORITHM_H
#include "IModel.h" #include "IModel.h"
#include "opencv2/core/core.hpp" #include "opencv2/core/core.hpp"
...@@ -17,5 +16,3 @@ signals: ...@@ -17,5 +16,3 @@ signals:
}; };
#endif // ITRACKINGALGORITHM_H
#ifndef IOBJECT_H #pragma once
#define IOBJECT_H
#include "Interfaces/IModel/IModel.h" #include "Interfaces/IModel/IModel.h"
...@@ -10,5 +9,3 @@ class BT_INTERFACES_API IObject : public IModel { ...@@ -10,5 +9,3 @@ class BT_INTERFACES_API IObject : public IModel {
public: public:
IObject(); IObject();
}; };
#endif // IOBJECT_H
#ifndef IVIEW_H #pragma once
#define IVIEW_H
#include "Interfaces/IModel/IModel.h" #include "Interfaces/IModel/IModel.h"
#include "Interfaces/ENUMS.h" #include "Interfaces/ENUMS.h"
...@@ -25,5 +24,3 @@ class BT_INTERFACES_API IView { ...@@ -25,5 +24,3 @@ class BT_INTERFACES_API IView {
IController *mController; IController *mController;
IModel *mModel; IModel *mModel;
}; };
#endif // IVIEW_H
#ifndef IGRAPHICSPIXMAPITEM_H #pragma once
#define IGRAPHICSPIXMAPITEM_H
#include "IView.h" #include "IView.h"
#include "QObject" #include "QObject"
...@@ -18,5 +17,3 @@ public: ...@@ -18,5 +17,3 @@ public:
public Q_SLOTS: public Q_SLOTS:
virtual void getNotified() = 0; virtual void getNotified() = 0;
}; };
#endif // IGRAPHICSPIXMAPITEM_H
#ifndef IVIEWGRAPHICSSCENE_H #pragma once
#define IVIEWGRAPHICSSCENE_H
#include "QGraphicsScene" #include "QGraphicsScene"
#include "IView.h" #include "IView.h"
...@@ -20,5 +19,3 @@ protected: ...@@ -20,5 +19,3 @@ protected:
public Q_SLOTS: public Q_SLOTS:
virtual void getNotified() = 0; virtual void getNotified() = 0;
}; };
#endif // IVIEWGRAPHICSSCENE_H
#ifndef IGRAPHICSVIEW_H #pragma once
#define IGRAPHICSVIEW_H
#include "QGraphicsView" #include "QGraphicsView"
#include "IView.h" #include "IView.h"
...@@ -20,5 +19,3 @@ protected: ...@@ -20,5 +19,3 @@ protected:
public Q_SLOTS: public Q_SLOTS:
virtual void getNotified() = 0; virtual void getNotified() = 0;
}; };
#endif // IGRAPHICSVIEW_H
#ifndef IVIEWMAINWINDOW_H #pragma once
#define IVIEWMAINWINDOW_H
#include <QMainWindow> #include <QMainWindow>
#include "Interfaces/IView/IView.h" #include "Interfaces/IView/IView.h"
...@@ -13,5 +12,3 @@ class BT_INTERFACES_API IViewMainWindow : public QMainWindow, public IView { ...@@ -13,5 +12,3 @@ class BT_INTERFACES_API IViewMainWindow : public QMainWindow, public IView {
void setNewModel(IModel *model); void setNewModel(IModel *model);
void connectModelView(); void connectModelView();
}; };
#endif // IVIEWMAINWINDOW_H
#ifndef IVIEWOPENGLWIDGET_H #pragma once
#define IVIEWOPENGLWIDGET_H
#include "Interfaces/IView/IView.h" #include "Interfaces/IView/IView.h"
#include <QOpenGLWidget> #include <QOpenGLWidget>
...@@ -22,4 +21,3 @@ class BT_INTERFACES_API IViewOpenGLWidget: public QOpenGLWidget, protected QOpen ...@@ -22,4 +21,3 @@ class BT_INTERFACES_API IViewOpenGLWidget: public QOpenGLWidget, protected QOpen
void initializeGL() override; void initializeGL() override;
}; };
#endif // IVIEWOPENGLWIDGET_H
#ifndef IVIEWTRACKEDCOMPONENT_H #pragma once
#define IVIEWTRACKEDCOMPONENT_H
#include "IView.h" #include "IView.h"
#include "QGraphicsObject" #include "QGraphicsObject"
...@@ -31,5 +30,3 @@ public Q_SLOTS: ...@@ -31,5 +30,3 @@ public Q_SLOTS:
virtual void getNotified() = 0; virtual void getNotified() = 0;
}; };
#endif // IVIEWTRACKEDCOMPONENT_H
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment