From a7ce024842f0519c55798fe45bee2b081870de29 Mon Sep 17 00:00:00 2001 From: baydam Date: Tue, 1 Aug 2017 02:26:43 +0000 Subject: [PATCH] The core of the app reorganized --- src/{mapmap => core}/Commands.cpp | 0 src/{mapmap => core}/Commands.h | 0 src/{mapmap => core}/Element.cpp | 0 src/{mapmap => core}/Element.h | 0 src/{mapmap => core}/MM.cpp | 0 src/{mapmap => core}/MM.h | 0 src/{mapmap => core}/Mapping.cpp | 2 +- src/{mapmap => core}/Mapping.h | 0 src/{mapmap => core}/MappingManager.cpp | 0 src/{mapmap => core}/MappingManager.h | 0 src/{mapmap => core}/Maths.h | 0 src/{mapmap => core}/MetaObjectRegistry.cpp | 0 src/{mapmap => core}/MetaObjectRegistry.h | 0 src/{mapmap => core}/Paint.cpp | 0 src/{mapmap => core}/Paint.h | 0 src/{mapmap => core}/ProjectLabels.cpp | 0 src/{mapmap => core}/ProjectLabels.h | 0 src/{mapmap => core}/ProjectReader.cpp | 0 src/{mapmap => core}/ProjectReader.h | 0 src/{mapmap => core}/ProjectWriter.cpp | 0 src/{mapmap => core}/ProjectWriter.h | 0 src/{mapmap => core}/Serializable.cpp | 0 src/{mapmap => core}/Serializable.h | 0 src/{mapmap => core}/UidAllocator.cpp | 0 src/{mapmap => core}/UidAllocator.h | 0 src/{mapmap => core}/Util.cpp | 0 src/{mapmap => core}/Util.h | 0 src/{mapmap => core}/VideoImpl.cpp | 0 src/{mapmap => core}/VideoImpl.h | 0 src/{mapmap => core}/VideoShmSrcImpl.cpp | 0 src/{mapmap => core}/VideoShmSrcImpl.h | 0 .../VideoUriDecodeBinImpl.cpp | 0 src/{mapmap => core}/VideoUriDecodeBinImpl.h | 0 src/{mapmap => core}/VideoV4l2SrcImpl.cpp | 0 src/{mapmap => core}/VideoV4l2SrcImpl.h | 0 src/core/core.pri | 39 +++++++++++++++++++ 36 files changed, 40 insertions(+), 1 deletion(-) rename src/{mapmap => core}/Commands.cpp (100%) rename src/{mapmap => core}/Commands.h (100%) rename src/{mapmap => core}/Element.cpp (100%) rename src/{mapmap => core}/Element.h (100%) rename src/{mapmap => core}/MM.cpp (100%) rename src/{mapmap => core}/MM.h (100%) rename src/{mapmap => core}/Mapping.cpp (98%) rename src/{mapmap => core}/Mapping.h (100%) rename src/{mapmap => core}/MappingManager.cpp (100%) rename src/{mapmap => core}/MappingManager.h (100%) rename src/{mapmap => core}/Maths.h (100%) rename src/{mapmap => core}/MetaObjectRegistry.cpp (100%) rename src/{mapmap => core}/MetaObjectRegistry.h (100%) rename src/{mapmap => core}/Paint.cpp (100%) rename src/{mapmap => core}/Paint.h (100%) rename src/{mapmap => core}/ProjectLabels.cpp (100%) rename src/{mapmap => core}/ProjectLabels.h (100%) rename src/{mapmap => core}/ProjectReader.cpp (100%) rename src/{mapmap => core}/ProjectReader.h (100%) rename src/{mapmap => core}/ProjectWriter.cpp (100%) rename src/{mapmap => core}/ProjectWriter.h (100%) rename src/{mapmap => core}/Serializable.cpp (100%) rename src/{mapmap => core}/Serializable.h (100%) rename src/{mapmap => core}/UidAllocator.cpp (100%) rename src/{mapmap => core}/UidAllocator.h (100%) rename src/{mapmap => core}/Util.cpp (100%) rename src/{mapmap => core}/Util.h (100%) rename src/{mapmap => core}/VideoImpl.cpp (100%) rename src/{mapmap => core}/VideoImpl.h (100%) rename src/{mapmap => core}/VideoShmSrcImpl.cpp (100%) rename src/{mapmap => core}/VideoShmSrcImpl.h (100%) rename src/{mapmap => core}/VideoUriDecodeBinImpl.cpp (100%) rename src/{mapmap => core}/VideoUriDecodeBinImpl.h (100%) rename src/{mapmap => core}/VideoV4l2SrcImpl.cpp (100%) rename src/{mapmap => core}/VideoV4l2SrcImpl.h (100%) create mode 100644 src/core/core.pri diff --git a/src/mapmap/Commands.cpp b/src/core/Commands.cpp similarity index 100% rename from src/mapmap/Commands.cpp rename to src/core/Commands.cpp diff --git a/src/mapmap/Commands.h b/src/core/Commands.h similarity index 100% rename from src/mapmap/Commands.h rename to src/core/Commands.h diff --git a/src/mapmap/Element.cpp b/src/core/Element.cpp similarity index 100% rename from src/mapmap/Element.cpp rename to src/core/Element.cpp diff --git a/src/mapmap/Element.h b/src/core/Element.h similarity index 100% rename from src/mapmap/Element.h rename to src/core/Element.h diff --git a/src/mapmap/MM.cpp b/src/core/MM.cpp similarity index 100% rename from src/mapmap/MM.cpp rename to src/core/MM.cpp diff --git a/src/mapmap/MM.h b/src/core/MM.h similarity index 100% rename from src/mapmap/MM.h rename to src/core/MM.h diff --git a/src/mapmap/Mapping.cpp b/src/core/Mapping.cpp similarity index 98% rename from src/mapmap/Mapping.cpp rename to src/core/Mapping.cpp index 02e4583..a57b57e 100644 --- a/src/mapmap/Mapping.cpp +++ b/src/core/Mapping.cpp @@ -92,7 +92,7 @@ void Mapping::read(const QDomElement& obj) // Read paint. int paintId = obj.attribute("paintId").toInt(); - setPaint(MainWindow::window()->getMappingManager().getPaintById(paintId)); +// setPaint(MainWindow::window()->getMappingManager().getPaintById(paintId)); // Read output shape. _readShape(obj, true); diff --git a/src/mapmap/Mapping.h b/src/core/Mapping.h similarity index 100% rename from src/mapmap/Mapping.h rename to src/core/Mapping.h diff --git a/src/mapmap/MappingManager.cpp b/src/core/MappingManager.cpp similarity index 100% rename from src/mapmap/MappingManager.cpp rename to src/core/MappingManager.cpp diff --git a/src/mapmap/MappingManager.h b/src/core/MappingManager.h similarity index 100% rename from src/mapmap/MappingManager.h rename to src/core/MappingManager.h diff --git a/src/mapmap/Maths.h b/src/core/Maths.h similarity index 100% rename from src/mapmap/Maths.h rename to src/core/Maths.h diff --git a/src/mapmap/MetaObjectRegistry.cpp b/src/core/MetaObjectRegistry.cpp similarity index 100% rename from src/mapmap/MetaObjectRegistry.cpp rename to src/core/MetaObjectRegistry.cpp diff --git a/src/mapmap/MetaObjectRegistry.h b/src/core/MetaObjectRegistry.h similarity index 100% rename from src/mapmap/MetaObjectRegistry.h rename to src/core/MetaObjectRegistry.h diff --git a/src/mapmap/Paint.cpp b/src/core/Paint.cpp similarity index 100% rename from src/mapmap/Paint.cpp rename to src/core/Paint.cpp diff --git a/src/mapmap/Paint.h b/src/core/Paint.h similarity index 100% rename from src/mapmap/Paint.h rename to src/core/Paint.h diff --git a/src/mapmap/ProjectLabels.cpp b/src/core/ProjectLabels.cpp similarity index 100% rename from src/mapmap/ProjectLabels.cpp rename to src/core/ProjectLabels.cpp diff --git a/src/mapmap/ProjectLabels.h b/src/core/ProjectLabels.h similarity index 100% rename from src/mapmap/ProjectLabels.h rename to src/core/ProjectLabels.h diff --git a/src/mapmap/ProjectReader.cpp b/src/core/ProjectReader.cpp similarity index 100% rename from src/mapmap/ProjectReader.cpp rename to src/core/ProjectReader.cpp diff --git a/src/mapmap/ProjectReader.h b/src/core/ProjectReader.h similarity index 100% rename from src/mapmap/ProjectReader.h rename to src/core/ProjectReader.h diff --git a/src/mapmap/ProjectWriter.cpp b/src/core/ProjectWriter.cpp similarity index 100% rename from src/mapmap/ProjectWriter.cpp rename to src/core/ProjectWriter.cpp diff --git a/src/mapmap/ProjectWriter.h b/src/core/ProjectWriter.h similarity index 100% rename from src/mapmap/ProjectWriter.h rename to src/core/ProjectWriter.h diff --git a/src/mapmap/Serializable.cpp b/src/core/Serializable.cpp similarity index 100% rename from src/mapmap/Serializable.cpp rename to src/core/Serializable.cpp diff --git a/src/mapmap/Serializable.h b/src/core/Serializable.h similarity index 100% rename from src/mapmap/Serializable.h rename to src/core/Serializable.h diff --git a/src/mapmap/UidAllocator.cpp b/src/core/UidAllocator.cpp similarity index 100% rename from src/mapmap/UidAllocator.cpp rename to src/core/UidAllocator.cpp diff --git a/src/mapmap/UidAllocator.h b/src/core/UidAllocator.h similarity index 100% rename from src/mapmap/UidAllocator.h rename to src/core/UidAllocator.h diff --git a/src/mapmap/Util.cpp b/src/core/Util.cpp similarity index 100% rename from src/mapmap/Util.cpp rename to src/core/Util.cpp diff --git a/src/mapmap/Util.h b/src/core/Util.h similarity index 100% rename from src/mapmap/Util.h rename to src/core/Util.h diff --git a/src/mapmap/VideoImpl.cpp b/src/core/VideoImpl.cpp similarity index 100% rename from src/mapmap/VideoImpl.cpp rename to src/core/VideoImpl.cpp diff --git a/src/mapmap/VideoImpl.h b/src/core/VideoImpl.h similarity index 100% rename from src/mapmap/VideoImpl.h rename to src/core/VideoImpl.h diff --git a/src/mapmap/VideoShmSrcImpl.cpp b/src/core/VideoShmSrcImpl.cpp similarity index 100% rename from src/mapmap/VideoShmSrcImpl.cpp rename to src/core/VideoShmSrcImpl.cpp diff --git a/src/mapmap/VideoShmSrcImpl.h b/src/core/VideoShmSrcImpl.h similarity index 100% rename from src/mapmap/VideoShmSrcImpl.h rename to src/core/VideoShmSrcImpl.h diff --git a/src/mapmap/VideoUriDecodeBinImpl.cpp b/src/core/VideoUriDecodeBinImpl.cpp similarity index 100% rename from src/mapmap/VideoUriDecodeBinImpl.cpp rename to src/core/VideoUriDecodeBinImpl.cpp diff --git a/src/mapmap/VideoUriDecodeBinImpl.h b/src/core/VideoUriDecodeBinImpl.h similarity index 100% rename from src/mapmap/VideoUriDecodeBinImpl.h rename to src/core/VideoUriDecodeBinImpl.h diff --git a/src/mapmap/VideoV4l2SrcImpl.cpp b/src/core/VideoV4l2SrcImpl.cpp similarity index 100% rename from src/mapmap/VideoV4l2SrcImpl.cpp rename to src/core/VideoV4l2SrcImpl.cpp diff --git a/src/mapmap/VideoV4l2SrcImpl.h b/src/core/VideoV4l2SrcImpl.h similarity index 100% rename from src/mapmap/VideoV4l2SrcImpl.h rename to src/core/VideoV4l2SrcImpl.h diff --git a/src/core/core.pri b/src/core/core.pri new file mode 100644 index 0000000..a8df44f --- /dev/null +++ b/src/core/core.pri @@ -0,0 +1,39 @@ + +include(../src.pri) + +HEADERS += $$PWD/Commands.h \ + $$PWD/Element.h \ + $$PWD/Mapping.h \ + $$PWD/MappingManager.h \ + $$PWD/Maths.h \ + $$PWD/MetaObjectRegistry.h \ + $$PWD/MM.h \ + $$PWD/Paint.h \ + $$PWD/ProjectLabels.h \ + $$PWD/ProjectReader.h \ + $$PWD/ProjectWriter.h \ + $$PWD/Serializable.h \ + $$PWD/UidAllocator.h \ + $$PWD/VideoImpl.h \ + $$PWD/VideoShmSrcImpl.h \ + $$PWD/VideoUriDecodeBinImpl.h \ + $$PWD/VideoV4l2SrcImpl.h \ + $$PWD/Util.h + +SOURCES += $$PWD/Commands.cpp \ + $$PWD/Element.cpp \ + $$PWD/Mapping.cpp \ + $$PWD/MappingManager.cpp \ + $$PWD/MetaObjectRegistry.cpp \ + $$PWD/MM.cpp \ + $$PWD/Paint.cpp \ + $$PWD/ProjectLabels.cpp \ + $$PWD/ProjectReader.cpp \ + $$PWD/ProjectWriter.cpp \ + $$PWD/Serializable.cpp \ + $$PWD/UidAllocator.cpp \ + $$PWD/VideoImpl.cpp \ + $$PWD/VideoShmSrcImpl.cpp \ + $$PWD/VideoUriDecodeBinImpl.cpp \ + $$PWD/VideoV4l2SrcImpl.cpp \ + $$PWD/Util.cpp