mandlm/ESGRAF48
1
0
Fork 0
Code Issues 9 Pull requests Projects Releases Packages Wiki Activity Actions

Removed non-working MetaDataModel

Browse source
This commit is contained in:
Michael Mandl 2018-11-16 22:29:41 +01:00
parent ff615ec084
commit e77990a86a
6 changed files with 1 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -2,3 +2,4 @@ compile_commands.json
_*/ _*/
build-* build-*
*.user *.user
tags

2
proto/DataModel.proto
View file

@ -2,11 +2,9 @@ syntax = "proto3";
package ESGRAF48; package ESGRAF48;
import "MetaDataModel.proto";
import "V2SvkModel.proto"; import "V2SvkModel.proto";
message DataModel message DataModel
{ {
MetaDataModel MetaData = 1;
V2SvkModel V2Svk = 2; V2SvkModel V2Svk = 2;
} }

8
proto/MetaDataModel.proto
View file

@ -1,8 +0,0 @@
syntax = "proto3";
package ESGRAF48;
message MetaDataModel
{
string dummy = 1;
}

1
source/CMakeLists.txt
View file

@ -19,7 +19,6 @@ qt5_add_resources(LOGO_TEST_QRC
set(DataModel_PROTO_FILES set(DataModel_PROTO_FILES
../proto/DataModel.proto ../proto/DataModel.proto
../proto/MetaDataModel.proto
../proto/V2SvkModel.proto ../proto/V2SvkModel.proto
) )

13
source/MetaData/CMakeLists.txt
View file

@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 3.6)
project(MetaData LANGUAGES CXX) project(MetaData LANGUAGES CXX)
find_package(Qt5Widgets REQUIRED) find_package(Qt5Widgets REQUIRED)
find_package(Protobuf REQUIRED)
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
@ -11,20 +10,10 @@ qt5_wrap_ui(META_DATA_UI
MetaDataWidget.ui MetaDataWidget.ui
) )
set(MetaDataModel_PROTO_FILES
../../proto/MetaDataModel.proto
)
protobuf_generate_cpp(MetaDataModel_PROTO_SRCS MetaDataModel_PROTO_HDRS
${MetaDataModel_PROTO_FILES}
)
add_library(${PROJECT_NAME} add_library(${PROJECT_NAME}
MetaDataModel.cpp MetaDataModel.cpp
MetaDataWidget.cpp MetaDataWidget.cpp
${META_DATA_UI} ${META_DATA_UI}
${MetaDateModel_PROTO_SRCS}
${MetaDateModel_PROTO_HDRS}
) )
set_target_properties(${PROJECT_NAME} set_target_properties(${PROJECT_NAME}
@ -34,7 +23,6 @@ set_target_properties(${PROJECT_NAME}
target_include_directories(${PROJECT_NAME} target_include_directories(${PROJECT_NAME}
PRIVATE PRIVATE
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${Protobuf_INCLUDE_DIRS}
INTERFACE INTERFACE
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )
@ -42,5 +30,4 @@ target_include_directories(${PROJECT_NAME}
target_link_libraries(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME}
PRIVATE PRIVATE
Qt5::Widgets Qt5::Widgets
${Protobuf_LIBRARIES}
) )

4
source/MetaData/MetaDataModel.h
View file

@ -2,8 +2,6 @@
#include "../Age.h" #include "../Age.h"
//#include "MetaDataModel.pb.h"
#include <QAbstractTableModel> #include <QAbstractTableModel>
#include <QString> #include <QString>
#include <QDate> #include <QDate>
@ -33,8 +31,6 @@ public:
void write(QJsonObject &json) const; void write(QJsonObject &json) const;
void read(const QJsonObject &json); void read(const QJsonObject &json);
//void writeProtoBuf(ESGRAF48::MetaDataModel &model) const;
std::string toHtml() const; std::string toHtml() const;
Age getAge() const Age getAge() const