Compare commits
81 Commits
feature/bu
...
main
Author | SHA1 | Date |
---|---|---|
|
c438d96668 | |
|
505b2d9007 | |
|
ce25b53ba0 | |
|
e888f5c59d | |
|
24bc4dbd8b | |
|
c23b4d40a8 | |
|
cd001913c2 | |
|
edc7aca725 | |
|
f5d8b3f3d5 | |
|
f0fe217894 | |
|
7d40320c89 | |
|
390e97c7bf | |
|
a95943ec66 | |
|
4584096309 | |
|
b800e1683d | |
|
468006a416 | |
|
938e607366 | |
|
51271e9595 | |
|
189c24cf61 | |
|
1f5c0de80a | |
|
57fe4256e2 | |
|
1695174303 | |
|
ab862aeaf1 | |
|
f895ec0c1c | |
|
baf0cb8dbe | |
|
13a6468757 | |
|
3c059f134d | |
|
af6316d3a2 | |
|
d3ee95fdb8 | |
|
8678fdb207 | |
|
a09e9a5351 | |
|
d59176afdf | |
|
baf8532edf | |
|
4e1f9dda79 | |
|
7c71733184 | |
|
eff3b42cb0 | |
|
f3249b8720 | |
|
531554d124 | |
|
a479fa3581 | |
|
b7beced1e5 | |
|
6a267cb9b8 | |
|
a8e1596868 | |
|
f42d7eafb0 | |
|
20901898a8 | |
|
9e6b957f92 | |
|
2d88f4c08f | |
|
542d2df992 | |
|
34f52851f1 | |
|
8a0d2822fe | |
|
1a4b40eaae | |
|
946ac43e5c | |
|
88e75d2488 | |
|
8444eda4ee | |
|
51937bb499 | |
|
c044bebece | |
|
6cd13ad94b | |
|
97192b6190 | |
|
fc9e387b28 | |
|
95fc970488 | |
|
e5232aee9d | |
|
d298238ae8 | |
|
61bcb7566c | |
|
463dc275d0 | |
|
59c409c872 | |
|
bdf9706e58 | |
|
f38b9194fd | |
|
4fefdc65c5 | |
|
458de36cbc | |
|
220f92453d | |
|
09f8fa4faf | |
|
a2b85eba83 | |
|
3002cb4a03 | |
|
d1d635bd95 | |
|
4c7285a64a | |
|
611e34fc5e | |
|
a444551e6d | |
|
188f33c736 | |
|
ef5686e83e | |
|
5a88e99a15 | |
|
5e01ad1498 | |
|
aa6bddb0e4 |
|
@ -1,5 +1,9 @@
|
||||||
compile_commands.json
|
compile_commands.json
|
||||||
_*/
|
_*/
|
||||||
|
build/
|
||||||
build-*
|
build-*
|
||||||
*.user
|
*.user
|
||||||
tags
|
tags
|
||||||
|
*.esgraf48
|
||||||
|
*.swp
|
||||||
|
*.pdf
|
||||||
|
|
|
@ -1,3 +0,0 @@
|
||||||
[submodule "protobuf"]
|
|
||||||
path = protobuf
|
|
||||||
url = https://github.com/google/protobuf.git
|
|
|
@ -2,5 +2,14 @@ cmake_minimum_required(VERSION 3.5)
|
||||||
|
|
||||||
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
|
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
|
||||||
|
|
||||||
add_subdirectory(protobuf/cmake)
|
include(cmake/conan.cmake)
|
||||||
|
conan_cmake_run(CONANFILE conanfile.txt
|
||||||
|
BASIC_SETUP
|
||||||
|
BUILD missing
|
||||||
|
)
|
||||||
|
|
||||||
|
include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
|
||||||
|
conan_basic_setup()
|
||||||
|
|
||||||
add_subdirectory(source)
|
add_subdirectory(source)
|
||||||
|
#add_subdirectory(test)
|
||||||
|
|
|
@ -0,0 +1,516 @@
|
||||||
|
# The MIT License (MIT)
|
||||||
|
|
||||||
|
# Copyright (c) 2018 JFrog
|
||||||
|
|
||||||
|
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
# of this software and associated documentation files (the "Software"), to deal
|
||||||
|
# in the Software without restriction, including without limitation the rights
|
||||||
|
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
# copies of the Software, and to permit persons to whom the Software is
|
||||||
|
# furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
# The above copyright notice and this permission notice shall be included in all
|
||||||
|
# copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
# SOFTWARE.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# This file comes from: https://github.com/conan-io/cmake-conan. Please refer
|
||||||
|
# to this repository for issues and documentation.
|
||||||
|
|
||||||
|
# Its purpose is to wrap and launch Conan C/C++ Package Manager when cmake is called.
|
||||||
|
# It will take CMake current settings (os, compiler, compiler version, architecture)
|
||||||
|
# and translate them to conan settings for installing and retrieving dependencies.
|
||||||
|
|
||||||
|
# It is intended to facilitate developers building projects that have conan dependencies,
|
||||||
|
# but it is only necessary on the end-user side. It is not necessary to create conan
|
||||||
|
# packages, in fact it shouldn't be use for that. Check the project documentation.
|
||||||
|
|
||||||
|
|
||||||
|
include(CMakeParseArguments)
|
||||||
|
|
||||||
|
function(_get_msvc_ide_version result)
|
||||||
|
set(${result} "" PARENT_SCOPE)
|
||||||
|
if(NOT MSVC_VERSION VERSION_LESS 1400 AND MSVC_VERSION VERSION_LESS 1500)
|
||||||
|
set(${result} 8 PARENT_SCOPE)
|
||||||
|
elseif(NOT MSVC_VERSION VERSION_LESS 1500 AND MSVC_VERSION VERSION_LESS 1600)
|
||||||
|
set(${result} 9 PARENT_SCOPE)
|
||||||
|
elseif(NOT MSVC_VERSION VERSION_LESS 1600 AND MSVC_VERSION VERSION_LESS 1700)
|
||||||
|
set(${result} 10 PARENT_SCOPE)
|
||||||
|
elseif(NOT MSVC_VERSION VERSION_LESS 1700 AND MSVC_VERSION VERSION_LESS 1800)
|
||||||
|
set(${result} 11 PARENT_SCOPE)
|
||||||
|
elseif(NOT MSVC_VERSION VERSION_LESS 1800 AND MSVC_VERSION VERSION_LESS 1900)
|
||||||
|
set(${result} 12 PARENT_SCOPE)
|
||||||
|
elseif(NOT MSVC_VERSION VERSION_LESS 1900 AND MSVC_VERSION VERSION_LESS 1910)
|
||||||
|
set(${result} 14 PARENT_SCOPE)
|
||||||
|
elseif(NOT MSVC_VERSION VERSION_LESS 1910 AND MSVC_VERSION VERSION_LESS 1920)
|
||||||
|
set(${result} 15 PARENT_SCOPE)
|
||||||
|
else()
|
||||||
|
message(FATAL_ERROR "Conan: Unknown MSVC compiler version [${MSVC_VERSION}]")
|
||||||
|
endif()
|
||||||
|
endfunction()
|
||||||
|
|
||||||
|
function(conan_cmake_settings result)
|
||||||
|
#message(STATUS "COMPILER " ${CMAKE_CXX_COMPILER})
|
||||||
|
#message(STATUS "COMPILER " ${CMAKE_CXX_COMPILER_ID})
|
||||||
|
#message(STATUS "VERSION " ${CMAKE_CXX_COMPILER_VERSION})
|
||||||
|
#message(STATUS "FLAGS " ${CMAKE_LANG_FLAGS})
|
||||||
|
#message(STATUS "LIB ARCH " ${CMAKE_CXX_LIBRARY_ARCHITECTURE})
|
||||||
|
#message(STATUS "BUILD TYPE " ${CMAKE_BUILD_TYPE})
|
||||||
|
#message(STATUS "GENERATOR " ${CMAKE_GENERATOR})
|
||||||
|
#message(STATUS "GENERATOR WIN64 " ${CMAKE_CL_64})
|
||||||
|
|
||||||
|
message(STATUS "Conan: Automatic detection of conan settings from cmake")
|
||||||
|
|
||||||
|
parse_arguments(${ARGV})
|
||||||
|
|
||||||
|
if(ARGUMENTS_BUILD_TYPE)
|
||||||
|
set(_CONAN_SETTING_BUILD_TYPE ${ARGUMENTS_BUILD_TYPE})
|
||||||
|
elseif(CMAKE_BUILD_TYPE)
|
||||||
|
set(_CONAN_SETTING_BUILD_TYPE ${CMAKE_BUILD_TYPE})
|
||||||
|
else()
|
||||||
|
message(FATAL_ERROR "Please specify in command line CMAKE_BUILD_TYPE (-DCMAKE_BUILD_TYPE=Release)")
|
||||||
|
endif()
|
||||||
|
if(ARGUMENTS_ARCH)
|
||||||
|
set(_CONAN_SETTING_ARCH ${ARGUMENTS_ARCH})
|
||||||
|
endif()
|
||||||
|
#handle -s os setting
|
||||||
|
if(CMAKE_SYSTEM_NAME)
|
||||||
|
#use default conan os setting if CMAKE_SYSTEM_NAME is not defined
|
||||||
|
set(CONAN_SYSTEM_NAME ${CMAKE_SYSTEM_NAME})
|
||||||
|
if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
|
||||||
|
set(CONAN_SYSTEM_NAME Macos)
|
||||||
|
endif()
|
||||||
|
set(CONAN_SUPPORTED_PLATFORMS Windows Linux Macos Android iOS FreeBSD WindowsStore)
|
||||||
|
list (FIND CONAN_SUPPORTED_PLATFORMS "${CONAN_SYSTEM_NAME}" _index)
|
||||||
|
if (${_index} GREATER -1)
|
||||||
|
#check if the cmake system is a conan supported one
|
||||||
|
set(_CONAN_SETTING_OS ${CONAN_SYSTEM_NAME})
|
||||||
|
else()
|
||||||
|
message(FATAL_ERROR "cmake system ${CONAN_SYSTEM_NAME} is not supported by conan. Use one of ${CONAN_SUPPORTED_PLATFORMS}")
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
get_property(_languages GLOBAL PROPERTY ENABLED_LANGUAGES)
|
||||||
|
if (";${_languages};" MATCHES ";CXX;")
|
||||||
|
set(LANGUAGE CXX)
|
||||||
|
set(USING_CXX 1)
|
||||||
|
elseif (";${_languages};" MATCHES ";C;")
|
||||||
|
set(LANGUAGE C)
|
||||||
|
set(USING_CXX 0)
|
||||||
|
else ()
|
||||||
|
message(FATAL_ERROR "Conan: Neither C or C++ was detected as a language for the project. Unabled to detect compiler version.")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if (${CMAKE_${LANGUAGE}_COMPILER_ID} STREQUAL GNU)
|
||||||
|
# using GCC
|
||||||
|
# TODO: Handle other params
|
||||||
|
string(REPLACE "." ";" VERSION_LIST ${CMAKE_${LANGUAGE}_COMPILER_VERSION})
|
||||||
|
list(GET VERSION_LIST 0 MAJOR)
|
||||||
|
list(GET VERSION_LIST 1 MINOR)
|
||||||
|
set(COMPILER_VERSION ${MAJOR}.${MINOR})
|
||||||
|
if(${MAJOR} GREATER 4)
|
||||||
|
set(COMPILER_VERSION ${MAJOR})
|
||||||
|
endif()
|
||||||
|
set(_CONAN_SETTING_COMPILER gcc)
|
||||||
|
set(_CONAN_SETTING_COMPILER_VERSION ${COMPILER_VERSION})
|
||||||
|
if (USING_CXX)
|
||||||
|
conan_cmake_detect_gnu_libcxx(_LIBCXX)
|
||||||
|
set(_CONAN_SETTING_COMPILER_LIBCXX ${_LIBCXX})
|
||||||
|
endif ()
|
||||||
|
elseif (${CMAKE_${LANGUAGE}_COMPILER_ID} STREQUAL AppleClang)
|
||||||
|
# using AppleClang
|
||||||
|
string(REPLACE "." ";" VERSION_LIST ${CMAKE_${LANGUAGE}_COMPILER_VERSION})
|
||||||
|
list(GET VERSION_LIST 0 MAJOR)
|
||||||
|
list(GET VERSION_LIST 1 MINOR)
|
||||||
|
set(_CONAN_SETTING_COMPILER apple-clang)
|
||||||
|
set(_CONAN_SETTING_COMPILER_VERSION ${MAJOR}.${MINOR})
|
||||||
|
if (USING_CXX)
|
||||||
|
set(_CONAN_SETTING_COMPILER_LIBCXX libc++)
|
||||||
|
endif ()
|
||||||
|
elseif (${CMAKE_${LANGUAGE}_COMPILER_ID} STREQUAL Clang)
|
||||||
|
string(REPLACE "." ";" VERSION_LIST ${CMAKE_${LANGUAGE}_COMPILER_VERSION})
|
||||||
|
list(GET VERSION_LIST 0 MAJOR)
|
||||||
|
list(GET VERSION_LIST 1 MINOR)
|
||||||
|
if(APPLE)
|
||||||
|
cmake_policy(GET CMP0025 APPLE_CLANG_POLICY_ENABLED)
|
||||||
|
if(NOT APPLE_CLANG_POLICY_ENABLED)
|
||||||
|
message(STATUS "Conan: APPLE and Clang detected. Assuming apple-clang compiler. Set CMP0025 to avoid it")
|
||||||
|
set(_CONAN_SETTING_COMPILER apple-clang)
|
||||||
|
set(_CONAN_SETTING_COMPILER_VERSION ${MAJOR}.${MINOR})
|
||||||
|
else()
|
||||||
|
set(_CONAN_SETTING_COMPILER clang)
|
||||||
|
set(_CONAN_SETTING_COMPILER_VERSION ${MAJOR}.${MINOR})
|
||||||
|
endif()
|
||||||
|
if (USING_CXX)
|
||||||
|
set(_CONAN_SETTING_COMPILER_LIBCXX libc++)
|
||||||
|
endif ()
|
||||||
|
else()
|
||||||
|
set(_CONAN_SETTING_COMPILER clang)
|
||||||
|
if(${MAJOR} GREATER 7)
|
||||||
|
set(_CONAN_SETTING_COMPILER_VERSION ${MAJOR})
|
||||||
|
else()
|
||||||
|
set(_CONAN_SETTING_COMPILER_VERSION ${MAJOR}.${MINOR})
|
||||||
|
endif()
|
||||||
|
if (USING_CXX)
|
||||||
|
conan_cmake_detect_gnu_libcxx(_LIBCXX)
|
||||||
|
set(_CONAN_SETTING_COMPILER_LIBCXX ${_LIBCXX})
|
||||||
|
endif ()
|
||||||
|
endif()
|
||||||
|
elseif(${CMAKE_${LANGUAGE}_COMPILER_ID} STREQUAL MSVC)
|
||||||
|
set(_VISUAL "Visual Studio")
|
||||||
|
_get_msvc_ide_version(_VISUAL_VERSION)
|
||||||
|
if("${_VISUAL_VERSION}" STREQUAL "")
|
||||||
|
message(FATAL_ERROR "Conan: Visual Studio not recognized")
|
||||||
|
else()
|
||||||
|
set(_CONAN_SETTING_COMPILER ${_VISUAL})
|
||||||
|
set(_CONAN_SETTING_COMPILER_VERSION ${_VISUAL_VERSION})
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(NOT _CONAN_SETTING_ARCH)
|
||||||
|
if (MSVC_${LANGUAGE}_ARCHITECTURE_ID MATCHES "64")
|
||||||
|
set(_CONAN_SETTING_ARCH x86_64)
|
||||||
|
elseif (MSVC_${LANGUAGE}_ARCHITECTURE_ID MATCHES "^ARM")
|
||||||
|
message(STATUS "Conan: Using default ARM architecture from MSVC")
|
||||||
|
set(_CONAN_SETTING_ARCH armv6)
|
||||||
|
elseif (MSVC_${LANGUAGE}_ARCHITECTURE_ID MATCHES "86")
|
||||||
|
set(_CONAN_SETTING_ARCH x86)
|
||||||
|
else ()
|
||||||
|
message(FATAL_ERROR "Conan: Unknown MSVC architecture [${MSVC_${LANGUAGE}_ARCHITECTURE_ID}]")
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
conan_cmake_detect_vs_runtime(_vs_runtime)
|
||||||
|
message(STATUS "Conan: Detected VS runtime: ${_vs_runtime}")
|
||||||
|
set(_CONAN_SETTING_COMPILER_RUNTIME ${_vs_runtime})
|
||||||
|
|
||||||
|
if (CMAKE_GENERATOR_TOOLSET)
|
||||||
|
set(_CONAN_SETTING_COMPILER_TOOLSET ${CMAKE_VS_PLATFORM_TOOLSET})
|
||||||
|
elseif(CMAKE_VS_PLATFORM_TOOLSET AND (CMAKE_GENERATOR STREQUAL "Ninja"))
|
||||||
|
set(_CONAN_SETTING_COMPILER_TOOLSET ${CMAKE_VS_PLATFORM_TOOLSET})
|
||||||
|
endif()
|
||||||
|
else()
|
||||||
|
message(FATAL_ERROR "Conan: compiler setup not recognized")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# If profile is defined it is used
|
||||||
|
if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND ARGUMENTS_DEBUG_PROFILE)
|
||||||
|
set(_SETTINGS -pr ${ARGUMENTS_DEBUG_PROFILE})
|
||||||
|
elseif(CMAKE_BUILD_TYPE STREQUAL "Release" AND ARGUMENTS_RELEASE_PROFILE)
|
||||||
|
set(_SETTINGS -pr ${ARGUMENTS_RELEASE_PROFILE})
|
||||||
|
elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo" AND ARGUMENTS_RELWITHDEBINFO_PROFILE)
|
||||||
|
set(_SETTINGS -pr ${ARGUMENTS_RELWITHDEBINFO_PROFILE})
|
||||||
|
elseif(CMAKE_BUILD_TYPE STREQUAL "MinSizeRel" AND ARGUMENTS_MINSIZEREL_PROFILE)
|
||||||
|
set(_SETTINGS -pr ${ARGUMENTS_MINSIZEREL_PROFILE})
|
||||||
|
elseif(ARGUMENTS_PROFILE)
|
||||||
|
set(_SETTINGS -pr ${ARGUMENTS_PROFILE})
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(NOT _SETTINGS OR ARGUMENTS_PROFILE_AUTO STREQUAL "ALL")
|
||||||
|
set(ARGUMENTS_PROFILE_AUTO arch build_type compiler compiler.version
|
||||||
|
compiler.runtime compiler.libcxx compiler.toolset)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# Automatic from CMake
|
||||||
|
foreach(ARG ${ARGUMENTS_PROFILE_AUTO})
|
||||||
|
string(TOUPPER ${ARG} _arg_name)
|
||||||
|
string(REPLACE "." "_" _arg_name ${_arg_name})
|
||||||
|
if(_CONAN_SETTING_${_arg_name})
|
||||||
|
set(_SETTINGS ${_SETTINGS} -s ${ARG}=${_CONAN_SETTING_${_arg_name}})
|
||||||
|
endif()
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
foreach(ARG ${ARGUMENTS_SETTINGS})
|
||||||
|
set(_SETTINGS ${_SETTINGS} -s ${ARG})
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
message(STATUS "Conan: Settings= ${_SETTINGS}")
|
||||||
|
|
||||||
|
set(${result} ${_SETTINGS} PARENT_SCOPE)
|
||||||
|
endfunction()
|
||||||
|
|
||||||
|
|
||||||
|
function(conan_cmake_detect_gnu_libcxx result)
|
||||||
|
# Allow -D_GLIBCXX_USE_CXX11_ABI=ON/OFF as argument to cmake
|
||||||
|
if(DEFINED _GLIBCXX_USE_CXX11_ABI)
|
||||||
|
if(_GLIBCXX_USE_CXX11_ABI)
|
||||||
|
set(${result} libstdc++11 PARENT_SCOPE)
|
||||||
|
return()
|
||||||
|
else()
|
||||||
|
set(${result} libstdc++ PARENT_SCOPE)
|
||||||
|
return()
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# Check if there's any add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0)
|
||||||
|
get_directory_property(defines DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMPILE_DEFINITIONS)
|
||||||
|
foreach(define ${defines})
|
||||||
|
if(define STREQUAL "_GLIBCXX_USE_CXX11_ABI=0")
|
||||||
|
set(${result} libstdc++ PARENT_SCOPE)
|
||||||
|
return()
|
||||||
|
endif()
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
# Use C++11 stdlib as default if gcc is 5.1+
|
||||||
|
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.1")
|
||||||
|
set(${result} libstdc++ PARENT_SCOPE)
|
||||||
|
else()
|
||||||
|
set(${result} libstdc++11 PARENT_SCOPE)
|
||||||
|
endif()
|
||||||
|
endfunction()
|
||||||
|
|
||||||
|
|
||||||
|
function(conan_cmake_detect_vs_runtime result)
|
||||||
|
string(TOUPPER ${CMAKE_BUILD_TYPE} build_type)
|
||||||
|
set(variables CMAKE_CXX_FLAGS_${build_type} CMAKE_C_FLAGS_${build_type} CMAKE_CXX_FLAGS CMAKE_C_FLAGS)
|
||||||
|
foreach(variable ${variables})
|
||||||
|
string(REPLACE " " ";" flags ${${variable}})
|
||||||
|
foreach (flag ${flags})
|
||||||
|
if(${flag} STREQUAL "/MD" OR ${flag} STREQUAL "/MDd" OR ${flag} STREQUAL "/MT" OR ${flag} STREQUAL "/MTd")
|
||||||
|
string(SUBSTRING ${flag} 1 -1 runtime)
|
||||||
|
set(${result} ${runtime} PARENT_SCOPE)
|
||||||
|
return()
|
||||||
|
endif()
|
||||||
|
endforeach()
|
||||||
|
endforeach()
|
||||||
|
if(${build_type} STREQUAL "DEBUG")
|
||||||
|
set(${result} "MDd" PARENT_SCOPE)
|
||||||
|
else()
|
||||||
|
set(${result} "MD" PARENT_SCOPE)
|
||||||
|
endif()
|
||||||
|
endfunction()
|
||||||
|
|
||||||
|
|
||||||
|
macro(parse_arguments)
|
||||||
|
set(options BASIC_SETUP CMAKE_TARGETS UPDATE KEEP_RPATHS NO_OUTPUT_DIRS OUTPUT_QUIET)
|
||||||
|
set(oneValueArgs CONANFILE DEBUG_PROFILE RELEASE_PROFILE RELWITHDEBINFO_PROFILE MINSIZEREL_PROFILE
|
||||||
|
PROFILE ARCH BUILD_TYPE INSTALL_FOLDER CONAN_COMMAND)
|
||||||
|
set(multiValueArgs REQUIRES OPTIONS IMPORTS SETTINGS BUILD ENV GENERATORS PROFILE_AUTO)
|
||||||
|
cmake_parse_arguments(ARGUMENTS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
|
||||||
|
endmacro()
|
||||||
|
|
||||||
|
function(conan_cmake_install)
|
||||||
|
# Calls "conan install"
|
||||||
|
# Argument BUILD is equivalant to --build={missing, PkgName,...} or
|
||||||
|
# --build when argument is 'BUILD all' (which builds all packages from source)
|
||||||
|
# Argument CONAN_COMMAND, to specify the conan path, e.g. in case of running from source
|
||||||
|
# cmake does not identify conan as command, even if it is +x and it is in the path
|
||||||
|
parse_arguments(${ARGV})
|
||||||
|
|
||||||
|
if(CONAN_CMAKE_MULTI)
|
||||||
|
set(ARGUMENTS_GENERATORS ${ARGUMENTS_GENERATORS} cmake_multi)
|
||||||
|
else()
|
||||||
|
set(ARGUMENTS_GENERATORS ${ARGUMENTS_GENERATORS} cmake)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set(CONAN_BUILD_POLICY "")
|
||||||
|
foreach(ARG ${ARGUMENTS_BUILD})
|
||||||
|
if(${ARG} STREQUAL "all")
|
||||||
|
set(CONAN_BUILD_POLICY ${CONAN_BUILD_POLICY} --build)
|
||||||
|
break()
|
||||||
|
else()
|
||||||
|
set(CONAN_BUILD_POLICY ${CONAN_BUILD_POLICY} --build=${ARG})
|
||||||
|
endif()
|
||||||
|
endforeach()
|
||||||
|
if(ARGUMENTS_CONAN_COMMAND)
|
||||||
|
set(conan_command ${ARGUMENTS_CONAN_COMMAND})
|
||||||
|
else()
|
||||||
|
set(conan_command conan)
|
||||||
|
endif()
|
||||||
|
set(CONAN_OPTIONS "")
|
||||||
|
if(ARGUMENTS_CONANFILE)
|
||||||
|
set(CONANFILE ${CMAKE_CURRENT_SOURCE_DIR}/${ARGUMENTS_CONANFILE})
|
||||||
|
# A conan file has been specified - apply specified options as well if provided
|
||||||
|
foreach(ARG ${ARGUMENTS_OPTIONS})
|
||||||
|
set(CONAN_OPTIONS ${CONAN_OPTIONS} -o=${ARG})
|
||||||
|
endforeach()
|
||||||
|
else()
|
||||||
|
set(CONANFILE ".")
|
||||||
|
endif()
|
||||||
|
if(ARGUMENTS_UPDATE)
|
||||||
|
set(CONAN_INSTALL_UPDATE --update)
|
||||||
|
endif()
|
||||||
|
set(CONAN_INSTALL_FOLDER "")
|
||||||
|
if(ARGUMENTS_INSTALL_FOLDER)
|
||||||
|
set(CONAN_INSTALL_FOLDER -if=${ARGUMENTS_INSTALL_FOLDER})
|
||||||
|
endif()
|
||||||
|
foreach(ARG ${ARGUMENTS_GENERATORS})
|
||||||
|
set(CONAN_GENERATORS ${CONAN_GENERATORS} -g=${ARG})
|
||||||
|
endforeach()
|
||||||
|
foreach(ARG ${ARGUMENTS_ENV})
|
||||||
|
set(CONAN_ENV_VARS ${CONAN_ENV_VARS} -e=${ARG})
|
||||||
|
endforeach()
|
||||||
|
set(conan_args install ${CONANFILE} ${settings} ${CONAN_ENV_VARS} ${CONAN_GENERATORS} ${CONAN_BUILD_POLICY} ${CONAN_INSTALL_UPDATE} ${CONAN_OPTIONS} ${CONAN_INSTALL_FOLDER})
|
||||||
|
|
||||||
|
string (REPLACE ";" " " _conan_args "${conan_args}")
|
||||||
|
message(STATUS "Conan executing: ${conan_command} ${_conan_args}")
|
||||||
|
|
||||||
|
if(ARGUMENTS_OUTPUT_QUIET)
|
||||||
|
set(OUTPUT_CONTROL OUTPUT_QUIET)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
execute_process(COMMAND ${conan_command} ${conan_args}
|
||||||
|
RESULT_VARIABLE return_code
|
||||||
|
OUTPUT_VARIABLE conan_output
|
||||||
|
ERROR_VARIABLE conan_output
|
||||||
|
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
|
||||||
|
|
||||||
|
message(STATUS "${conan_output}")
|
||||||
|
|
||||||
|
if(NOT "${return_code}" STREQUAL "0")
|
||||||
|
message(FATAL_ERROR "Conan install failed='${return_code}'")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
endfunction()
|
||||||
|
|
||||||
|
|
||||||
|
function(conan_cmake_setup_conanfile)
|
||||||
|
parse_arguments(${ARGV})
|
||||||
|
if(ARGUMENTS_CONANFILE)
|
||||||
|
# configure_file will make sure cmake re-runs when conanfile is updated
|
||||||
|
configure_file(${ARGUMENTS_CONANFILE} ${ARGUMENTS_CONANFILE}.junk)
|
||||||
|
file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/${ARGUMENTS_CONANFILE}.junk)
|
||||||
|
else()
|
||||||
|
conan_cmake_generate_conanfile(${ARGV})
|
||||||
|
endif()
|
||||||
|
endfunction()
|
||||||
|
|
||||||
|
function(conan_cmake_generate_conanfile)
|
||||||
|
# Generate, writing in disk a conanfile.txt with the requires, options, and imports
|
||||||
|
# specified as arguments
|
||||||
|
# This will be considered as temporary file, generated in CMAKE_CURRENT_BINARY_DIR)
|
||||||
|
parse_arguments(${ARGV})
|
||||||
|
set(_FN "${CMAKE_CURRENT_BINARY_DIR}/conanfile.txt")
|
||||||
|
|
||||||
|
file(WRITE ${_FN} "[generators]\ncmake\n\n[requires]\n")
|
||||||
|
foreach(ARG ${ARGUMENTS_REQUIRES})
|
||||||
|
file(APPEND ${_FN} ${ARG} "\n")
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
file(APPEND ${_FN} ${ARG} "\n[options]\n")
|
||||||
|
foreach(ARG ${ARGUMENTS_OPTIONS})
|
||||||
|
file(APPEND ${_FN} ${ARG} "\n")
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
file(APPEND ${_FN} ${ARG} "\n[imports]\n")
|
||||||
|
foreach(ARG ${ARGUMENTS_IMPORTS})
|
||||||
|
file(APPEND ${_FN} ${ARG} "\n")
|
||||||
|
endforeach()
|
||||||
|
endfunction()
|
||||||
|
|
||||||
|
|
||||||
|
macro(conan_load_buildinfo)
|
||||||
|
if(CONAN_CMAKE_MULTI)
|
||||||
|
set(_CONANBUILDINFO conanbuildinfo_multi.cmake)
|
||||||
|
else()
|
||||||
|
set(_CONANBUILDINFO conanbuildinfo.cmake)
|
||||||
|
endif()
|
||||||
|
# Checks for the existence of conanbuildinfo.cmake, and loads it
|
||||||
|
# important that it is macro, so variables defined at parent scope
|
||||||
|
if(EXISTS "${CMAKE_CURRENT_BINARY_DIR}/${_CONANBUILDINFO}")
|
||||||
|
message(STATUS "Conan: Loading ${_CONANBUILDINFO}")
|
||||||
|
include(${CMAKE_CURRENT_BINARY_DIR}/${_CONANBUILDINFO})
|
||||||
|
else()
|
||||||
|
message(FATAL_ERROR "${_CONANBUILDINFO} doesn't exist in ${CMAKE_CURRENT_BINARY_DIR}")
|
||||||
|
endif()
|
||||||
|
endmacro()
|
||||||
|
|
||||||
|
|
||||||
|
macro(conan_cmake_run)
|
||||||
|
parse_arguments(${ARGV})
|
||||||
|
|
||||||
|
if(CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE AND NOT CONAN_EXPORTED
|
||||||
|
AND NOT ARGUMENTS_BUILD_TYPE)
|
||||||
|
set(CONAN_CMAKE_MULTI ON)
|
||||||
|
message(STATUS "Conan: Using cmake-multi generator")
|
||||||
|
else()
|
||||||
|
set(CONAN_CMAKE_MULTI OFF)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(NOT CONAN_EXPORTED)
|
||||||
|
conan_cmake_setup_conanfile(${ARGV})
|
||||||
|
if(CONAN_CMAKE_MULTI)
|
||||||
|
foreach(CMAKE_BUILD_TYPE "Release" "Debug")
|
||||||
|
set(ENV{CONAN_IMPORT_PATH} ${CMAKE_BUILD_TYPE})
|
||||||
|
conan_cmake_settings(settings ${ARGV})
|
||||||
|
conan_cmake_install(SETTINGS ${settings} ${ARGV})
|
||||||
|
endforeach()
|
||||||
|
set(CMAKE_BUILD_TYPE)
|
||||||
|
else()
|
||||||
|
conan_cmake_settings(settings ${ARGV})
|
||||||
|
conan_cmake_install(SETTINGS ${settings} ${ARGV})
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
conan_load_buildinfo()
|
||||||
|
|
||||||
|
if(ARGUMENTS_BASIC_SETUP)
|
||||||
|
foreach(_option CMAKE_TARGETS KEEP_RPATHS NO_OUTPUT_DIRS)
|
||||||
|
if(ARGUMENTS_${_option})
|
||||||
|
if(${_option} STREQUAL "CMAKE_TARGETS")
|
||||||
|
list(APPEND _setup_options "TARGETS")
|
||||||
|
else()
|
||||||
|
list(APPEND _setup_options ${_option})
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
endforeach()
|
||||||
|
conan_basic_setup(${_setup_options})
|
||||||
|
endif()
|
||||||
|
endmacro()
|
||||||
|
|
||||||
|
macro(conan_check)
|
||||||
|
# Checks conan availability in PATH
|
||||||
|
# Arguments REQUIRED and VERSION are optional
|
||||||
|
# Example usage:
|
||||||
|
# conan_check(VERSION 1.0.0 REQUIRED)
|
||||||
|
message(STATUS "Conan: checking conan executable in path")
|
||||||
|
set(options REQUIRED)
|
||||||
|
set(oneValueArgs VERSION)
|
||||||
|
cmake_parse_arguments(CONAN "${options}" "${oneValueArgs}" "" ${ARGN})
|
||||||
|
|
||||||
|
find_program(CONAN_CMD conan)
|
||||||
|
if(NOT CONAN_CMD AND CONAN_REQUIRED)
|
||||||
|
message(FATAL_ERROR "Conan executable not found!")
|
||||||
|
endif()
|
||||||
|
message(STATUS "Conan: Found program ${CONAN_CMD}")
|
||||||
|
execute_process(COMMAND ${CONAN_CMD} --version
|
||||||
|
OUTPUT_VARIABLE CONAN_VERSION_OUTPUT
|
||||||
|
ERROR_VARIABLE CONAN_VERSION_OUTPUT)
|
||||||
|
message(STATUS "Conan: Version found ${CONAN_VERSION_OUTPUT}")
|
||||||
|
|
||||||
|
if(DEFINED CONAN_VERSION)
|
||||||
|
string(REGEX MATCH ".*Conan version ([0-9]+\.[0-9]+\.[0-9]+)" FOO
|
||||||
|
"${CONAN_VERSION_OUTPUT}")
|
||||||
|
if(${CMAKE_MATCH_1} VERSION_LESS ${CONAN_VERSION})
|
||||||
|
message(FATAL_ERROR "Conan outdated. Installed: ${CONAN_VERSION}, \
|
||||||
|
required: ${CONAN_VERSION_REQUIRED}. Consider updating via 'pip \
|
||||||
|
install conan --upgrade'.")
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
endmacro()
|
||||||
|
|
||||||
|
macro(conan_add_remote)
|
||||||
|
# Adds a remote
|
||||||
|
# Arguments URL and NAME are required, INDEX is optional
|
||||||
|
# Example usage:
|
||||||
|
# conan_add_remote(NAME bincrafters INDEX 1
|
||||||
|
# URL https://api.bintray.com/conan/bincrafters/public-conan)
|
||||||
|
set(oneValueArgs URL NAME INDEX)
|
||||||
|
cmake_parse_arguments(CONAN "" "${oneValueArgs}" "" ${ARGN})
|
||||||
|
|
||||||
|
if(DEFINED CONAN_INDEX)
|
||||||
|
set(CONAN_INDEX_ARG "-i ${CONAN_INDEX}")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
message(STATUS "Conan: Adding ${CONAN_NAME} remote repositoy (${CONAN_URL})")
|
||||||
|
execute_process(COMMAND ${CONAN_CMD} remote add ${CONAN_NAME} ${CONAN_URL}
|
||||||
|
${CONAN_INDEX_ARG} -f)
|
||||||
|
endmacro()
|
||||||
|
|
|
@ -0,0 +1,13 @@
|
||||||
|
[requires]
|
||||||
|
qt/5.12.0@bincrafters/stable
|
||||||
|
protobuf/3.6.1@bincrafters/stable
|
||||||
|
protoc_installer/3.6.1@bincrafters/stable
|
||||||
|
catch2/2.4.2@bincrafters/stable
|
||||||
|
|
||||||
|
[generators]
|
||||||
|
cmake
|
||||||
|
|
||||||
|
[options]
|
||||||
|
protobuf:shared=False
|
||||||
|
qt:qttools=True
|
||||||
|
qt:qttranslations=True
|
|
@ -6,14 +6,14 @@ message DativModel
|
||||||
{
|
{
|
||||||
message TiereModel
|
message TiereModel
|
||||||
{
|
{
|
||||||
bool Tiger = 1;
|
bool Affe = 1;
|
||||||
bool Katze = 2;
|
bool Gans = 2;
|
||||||
bool Affe = 3;
|
bool Tiger = 3;
|
||||||
bool Gans = 4;
|
bool Hund = 4;
|
||||||
bool Baer = 5;
|
bool Elefant = 5;
|
||||||
bool Pferd = 6;
|
bool Pferd = 6;
|
||||||
bool Hund = 7;
|
bool Baer = 7;
|
||||||
bool Elefant = 8;
|
bool Katze = 8;
|
||||||
}
|
}
|
||||||
|
|
||||||
message VersteckeModel
|
message VersteckeModel
|
||||||
|
@ -28,19 +28,19 @@ message DativModel
|
||||||
bool Baum2 = 8;
|
bool Baum2 = 8;
|
||||||
}
|
}
|
||||||
|
|
||||||
message FutterModel
|
message NomTiereModel
|
||||||
{
|
{
|
||||||
bool Salat = 1;
|
bool Gans = 1;
|
||||||
bool Fleisch = 2;
|
bool Tiger = 2;
|
||||||
bool Knochen = 3;
|
bool Hund = 3;
|
||||||
bool Banane = 4;
|
bool Affe = 4;
|
||||||
bool Apfel = 5;
|
bool Elefant = 5;
|
||||||
bool Karotte = 6;
|
bool Pferd = 6;
|
||||||
bool Honig = 7;
|
bool Baer = 7;
|
||||||
bool Zucker = 8;
|
bool Katze = 8;
|
||||||
}
|
}
|
||||||
|
|
||||||
TiereModel Tiere = 1;
|
TiereModel Tiere = 1;
|
||||||
VersteckeModel Verstecke = 2;
|
VersteckeModel Verstecke = 2;
|
||||||
FutterModel Futter = 3;
|
NomTiereModel NomTiere = 3;
|
||||||
}
|
}
|
||||||
|
|
1
protobuf
1
protobuf
|
@ -1 +0,0 @@
|
||||||
Subproject commit 59133296a6e5d5017074e036557ebb658e49d435
|
|
|
@ -4,8 +4,8 @@
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
|
||||||
Age::Age(unsigned int years, unsigned int months)
|
Age::Age(unsigned int years, unsigned int months)
|
||||||
: m_years(years)
|
: m_years(years)
|
||||||
, m_months(months)
|
, m_months(months)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,23 @@
|
||||||
|
cmake_minimum_required(VERSION 3.6)
|
||||||
|
|
||||||
|
project(Age LANGUAGES CXX)
|
||||||
|
|
||||||
|
find_package(Qt5Core REQUIRED)
|
||||||
|
|
||||||
|
add_library(${PROJECT_NAME}
|
||||||
|
Age.cpp
|
||||||
|
)
|
||||||
|
|
||||||
|
set_target_properties(${PROJECT_NAME}
|
||||||
|
PROPERTIES CXX_STANDARD 14
|
||||||
|
)
|
||||||
|
|
||||||
|
target_include_directories(${PROJECT_NAME}
|
||||||
|
PUBLIC
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
|
)
|
||||||
|
|
||||||
|
target_link_libraries(${PROJECT_NAME}
|
||||||
|
PUBLIC
|
||||||
|
Qt5::Core
|
||||||
|
)
|
|
@ -1,6 +1,24 @@
|
||||||
cmake_minimum_required(VERSION 3.6)
|
cmake_minimum_required(VERSION 3.6)
|
||||||
|
|
||||||
project(ESGRAF48 LANGUAGES CXX)
|
set(BUILD_VERSION_MAJOR_MINOR 0.6)
|
||||||
|
|
||||||
|
if ($ENV{BUILD_NUMBER})
|
||||||
|
set(BUILD_VERSION_PATCH $ENV{BUILD_NUMBER})
|
||||||
|
else()
|
||||||
|
set(BUILD_VERSION_PATCH 0)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
project(ESGRAF48
|
||||||
|
VERSION ${BUILD_VERSION_MAJOR_MINOR}.${BUILD_VERSION_PATCH}
|
||||||
|
DESCRIPTION "ESGRAF 4-8"
|
||||||
|
LANGUAGES CXX
|
||||||
|
)
|
||||||
|
|
||||||
|
configure_file(
|
||||||
|
version.h.in
|
||||||
|
version.h
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
find_package(Qt5Widgets REQUIRED)
|
find_package(Qt5Widgets REQUIRED)
|
||||||
find_package(Qt5PrintSupport REQUIRED)
|
find_package(Qt5PrintSupport REQUIRED)
|
||||||
|
@ -34,10 +52,9 @@ protobuf_generate_cpp(DataModel_PROTO_SRCS DataModel_PROTO_HDRS
|
||||||
${DataModel_PROTO_FILES})
|
${DataModel_PROTO_FILES})
|
||||||
|
|
||||||
add_executable(${PROJECT_NAME} WIN32
|
add_executable(${PROJECT_NAME} WIN32
|
||||||
LogoTest.cpp
|
ESGRAF48.cpp
|
||||||
DataModel.cpp
|
DataModel.cpp
|
||||||
mainwindow.cpp
|
mainwindow.cpp
|
||||||
Age.cpp
|
|
||||||
${LOGO_TEST_UI}
|
${LOGO_TEST_UI}
|
||||||
${LOGO_TEST_QRC}
|
${LOGO_TEST_QRC}
|
||||||
${DataModel_PROTO_SRCS}
|
${DataModel_PROTO_SRCS}
|
||||||
|
@ -57,9 +74,11 @@ target_include_directories(${PROJECT_NAME}
|
||||||
|
|
||||||
target_link_libraries(${PROJECT_NAME}
|
target_link_libraries(${PROJECT_NAME}
|
||||||
PRIVATE
|
PRIVATE
|
||||||
|
Age
|
||||||
CheckableItem
|
CheckableItem
|
||||||
CheckableTest
|
CheckableTest
|
||||||
CheckableTestModel
|
CheckableTestModel
|
||||||
|
PrintableModel
|
||||||
MetaData
|
MetaData
|
||||||
VerbEnd
|
VerbEnd
|
||||||
Plural
|
Plural
|
||||||
|
@ -73,9 +92,30 @@ target_link_libraries(${PROJECT_NAME}
|
||||||
${Protobuf_LIBRARIES}
|
${Protobuf_LIBRARIES}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if (WIN32)
|
||||||
|
get_target_property(_qmake_executable Qt5::qmake IMPORTED_LOCATION)
|
||||||
|
message(STATUS "_qmake_executable: ${_qmake_executable}")
|
||||||
|
|
||||||
|
get_filename_component(_qt_bin_dir "${_qmake_executable}" DIRECTORY)
|
||||||
|
message(STATUS "_qt_bin_dir: ${_qt_bin_dir}")
|
||||||
|
|
||||||
|
find_program(WINDEPLOYQT_EXECUTABLE windeployqt HINTS "${_qt_bin_dir}")
|
||||||
|
|
||||||
|
if (WINDEPLOYQT_EXECUTABLE)
|
||||||
|
message(STATUS "Found ${WINDEPLOYQT_EXECUTABLE}")
|
||||||
|
else()
|
||||||
|
message(FATAL_ERROR "Unable to find windeployqt")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
|
||||||
|
COMMAND ${WINDEPLOYQT_EXECUTABLE} $<TARGET_FILE:${PROJECT_NAME}>)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
add_subdirectory(Age)
|
||||||
add_subdirectory(CheckableItem)
|
add_subdirectory(CheckableItem)
|
||||||
add_subdirectory(CheckableTest)
|
add_subdirectory(CheckableTest)
|
||||||
add_subdirectory(CheckableTestModel)
|
add_subdirectory(CheckableTestModel)
|
||||||
|
add_subdirectory(PrintableModel)
|
||||||
|
|
||||||
add_subdirectory(MetaData)
|
add_subdirectory(MetaData)
|
||||||
add_subdirectory(SubTests)
|
add_subdirectory(SubTests)
|
||||||
|
|
|
@ -34,24 +34,3 @@ unsigned int CheckableItem::points() const
|
||||||
{
|
{
|
||||||
return m_checked ? m_value : 0;
|
return m_checked ? m_value : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CheckableItem::write(QJsonObject &json) const
|
|
||||||
{
|
|
||||||
json["text"] = m_text.c_str();
|
|
||||||
json["checked"] = m_checked;
|
|
||||||
}
|
|
||||||
|
|
||||||
void CheckableItem::read(const QJsonObject &json)
|
|
||||||
{
|
|
||||||
const auto &text = json["text"];
|
|
||||||
if (text.isString())
|
|
||||||
{
|
|
||||||
m_text = text.toString().toStdString();
|
|
||||||
}
|
|
||||||
|
|
||||||
const auto &checked = json["checked"];
|
|
||||||
if (checked.isBool())
|
|
||||||
{
|
|
||||||
m_checked = checked.toBool();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
@ -24,7 +24,4 @@ public:
|
||||||
void setValue(unsigned int value);
|
void setValue(unsigned int value);
|
||||||
|
|
||||||
unsigned int points() const;
|
unsigned int points() const;
|
||||||
|
|
||||||
void write(QJsonObject &json) const;
|
|
||||||
void read(const QJsonObject &json);
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -2,6 +2,8 @@
|
||||||
|
|
||||||
#include <QJsonArray>
|
#include <QJsonArray>
|
||||||
|
|
||||||
|
#include <numeric>
|
||||||
|
|
||||||
CheckableItems::CheckableItems(std::initializer_list<std::string> itemNames)
|
CheckableItems::CheckableItems(std::initializer_list<std::string> itemNames)
|
||||||
{
|
{
|
||||||
for (const auto &itemName : itemNames)
|
for (const auto &itemName : itemNames)
|
||||||
|
@ -10,27 +12,9 @@ CheckableItems::CheckableItems(std::initializer_list<std::string> itemNames)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void CheckableItems::write(QJsonArray &json) const
|
unsigned int CheckableItems::getPoints() const
|
||||||
{
|
{
|
||||||
for (const auto &item : *this)
|
return std::accumulate(begin(), end(), 0, [](int base, const CheckableItem &item) {
|
||||||
{
|
return base + item.points();
|
||||||
QJsonObject itemObject;
|
});
|
||||||
item.write(itemObject);
|
|
||||||
json.append(itemObject);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void CheckableItems::read(const QJsonArray &json)
|
|
||||||
{
|
|
||||||
clear();
|
|
||||||
|
|
||||||
for (const auto &itemObject : json)
|
|
||||||
{
|
|
||||||
if (itemObject.isObject())
|
|
||||||
{
|
|
||||||
CheckableItem item;
|
|
||||||
item.read(itemObject.toObject());
|
|
||||||
emplace_back(item);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,6 +10,5 @@ class CheckableItems : public std::vector<CheckableItem>
|
||||||
public:
|
public:
|
||||||
CheckableItems(std::initializer_list<std::string> itemNames);
|
CheckableItems(std::initializer_list<std::string> itemNames);
|
||||||
|
|
||||||
void write(QJsonArray &json) const;
|
unsigned int getPoints() const;
|
||||||
void read(const QJsonArray &json);
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
#include "CheckableTest.h"
|
#include "CheckableTest.h"
|
||||||
|
|
||||||
|
#include <numeric>
|
||||||
|
|
||||||
CheckableTest::CheckableTest(
|
CheckableTest::CheckableTest(
|
||||||
const char *name, std::initializer_list<std::string> items)
|
const char *name, std::initializer_list<std::string> items)
|
||||||
: m_name(name)
|
: m_name(name)
|
||||||
|
@ -26,3 +28,8 @@ CheckableItems &CheckableTest::items()
|
||||||
{
|
{
|
||||||
return m_items;
|
return m_items;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
unsigned int CheckableTest::getPoints() const
|
||||||
|
{
|
||||||
|
return m_items.getPoints();
|
||||||
|
}
|
||||||
|
|
|
@ -17,6 +17,8 @@ public:
|
||||||
const QString &name() const;
|
const QString &name() const;
|
||||||
const CheckableItems &items() const;
|
const CheckableItems &items() const;
|
||||||
CheckableItems &items();
|
CheckableItems &items();
|
||||||
|
|
||||||
|
unsigned int getPoints() const;
|
||||||
};
|
};
|
||||||
|
|
||||||
using CheckableTests = std::vector<CheckableTest>;
|
using CheckableTests = std::vector<CheckableTest>;
|
||||||
|
|
|
@ -18,8 +18,9 @@ target_include_directories(${PROJECT_NAME}
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries(${PROJECT_NAME}
|
target_link_libraries(${PROJECT_NAME}
|
||||||
PRIVATE
|
PUBLIC
|
||||||
CheckableItem
|
CheckableItem
|
||||||
CheckableTest
|
CheckableTest
|
||||||
|
PRIVATE
|
||||||
Qt5::Core
|
Qt5::Core
|
||||||
)
|
)
|
||||||
|
|
|
@ -5,13 +5,13 @@
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
|
|
||||||
CheckableTestModel::CheckableTestModel(QObject *parent)
|
CheckableTestModel::CheckableTestModel(QObject *parent)
|
||||||
: QAbstractTableModel(parent)
|
: QAbstractTableModel(parent)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
int CheckableTestModel::rowCount(const QModelIndex &) const
|
int CheckableTestModel::rowCount(const QModelIndex &) const
|
||||||
{
|
{
|
||||||
return static_cast<int>(m_tests.size());
|
return static_cast<int>(m_tests.size());
|
||||||
}
|
}
|
||||||
|
|
||||||
int CheckableTestModel::columnCount(const QModelIndex &) const
|
int CheckableTestModel::columnCount(const QModelIndex &) const
|
||||||
|
@ -20,7 +20,7 @@ int CheckableTestModel::columnCount(const QModelIndex &) const
|
||||||
|
|
||||||
for (const auto &test : m_tests)
|
for (const auto &test : m_tests)
|
||||||
{
|
{
|
||||||
columnCount = std::max(columnCount, static_cast<int>(test.size()));
|
columnCount = std::max(columnCount, static_cast<int>(test.size()));
|
||||||
}
|
}
|
||||||
|
|
||||||
return columnCount;
|
return columnCount;
|
||||||
|
@ -37,17 +37,17 @@ QVariant CheckableTestModel::data(const QModelIndex &index, int role) const
|
||||||
{
|
{
|
||||||
auto &item = getItem(index);
|
auto &item = getItem(index);
|
||||||
|
|
||||||
switch (role)
|
switch (role)
|
||||||
{
|
{
|
||||||
case Qt::DisplayRole:
|
case Qt::DisplayRole:
|
||||||
{
|
{
|
||||||
return item.getText().c_str();
|
return item.getText().c_str();
|
||||||
}
|
}
|
||||||
case Qt::CheckStateRole:
|
case Qt::CheckStateRole:
|
||||||
{
|
{
|
||||||
return item.isChecked() ? Qt::Checked : Qt::Unchecked;
|
return item.isChecked() ? Qt::Checked : Qt::Unchecked;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (std::runtime_error &e)
|
catch (std::runtime_error &e)
|
||||||
{
|
{
|
||||||
|
@ -67,8 +67,7 @@ Qt::ItemFlags CheckableTestModel::flags(const QModelIndex &index) const
|
||||||
return Qt::NoItemFlags;
|
return Qt::NoItemFlags;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CheckableTestModel::setData(
|
bool CheckableTestModel::setData(const QModelIndex &index, const QVariant &value, int role)
|
||||||
const QModelIndex &index, const QVariant &value, int role)
|
|
||||||
{
|
{
|
||||||
if (!isValidIndex(index))
|
if (!isValidIndex(index))
|
||||||
{
|
{
|
||||||
|
@ -93,42 +92,33 @@ bool CheckableTestModel::setData(
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
QVariant CheckableTestModel::headerData(
|
QVariant CheckableTestModel::headerData(int section, Qt::Orientation orientation, int role) const
|
||||||
int section, Qt::Orientation orientation, int role) const
|
|
||||||
{
|
{
|
||||||
if (role == Qt::DisplayRole && orientation == Qt::Vertical)
|
switch (orientation)
|
||||||
{
|
{
|
||||||
if (section < m_tests.size())
|
case Qt::Vertical:
|
||||||
{
|
{
|
||||||
return m_tests.at(section).name();
|
switch (role)
|
||||||
|
{
|
||||||
|
case Qt::DisplayRole:
|
||||||
|
{
|
||||||
|
if (section < m_tests.size())
|
||||||
|
{
|
||||||
|
return m_tests.at(section).name();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
case Qt::SizeHintRole:
|
||||||
|
{
|
||||||
|
return QSize(200, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return QAbstractTableModel::headerData(section, orientation, role);
|
return QAbstractTableModel::headerData(section, orientation, role);
|
||||||
}
|
|
||||||
|
|
||||||
void CheckableTestModel::write(QJsonObject &json) const
|
|
||||||
{
|
|
||||||
for (const auto &test : m_tests)
|
|
||||||
{
|
|
||||||
QJsonArray testData;
|
|
||||||
test.items().write(testData);
|
|
||||||
json[test.name()] = testData;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void CheckableTestModel::read(const QJsonObject &json)
|
|
||||||
{
|
|
||||||
for (auto &test : m_tests)
|
|
||||||
{
|
|
||||||
auto testData = json[test.name()];
|
|
||||||
if (testData.isArray())
|
|
||||||
{
|
|
||||||
test.items().read(testData.toArray());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
emit dataChanged(index(0, 0), index(rowCount() - 1, columnCount() - 1));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CheckableTestModel::isValidIndex(const QModelIndex &index) const
|
bool CheckableTestModel::isValidIndex(const QModelIndex &index) const
|
||||||
|
@ -151,8 +141,7 @@ CheckableItems &CheckableTestModel::getItems(const QModelIndex &index)
|
||||||
throw std::runtime_error("invalid index");
|
throw std::runtime_error("invalid index");
|
||||||
}
|
}
|
||||||
|
|
||||||
const CheckableItems &CheckableTestModel::getItems(
|
const CheckableItems &CheckableTestModel::getItems(const QModelIndex &index) const
|
||||||
const QModelIndex &index) const
|
|
||||||
{
|
{
|
||||||
if (index.row() < m_tests.size())
|
if (index.row() < m_tests.size())
|
||||||
{
|
{
|
||||||
|
@ -186,7 +175,7 @@ const CheckableItem &CheckableTestModel::getItem(const QModelIndex &index) const
|
||||||
|
|
||||||
unsigned int CheckableTestModel::getPoints() const
|
unsigned int CheckableTestModel::getPoints() const
|
||||||
{
|
{
|
||||||
unsigned int points = 0;
|
unsigned int points = 0;
|
||||||
|
|
||||||
for (const auto &test : m_tests)
|
for (const auto &test : m_tests)
|
||||||
{
|
{
|
||||||
|
@ -198,3 +187,8 @@ unsigned int CheckableTestModel::getPoints() const
|
||||||
|
|
||||||
return points;
|
return points;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QString CheckableTestModel::getTitle() const
|
||||||
|
{
|
||||||
|
return m_title;
|
||||||
|
}
|
||||||
|
|
|
@ -8,6 +8,7 @@ class CheckableTestModel : public QAbstractTableModel
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
QString m_title;
|
||||||
CheckableTests m_tests;
|
CheckableTests m_tests;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
@ -16,20 +17,17 @@ public:
|
||||||
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
|
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
|
||||||
int columnCount(const QModelIndex &parent = QModelIndex()) const override;
|
int columnCount(const QModelIndex &parent = QModelIndex()) const override;
|
||||||
|
|
||||||
QVariant data(
|
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
|
||||||
const QModelIndex &index, int role = Qt::DisplayRole) const override;
|
|
||||||
Qt::ItemFlags flags(const QModelIndex &index) const override;
|
Qt::ItemFlags flags(const QModelIndex &index) const override;
|
||||||
bool setData(const QModelIndex &index, const QVariant &value,
|
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
|
||||||
int role = Qt::EditRole) override;
|
|
||||||
|
|
||||||
QVariant headerData(int section, Qt::Orientation orientation,
|
QVariant headerData(int section, Qt::Orientation orientation,
|
||||||
int role = Qt::DisplayRole) const override;
|
int role = Qt::DisplayRole) const override;
|
||||||
|
|
||||||
void write(QJsonObject &json) const;
|
|
||||||
void read(const QJsonObject &json);
|
|
||||||
|
|
||||||
unsigned int getPoints() const;
|
unsigned int getPoints() const;
|
||||||
|
|
||||||
|
QString getTitle() const;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual bool isValidIndex(const QModelIndex &index) const;
|
virtual bool isValidIndex(const QModelIndex &index) const;
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
#include "DataModel.h"
|
#include "DataModel.h"
|
||||||
#include "DataModel.pb.h"
|
#include "DataModel.pb.h"
|
||||||
|
|
||||||
|
#include <QFile>
|
||||||
|
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
|
||||||
DataModel::DataModel(QObject *parent)
|
DataModel::DataModel(QObject *parent)
|
||||||
|
@ -12,7 +14,10 @@ DataModel::DataModel(QObject *parent)
|
||||||
, m_results(this)
|
, m_results(this)
|
||||||
, m_akkusativ(this)
|
, m_akkusativ(this)
|
||||||
, m_dativ(this)
|
, m_dativ(this)
|
||||||
, m_v2Svk(this)
|
, m_wfModel(this)
|
||||||
|
, m_otModel(this)
|
||||||
|
, m_tPrModel(this)
|
||||||
|
, m_tPeModel(this)
|
||||||
, m_passiv(this)
|
, m_passiv(this)
|
||||||
, m_genitiv(this)
|
, m_genitiv(this)
|
||||||
{
|
{
|
||||||
|
@ -22,37 +27,72 @@ DataModel::DataModel(QObject *parent)
|
||||||
connect(&m_verbEnd, &VerbEndModel::dataChanged, this, &DataModel::verbEndModelChanged);
|
connect(&m_verbEnd, &VerbEndModel::dataChanged, this, &DataModel::verbEndModelChanged);
|
||||||
connect(&m_akkusativ, &AkkusativModel::dataChanged, this, &DataModel::akkusativModelChanged);
|
connect(&m_akkusativ, &AkkusativModel::dataChanged, this, &DataModel::akkusativModelChanged);
|
||||||
connect(&m_dativ, &DativModel::dataChanged, this, &DataModel::dativModelChanged);
|
connect(&m_dativ, &DativModel::dataChanged, this, &DataModel::dativModelChanged);
|
||||||
connect(&m_v2Svk, &V2SvkModel::dataChanged, this, &DataModel::v2SvkModelChanged);
|
|
||||||
|
connect(&m_wfModel, &WFModel::dataChanged, this, &DataModel::v2SvkModelChanged);
|
||||||
|
connect(&m_otModel, &OTModel::dataChanged, this, &DataModel::v2SvkModelChanged);
|
||||||
|
connect(&m_tPrModel, &TPrModel::dataChanged, this, &DataModel::v2SvkModelChanged);
|
||||||
|
connect(&m_tPeModel, &TPeModel::dataChanged, this, &DataModel::v2SvkModelChanged);
|
||||||
|
|
||||||
connect(&m_passiv, &PassivModel::dataChanged, this, &DataModel::passivModelChanged);
|
connect(&m_passiv, &PassivModel::dataChanged, this, &DataModel::passivModelChanged);
|
||||||
connect(&m_genitiv, &GenitivModel::dataChanged, this, &DataModel::genitivModelChanged);
|
connect(&m_genitiv, &GenitivModel::dataChanged, this, &DataModel::genitivModelChanged);
|
||||||
}
|
}
|
||||||
|
|
||||||
void DataModel::writeProtoBuf(std::ostream &outStream) const
|
void DataModel::write(const QString &filename) const
|
||||||
{
|
{
|
||||||
ESGRAF48::DataModel dataModel;
|
ESGRAF48::DataModel dataModel;
|
||||||
|
|
||||||
m_metaData.writeProtoBuf(*dataModel.mutable_metadata());
|
m_metaData.write(*dataModel.mutable_metadata());
|
||||||
m_v2Svk.writeProtoBuf(*dataModel.mutable_v2svk());
|
|
||||||
m_verbEnd.writeProtoBuf(*dataModel.mutable_verbend());
|
m_wfModel.write(*dataModel.mutable_v2svk());
|
||||||
m_genus.writeProtoBuf(*dataModel.mutable_genus());
|
m_otModel.write(*dataModel.mutable_v2svk());
|
||||||
|
m_tPrModel.write(*dataModel.mutable_v2svk());
|
||||||
|
m_tPeModel.write(*dataModel.mutable_v2svk());
|
||||||
|
|
||||||
|
m_verbEnd.write(*dataModel.mutable_verbend());
|
||||||
|
m_genus.write(*dataModel.mutable_genus());
|
||||||
m_akkusativ.write(*dataModel.mutable_akkusativ());
|
m_akkusativ.write(*dataModel.mutable_akkusativ());
|
||||||
m_dativ.write(*dataModel.mutable_dativ());
|
m_dativ.write(*dataModel.mutable_dativ());
|
||||||
m_plural.write(*dataModel.mutable_plural());
|
m_plural.write(*dataModel.mutable_plural());
|
||||||
m_genitiv.write(*dataModel.mutable_lateskillsgenitiv());
|
m_genitiv.write(*dataModel.mutable_lateskillsgenitiv());
|
||||||
m_passiv.write(*dataModel.mutable_lateskillspassiv());
|
m_passiv.write(*dataModel.mutable_lateskillspassiv());
|
||||||
|
|
||||||
dataModel.SerializeToOstream(&outStream);
|
QFile outFile(filename);
|
||||||
|
if (!outFile.open(QIODevice::WriteOnly))
|
||||||
|
{
|
||||||
|
throw std::runtime_error("failed to open file");
|
||||||
|
}
|
||||||
|
|
||||||
|
bool success = dataModel.SerializeToFileDescriptor(outFile.handle());
|
||||||
|
if (success == false)
|
||||||
|
{
|
||||||
|
throw std::runtime_error("filed to write file");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void DataModel::readProtoBuf(std::istream &inStream)
|
void DataModel::read(const QString &filename)
|
||||||
{
|
{
|
||||||
ESGRAF48::DataModel dataModel;
|
QFile inFile(filename);
|
||||||
dataModel.ParseFromIstream(&inStream);
|
if (!inFile.open(QIODevice::ReadOnly))
|
||||||
|
{
|
||||||
|
throw std::runtime_error("failed to read file");
|
||||||
|
}
|
||||||
|
|
||||||
m_metaData.readProtoBuf(dataModel.metadata());
|
ESGRAF48::DataModel dataModel;
|
||||||
m_v2Svk.readProtoBuf(dataModel.v2svk());
|
bool success = dataModel.ParseFromFileDescriptor(inFile.handle());
|
||||||
m_verbEnd.readProtoBuf(dataModel.verbend());
|
if (success == false)
|
||||||
m_genus.readProtoBuf(dataModel.genus());
|
{
|
||||||
|
throw std::runtime_error("invalid file format");
|
||||||
|
}
|
||||||
|
|
||||||
|
m_metaData.read(dataModel.metadata());
|
||||||
|
|
||||||
|
m_wfModel.read(dataModel.v2svk());
|
||||||
|
m_otModel.read(dataModel.v2svk());
|
||||||
|
m_tPrModel.read(dataModel.v2svk());
|
||||||
|
m_tPeModel.read(dataModel.v2svk());
|
||||||
|
|
||||||
|
m_verbEnd.read(dataModel.verbend());
|
||||||
|
m_genus.read(dataModel.genus());
|
||||||
m_akkusativ.read(dataModel.akkusativ());
|
m_akkusativ.read(dataModel.akkusativ());
|
||||||
m_dativ.read(dataModel.dativ());
|
m_dativ.read(dataModel.dativ());
|
||||||
m_plural.read(dataModel.plural());
|
m_plural.read(dataModel.plural());
|
||||||
|
@ -60,27 +100,43 @@ void DataModel::readProtoBuf(std::istream &inStream)
|
||||||
m_passiv.read(dataModel.lateskillspassiv());
|
m_passiv.read(dataModel.lateskillspassiv());
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string DataModel::toHtml() const
|
void DataModel::printTo(QPrinter &printer) const
|
||||||
{
|
{
|
||||||
std::stringstream out;
|
QPainter painter;
|
||||||
|
painter.begin(&printer);
|
||||||
|
|
||||||
out << "<html>" << std::endl;
|
painter.setFont(PrintableModel::h1Font());
|
||||||
out << "<head>" << std::endl;
|
painter.drawText(0, painter.fontMetrics().lineSpacing(), "ESGRAF 4-8 Auswertungsbogen");
|
||||||
out << "<style>" << std::endl;
|
painter.translate(0, 3 * painter.fontMetrics().lineSpacing());
|
||||||
out << "body {" << std::endl;
|
|
||||||
out << "font-family:sans-serif;" << std::endl;
|
|
||||||
out << "}" << std::endl;
|
|
||||||
out << "</style>" << std::endl;
|
|
||||||
out << "</head>" << std::endl;
|
|
||||||
out << "<body>" << std::endl;
|
|
||||||
out << "<h2>ESGRAF 4-8 Auswertungsbogen</h2>" << std::endl;
|
|
||||||
out << "<p>" << std::endl;
|
|
||||||
out << m_metaData.toHtml();
|
|
||||||
out << "</p>" << std::endl;
|
|
||||||
out << "</body>" << std::endl;
|
|
||||||
out << "</html>" << std::endl;
|
|
||||||
|
|
||||||
return out.str();
|
m_metaData.printTo(painter);
|
||||||
|
|
||||||
|
m_wfModel.printTo(painter);
|
||||||
|
m_otModel.printTo(painter);
|
||||||
|
m_tPrModel.printTo(painter);
|
||||||
|
m_tPeModel.printTo(painter);
|
||||||
|
V2SvkModel::printSummary(painter,
|
||||||
|
m_wfModel.getV2Points() + m_otModel.getV2Points()
|
||||||
|
+ m_tPrModel.getV2Points() + m_tPeModel.getV2Points(),
|
||||||
|
m_wfModel.getSvkPoints() + m_otModel.getSvkPoints()
|
||||||
|
+ m_tPrModel.getSvkPoints() + m_tPeModel.getSvkPoints());
|
||||||
|
|
||||||
|
m_verbEnd.printTo(painter);
|
||||||
|
m_genus.printTo(painter);
|
||||||
|
|
||||||
|
printer.newPage();
|
||||||
|
painter.resetTransform();
|
||||||
|
|
||||||
|
m_akkusativ.printTo(painter);
|
||||||
|
m_dativ.printTo(painter);
|
||||||
|
m_plural.printTo(painter);
|
||||||
|
|
||||||
|
m_passiv.printTo(painter);
|
||||||
|
m_genitiv.printTo(painter);
|
||||||
|
|
||||||
|
m_results.printTo(painter);
|
||||||
|
|
||||||
|
painter.end();
|
||||||
}
|
}
|
||||||
|
|
||||||
void DataModel::pluralModelChanged()
|
void DataModel::pluralModelChanged()
|
||||||
|
@ -127,8 +183,10 @@ void DataModel::dativModelChanged()
|
||||||
|
|
||||||
void DataModel::v2SvkModelChanged()
|
void DataModel::v2SvkModelChanged()
|
||||||
{
|
{
|
||||||
m_results.setV2Result(m_v2Svk.getV2Points());
|
m_results.setV2Result(m_wfModel.getV2Points() + m_otModel.getV2Points()
|
||||||
m_results.setSvkResult(m_v2Svk.getSvkPoints());
|
+ m_tPrModel.getV2Points() + m_tPeModel.getV2Points());
|
||||||
|
m_results.setSvkResult(m_wfModel.getSvkPoints() + m_otModel.getSvkPoints()
|
||||||
|
+ m_tPrModel.getSvkPoints() + m_tPeModel.getSvkPoints());
|
||||||
|
|
||||||
emit modelChanged();
|
emit modelChanged();
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,18 +1,25 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include "PrintableModel.h"
|
||||||
|
|
||||||
#include "MetaData/MetaDataModel.h"
|
#include "MetaData/MetaDataModel.h"
|
||||||
#include "GenusModel.h"
|
#include "GenusModel.h"
|
||||||
#include "VerbEndModel.h"
|
#include "VerbEndModel.h"
|
||||||
#include "PluralModel.h"
|
#include "PluralModel.h"
|
||||||
#include "AkkusativModel.h"
|
#include "AkkusativModel.h"
|
||||||
#include "DativModel.h"
|
#include "DativModel.h"
|
||||||
#include "V2SvkModel.h"
|
|
||||||
|
#include "WFModel.h"
|
||||||
|
#include "OTModel.h"
|
||||||
|
#include "TPrModel.h"
|
||||||
|
#include "TPeModel.h"
|
||||||
|
|
||||||
#include "PassivModel.h"
|
#include "PassivModel.h"
|
||||||
#include "GenitivModel.h"
|
#include "GenitivModel.h"
|
||||||
|
|
||||||
#include "ResultModel.h"
|
#include "ResultModel.h"
|
||||||
|
|
||||||
#include <QJsonObject>
|
#include <QPrinter>
|
||||||
|
|
||||||
class DataModel : public QObject
|
class DataModel : public QObject
|
||||||
{
|
{
|
||||||
|
@ -25,7 +32,12 @@ public:
|
||||||
PluralModel m_plural;
|
PluralModel m_plural;
|
||||||
AkkusativModel m_akkusativ;
|
AkkusativModel m_akkusativ;
|
||||||
DativModel m_dativ;
|
DativModel m_dativ;
|
||||||
V2SvkModel m_v2Svk;
|
|
||||||
|
WFModel m_wfModel;
|
||||||
|
OTModel m_otModel;
|
||||||
|
TPrModel m_tPrModel;
|
||||||
|
TPeModel m_tPeModel;
|
||||||
|
|
||||||
PassivModel m_passiv;
|
PassivModel m_passiv;
|
||||||
GenitivModel m_genitiv;
|
GenitivModel m_genitiv;
|
||||||
|
|
||||||
|
@ -34,35 +46,14 @@ public:
|
||||||
public:
|
public:
|
||||||
DataModel(QObject *parent);
|
DataModel(QObject *parent);
|
||||||
|
|
||||||
std::string toHtml() const;
|
void write(const QString &filename) const;
|
||||||
|
void read(const QString &filename);
|
||||||
|
|
||||||
void writeProtoBuf(std::ostream &outStream) const;
|
void printTo(QPrinter &printer) const;
|
||||||
void readProtoBuf(std::istream &inStream);
|
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void modelChanged();
|
void modelChanged();
|
||||||
|
|
||||||
private:
|
|
||||||
template <class ModelType>
|
|
||||||
void write(
|
|
||||||
const ModelType &model, QJsonObject &target, const char *name) const
|
|
||||||
{
|
|
||||||
QJsonObject jsonObject;
|
|
||||||
model.write(jsonObject);
|
|
||||||
target[name] = jsonObject;
|
|
||||||
}
|
|
||||||
|
|
||||||
template <class ModelType>
|
|
||||||
void read(
|
|
||||||
ModelType &model, const QJsonObject &source, const char *name) const
|
|
||||||
{
|
|
||||||
const auto &jsonObject = source[name];
|
|
||||||
if (jsonObject.isObject())
|
|
||||||
{
|
|
||||||
model.read(jsonObject.toObject());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void pluralModelChanged();
|
void pluralModelChanged();
|
||||||
void metaDataChanged();
|
void metaDataChanged();
|
||||||
|
|
|
@ -0,0 +1,37 @@
|
||||||
|
#include "mainwindow.h"
|
||||||
|
|
||||||
|
#include "version.h"
|
||||||
|
|
||||||
|
#include <QApplication>
|
||||||
|
#include <QCommandLineParser>
|
||||||
|
|
||||||
|
int main(int argc, char **argv)
|
||||||
|
{
|
||||||
|
QApplication app(argc, argv);
|
||||||
|
QCoreApplication::setApplicationName(ESGRAF48_DESCRIPTION);
|
||||||
|
QCoreApplication::setApplicationVersion(ESGRAF48_VERSION);
|
||||||
|
|
||||||
|
QCommandLineParser cmdParser;
|
||||||
|
cmdParser.setApplicationDescription(ESGRAF48_DESCRIPTION);
|
||||||
|
cmdParser.addHelpOption();
|
||||||
|
cmdParser.addVersionOption();
|
||||||
|
cmdParser.addPositionalArgument("filename", "file to open");
|
||||||
|
|
||||||
|
cmdParser.process(app);
|
||||||
|
|
||||||
|
const QStringList args = cmdParser.positionalArguments();
|
||||||
|
|
||||||
|
std::unique_ptr<MainWindow> mainWindow;
|
||||||
|
if (args.empty())
|
||||||
|
{
|
||||||
|
mainWindow = std::make_unique<MainWindow>(nullptr);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
mainWindow = std::make_unique<MainWindow>(nullptr, args.at(0));
|
||||||
|
}
|
||||||
|
|
||||||
|
mainWindow->show();
|
||||||
|
|
||||||
|
return app.exec();
|
||||||
|
}
|
|
@ -1,11 +0,0 @@
|
||||||
#include "mainwindow.h"
|
|
||||||
#include <QApplication>
|
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
|
||||||
{
|
|
||||||
QApplication app(argc, argv);
|
|
||||||
MainWindow mainWindow;
|
|
||||||
mainWindow.show();
|
|
||||||
|
|
||||||
return app.exec();
|
|
||||||
}
|
|
|
@ -41,6 +41,8 @@ target_include_directories(${PROJECT_NAME}
|
||||||
|
|
||||||
target_link_libraries(${PROJECT_NAME}
|
target_link_libraries(${PROJECT_NAME}
|
||||||
PRIVATE
|
PRIVATE
|
||||||
|
Age
|
||||||
|
PrintableModel
|
||||||
Qt5::Widgets
|
Qt5::Widgets
|
||||||
${Protobuf_LIBRARIES}
|
${Protobuf_LIBRARIES}
|
||||||
)
|
)
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
|
||||||
MetaDataModel::MetaDataModel(QObject *parent)
|
MetaDataModel::MetaDataModel(QObject *parent)
|
||||||
: QAbstractTableModel(parent)
|
: PrintableModel(parent)
|
||||||
{
|
{
|
||||||
m_dateOfBirth = QDate::currentDate().addYears(-9);
|
m_dateOfBirth = QDate::currentDate().addYears(-9);
|
||||||
m_dateOfTest = QDate::currentDate();
|
m_dateOfTest = QDate::currentDate();
|
||||||
|
@ -112,7 +112,7 @@ bool MetaDataModel::setData(const QModelIndex &modelIndex, const QVariant &value
|
||||||
return valueChanged;
|
return valueChanged;
|
||||||
}
|
}
|
||||||
|
|
||||||
void MetaDataModel::readProtoBuf(const ESGRAF48::MetaDataModel &model)
|
void MetaDataModel::read(const ESGRAF48::MetaDataModel &model)
|
||||||
{
|
{
|
||||||
setData(index(0, 0), QString::fromStdString(model.participantname()));
|
setData(index(0, 0), QString::fromStdString(model.participantname()));
|
||||||
setData(index(0, 1), QString::fromStdString(model.instructorname()));
|
setData(index(0, 1), QString::fromStdString(model.instructorname()));
|
||||||
|
@ -121,7 +121,7 @@ void MetaDataModel::readProtoBuf(const ESGRAF48::MetaDataModel &model)
|
||||||
setData(index(0, 4), QString::fromStdString(model.remarks()));
|
setData(index(0, 4), QString::fromStdString(model.remarks()));
|
||||||
}
|
}
|
||||||
|
|
||||||
void MetaDataModel::writeProtoBuf(ESGRAF48::MetaDataModel &model) const
|
void MetaDataModel::write(ESGRAF48::MetaDataModel &model) const
|
||||||
{
|
{
|
||||||
model.set_participantname(m_participant.toStdString());
|
model.set_participantname(m_participant.toStdString());
|
||||||
model.set_instructorname(m_instructor.toStdString());
|
model.set_instructorname(m_instructor.toStdString());
|
||||||
|
@ -130,39 +130,44 @@ void MetaDataModel::writeProtoBuf(ESGRAF48::MetaDataModel &model) const
|
||||||
model.set_remarks(m_remarks.toStdString());
|
model.set_remarks(m_remarks.toStdString());
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string MetaDataModel::toHtml() const
|
void MetaDataModel::printTo(QPainter &painter) const
|
||||||
{
|
{
|
||||||
std::ostringstream out;
|
painter.setFont(tableFont());
|
||||||
|
|
||||||
out << "<table border=\"1\" cellspacing=\"0\" cellpadding=\"2\" frame=\"box\" rules=\"all\">"
|
auto width = painter.device()->width();
|
||||||
<< std::endl;
|
auto height = 1.5 * painter.fontMetrics().lineSpacing();
|
||||||
out << "<tr>" << std::endl;
|
|
||||||
out << "<td width=\"25%\">Name, Vorname</td>" << std::endl;
|
|
||||||
out << "<td width=\"25%\">" << m_participant.toHtmlEscaped().toStdString() << "</td>"
|
|
||||||
<< std::endl;
|
|
||||||
out << "<td width=\"25%\">Untersucher(in)</td>" << std::endl;
|
|
||||||
out << "<td width=\"25%\">" << m_instructor.toHtmlEscaped().toStdString() << "</td>"
|
|
||||||
<< std::endl;
|
|
||||||
out << "</tr>" << std::endl;
|
|
||||||
out << "<tr>" << std::endl;
|
|
||||||
out << "<td>Geburtsdatum</td>" << std::endl;
|
|
||||||
out << "<td>" << m_dateOfBirth.toString("dd.MM.yyyy").toHtmlEscaped().toStdString() << "</td>"
|
|
||||||
<< std::endl;
|
|
||||||
out << "<td colspan=\"2\">Bemerkungen</td>" << std::endl;
|
|
||||||
out << "</tr>" << std::endl;
|
|
||||||
out << "<tr>" << std::endl;
|
|
||||||
out << "<td>Untersuchungsdatum</td>" << std::endl;
|
|
||||||
out << "<td>" << m_dateOfTest.toString("dd.MM.yyyy").toHtmlEscaped().toStdString() << "</td>"
|
|
||||||
<< std::endl;
|
|
||||||
out << "<td colspan=\"2\" rowspan=\"2\">"
|
|
||||||
<< m_remarks.trimmed().toHtmlEscaped().replace("\n", "<br>").toStdString() << "</td>"
|
|
||||||
<< std::endl;
|
|
||||||
out << "</tr>" << std::endl;
|
|
||||||
out << "<tr>" << std::endl;
|
|
||||||
out << "<td>Alter am Testtag</td>" << std::endl;
|
|
||||||
out << "<td>" << getAge().toString() << "</td>" << std::endl;
|
|
||||||
out << "</tr>" << std::endl;
|
|
||||||
out << "</table>" << std::endl;
|
|
||||||
|
|
||||||
return out.str();
|
auto hasRemarks = !m_remarks.trimmed().isEmpty();
|
||||||
|
|
||||||
|
painter.drawText(0, 0, "Name, Vorname");
|
||||||
|
painter.drawText(0.25 * width, 0, m_participant);
|
||||||
|
painter.drawText(0.5 * width, 0, "Untersucher(in)");
|
||||||
|
painter.drawText(0.75 * width, 0, m_instructor);
|
||||||
|
|
||||||
|
painter.translate(0, height);
|
||||||
|
|
||||||
|
painter.drawText(0, 0, "Geburtsdatum");
|
||||||
|
painter.drawText(0.25 * width, 0, m_dateOfBirth.toString("dd.MM.yyyy"));
|
||||||
|
if (hasRemarks)
|
||||||
|
{
|
||||||
|
painter.drawText(0.5 * width, 0, "Bemerkungen:");
|
||||||
|
painter.drawText(QRect(0.5 * width, 0.5 * height, width, 2 * height), m_remarks);
|
||||||
|
}
|
||||||
|
|
||||||
|
painter.translate(0, height);
|
||||||
|
|
||||||
|
painter.drawText(0, 0, "Untersuchungsdatum");
|
||||||
|
painter.drawText(0.25 * width, 0, m_dateOfTest.toString("dd.MM.yyyy"));
|
||||||
|
|
||||||
|
painter.translate(0, height);
|
||||||
|
|
||||||
|
painter.drawText(0, 0, "Alter am Testtag");
|
||||||
|
painter.drawText(0.25 * width, 0, getAge().toString().c_str());
|
||||||
|
|
||||||
|
painter.translate(0, 2 * height);
|
||||||
|
}
|
||||||
|
|
||||||
|
Age MetaDataModel::getAge() const
|
||||||
|
{
|
||||||
|
return {m_dateOfBirth, m_dateOfTest};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,15 +1,16 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "../Age.h"
|
#include "PrintableModel.h"
|
||||||
|
|
||||||
|
#include "Age.h"
|
||||||
|
|
||||||
#include "MetaDataModel.pb.h"
|
#include "MetaDataModel.pb.h"
|
||||||
|
|
||||||
#include <QAbstractTableModel>
|
#include <QAbstractTableModel>
|
||||||
#include <QString>
|
#include <QString>
|
||||||
#include <QDate>
|
#include <QDate>
|
||||||
#include <QJsonObject>
|
|
||||||
|
|
||||||
class MetaDataModel : public QAbstractTableModel
|
class MetaDataModel : public PrintableModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
|
@ -24,19 +25,14 @@ public:
|
||||||
MetaDataModel(QObject *parent);
|
MetaDataModel(QObject *parent);
|
||||||
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
|
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
|
||||||
int columnCount(const QModelIndex &parent = QModelIndex()) const override;
|
int columnCount(const QModelIndex &parent = QModelIndex()) const override;
|
||||||
QVariant data(
|
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
|
||||||
const QModelIndex &index, int role = Qt::DisplayRole) const override;
|
|
||||||
Qt::ItemFlags flags(const QModelIndex &index) const override;
|
Qt::ItemFlags flags(const QModelIndex &index) const override;
|
||||||
bool setData(const QModelIndex &index, const QVariant &value,
|
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
|
||||||
int role = Qt::EditRole) override;
|
|
||||||
|
|
||||||
void readProtoBuf(const ESGRAF48::MetaDataModel &model);
|
void read(const ESGRAF48::MetaDataModel &model);
|
||||||
void writeProtoBuf(ESGRAF48::MetaDataModel &model) const;
|
void write(ESGRAF48::MetaDataModel &model) const;
|
||||||
|
|
||||||
std::string toHtml() const;
|
void printTo(QPainter &painter) const override;
|
||||||
|
|
||||||
Age getAge() const
|
Age getAge() const;
|
||||||
{
|
|
||||||
return { m_dateOfBirth, m_dateOfTest };
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -0,0 +1,27 @@
|
||||||
|
cmake_minimum_required(VERSION 3.6)
|
||||||
|
|
||||||
|
project(PrintableModel LANGUAGES CXX)
|
||||||
|
|
||||||
|
find_package(Qt5Core REQUIRED)
|
||||||
|
find_package(Qt5Widgets REQUIRED)
|
||||||
|
|
||||||
|
add_library(${PROJECT_NAME}
|
||||||
|
PrintableModel.cpp
|
||||||
|
)
|
||||||
|
|
||||||
|
set_target_properties(${PROJECT_NAME}
|
||||||
|
PROPERTIES CXX_STANDARD 14
|
||||||
|
)
|
||||||
|
|
||||||
|
target_include_directories(${PROJECT_NAME}
|
||||||
|
PUBLIC
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
|
)
|
||||||
|
|
||||||
|
target_link_libraries(${PROJECT_NAME}
|
||||||
|
PUBLIC
|
||||||
|
CheckableTestModel
|
||||||
|
PRIVATE
|
||||||
|
Qt5::Core
|
||||||
|
Qt5::Widgets
|
||||||
|
)
|
|
@ -0,0 +1,184 @@
|
||||||
|
#include "PrintableModel.h"
|
||||||
|
|
||||||
|
#include <regex>
|
||||||
|
|
||||||
|
PrintableModel::PrintableModel(QObject *parent)
|
||||||
|
: CheckableTestModel(parent)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
void PrintableModel::printTo(QPainter &painter) const
|
||||||
|
{
|
||||||
|
printHeader(painter);
|
||||||
|
printTests(painter);
|
||||||
|
printSummary(painter);
|
||||||
|
}
|
||||||
|
|
||||||
|
QFont PrintableModel::h1Font()
|
||||||
|
{
|
||||||
|
return QFont("Helvetica", 16);
|
||||||
|
}
|
||||||
|
|
||||||
|
QFont PrintableModel::h2Font()
|
||||||
|
{
|
||||||
|
return QFont("Helvetica", 10);
|
||||||
|
}
|
||||||
|
|
||||||
|
QFont PrintableModel::tableFont()
|
||||||
|
{
|
||||||
|
return QFont("Helvetica", 8);
|
||||||
|
}
|
||||||
|
|
||||||
|
QPen PrintableModel::tablePen()
|
||||||
|
{
|
||||||
|
return QPen(Qt::black, 1, Qt::SolidLine);
|
||||||
|
}
|
||||||
|
|
||||||
|
QPen PrintableModel::resultPen()
|
||||||
|
{
|
||||||
|
return QPen(Qt::black, 2, Qt::SolidLine);
|
||||||
|
}
|
||||||
|
|
||||||
|
double PrintableModel::headerWidthFactor()
|
||||||
|
{
|
||||||
|
return 0.17;
|
||||||
|
}
|
||||||
|
|
||||||
|
double PrintableModel::cellWidthFactor()
|
||||||
|
{
|
||||||
|
return headerWidthFactor() / 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
void PrintableModel::drawTextSquare(QPainter &painter, const QRectF &cell, const QString &text)
|
||||||
|
{
|
||||||
|
auto prevPen = painter.pen();
|
||||||
|
painter.setPen(tablePen());
|
||||||
|
|
||||||
|
painter.drawText(cell, Qt::AlignCenter, text);
|
||||||
|
|
||||||
|
painter.drawLine(cell.topLeft(), cell.topRight());
|
||||||
|
painter.drawLine(cell.topRight(), cell.bottomRight());
|
||||||
|
painter.drawLine(cell.bottomRight(), cell.bottomLeft());
|
||||||
|
painter.drawLine(cell.bottomLeft(), cell.topLeft());
|
||||||
|
|
||||||
|
painter.setPen(prevPen);
|
||||||
|
}
|
||||||
|
|
||||||
|
void PrintableModel::drawNumberSquare(QPainter &painter, double x, double y, int number)
|
||||||
|
{
|
||||||
|
QRectF cell = {x, y, 0.03 * painter.device()->width(),
|
||||||
|
1.5 * painter.fontMetrics().lineSpacing()};
|
||||||
|
|
||||||
|
painter.drawText(cell, Qt::AlignCenter, QString::number(number));
|
||||||
|
|
||||||
|
painter.drawLine(cell.topLeft(), cell.topRight());
|
||||||
|
painter.drawLine(cell.topRight(), cell.bottomRight());
|
||||||
|
painter.drawLine(cell.bottomRight(), cell.bottomLeft());
|
||||||
|
painter.drawLine(cell.bottomLeft(), cell.topLeft());
|
||||||
|
}
|
||||||
|
|
||||||
|
void PrintableModel::PrintableModel::drawCheckSquare(QPainter &painter, const QRectF &cell,
|
||||||
|
bool checked)
|
||||||
|
{
|
||||||
|
drawTextSquare(painter, cell, checked ? u8"\u2612" : u8"\u2610");
|
||||||
|
}
|
||||||
|
|
||||||
|
void PrintableModel::drawResultSquare(QPainter &painter, double y, bool rightCell,
|
||||||
|
unsigned int value)
|
||||||
|
{
|
||||||
|
double pageWidth = painter.device()->width();
|
||||||
|
double cellWidth = 0.03 * pageWidth;
|
||||||
|
double cellHeight = 1.5 * painter.fontMetrics().lineSpacing();
|
||||||
|
double x = pageWidth - cellWidth - (rightCell ? 0 : 0.04 * pageWidth);
|
||||||
|
|
||||||
|
drawTextSquare(painter, {x, y, cellWidth, cellHeight}, QString::number(value));
|
||||||
|
}
|
||||||
|
|
||||||
|
void PrintableModel::drawGreySquare(QPainter &painter, const QRectF &cell)
|
||||||
|
{
|
||||||
|
auto prevBrush = painter.brush();
|
||||||
|
auto prevPen = painter.pen();
|
||||||
|
|
||||||
|
painter.setBrush(QBrush(QColor(224, 224, 224)));
|
||||||
|
painter.setPen(QPen(Qt::NoPen));
|
||||||
|
QPointF points[4] = {cell.topLeft(), cell.topRight(), cell.bottomRight(), cell.bottomLeft()};
|
||||||
|
painter.drawPolygon(points, 4);
|
||||||
|
|
||||||
|
painter.setPen(tablePen());
|
||||||
|
painter.drawLine(cell.topLeft(), cell.topRight());
|
||||||
|
painter.drawLine(cell.topRight(), cell.bottomRight());
|
||||||
|
painter.drawLine(cell.bottomRight(), cell.bottomLeft());
|
||||||
|
painter.drawLine(cell.bottomLeft(), cell.topLeft());
|
||||||
|
|
||||||
|
painter.setBrush(prevBrush);
|
||||||
|
painter.setPen(prevPen);
|
||||||
|
}
|
||||||
|
|
||||||
|
void PrintableModel::drawHeader2(QPainter &painter, const QString &text)
|
||||||
|
{
|
||||||
|
painter.setFont(h2Font());
|
||||||
|
painter.drawText(0, 0, text);
|
||||||
|
painter.translate(0, 0.5 * painter.fontMetrics().lineSpacing());
|
||||||
|
}
|
||||||
|
|
||||||
|
void PrintableModel::printHeader(QPainter &painter) const
|
||||||
|
{
|
||||||
|
auto title = getTitle();
|
||||||
|
if (!title.isEmpty())
|
||||||
|
{
|
||||||
|
drawHeader2(painter, getTitle());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void PrintableModel::printTests(QPainter &painter) const
|
||||||
|
{
|
||||||
|
painter.setFont(tableFont());
|
||||||
|
painter.setPen(tablePen());
|
||||||
|
|
||||||
|
auto width = painter.device()->width();
|
||||||
|
auto height = 1.5 * painter.fontMetrics().lineSpacing();
|
||||||
|
|
||||||
|
double headerWidth = headerWidthFactor() * width;
|
||||||
|
double cellWidth = cellWidthFactor() * width;
|
||||||
|
double rowHeight = height;
|
||||||
|
|
||||||
|
double x = 0;
|
||||||
|
double y = 0;
|
||||||
|
for (const auto &test : m_tests)
|
||||||
|
{
|
||||||
|
QString testName = QString::fromStdString(
|
||||||
|
std::regex_replace(test.name().toStdString(), std::regex("\\s"), "\n"));
|
||||||
|
|
||||||
|
drawTextSquare(painter, {0, y, headerWidth, 2 * rowHeight}, testName);
|
||||||
|
x = headerWidth;
|
||||||
|
|
||||||
|
for (const auto &item : test.items())
|
||||||
|
{
|
||||||
|
drawTextSquare(painter, {x, y, cellWidth, rowHeight}, item.getText().c_str());
|
||||||
|
drawCheckSquare(painter, {x, y + rowHeight, cellWidth, rowHeight}, item.isChecked());
|
||||||
|
|
||||||
|
x += cellWidth;
|
||||||
|
}
|
||||||
|
y += rowHeight;
|
||||||
|
|
||||||
|
drawResultSquare(painter, y, true, test.getPoints());
|
||||||
|
y += rowHeight;
|
||||||
|
}
|
||||||
|
|
||||||
|
painter.translate(0, y + rowHeight);
|
||||||
|
}
|
||||||
|
|
||||||
|
void PrintableModel::printSummary(QPainter &painter) const
|
||||||
|
{
|
||||||
|
painter.setFont(tableFont());
|
||||||
|
|
||||||
|
auto width = painter.device()->width();
|
||||||
|
auto height = 1.5 * painter.fontMetrics().lineSpacing();
|
||||||
|
|
||||||
|
painter.drawText(0, 0, 0.95 * width, height, Qt::AlignRight | Qt::AlignVCenter,
|
||||||
|
"Rohwertpunkte Total:");
|
||||||
|
painter.setPen(resultPen());
|
||||||
|
drawNumberSquare(painter, 0.97 * width, 0, getPoints());
|
||||||
|
|
||||||
|
painter.translate(0, 3 * height);
|
||||||
|
}
|
|
@ -0,0 +1,42 @@
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "CheckableTestModel.h"
|
||||||
|
|
||||||
|
#include <QPainter>
|
||||||
|
#include <QFont>
|
||||||
|
#include <QPen>
|
||||||
|
#include <QRect>
|
||||||
|
#include <QString>
|
||||||
|
|
||||||
|
class PrintableModel : public CheckableTestModel
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
PrintableModel(QObject *parent);
|
||||||
|
|
||||||
|
virtual void printTo(QPainter &painter) const;
|
||||||
|
|
||||||
|
static QFont h1Font();
|
||||||
|
static QFont h2Font();
|
||||||
|
static QFont tableFont();
|
||||||
|
|
||||||
|
static QPen tablePen();
|
||||||
|
static QPen resultPen();
|
||||||
|
|
||||||
|
static double headerWidthFactor();
|
||||||
|
static double cellWidthFactor();
|
||||||
|
|
||||||
|
static void drawTextSquare(QPainter &painter, const QRectF &cell, const QString &text);
|
||||||
|
static void drawNumberSquare(QPainter &painter, double x, double y, int number);
|
||||||
|
static void drawCheckSquare(QPainter &painter, const QRectF &cell, bool checked);
|
||||||
|
static void drawResultSquare(QPainter &painter, double y, bool rightCell, unsigned int value);
|
||||||
|
static void drawGreySquare(QPainter &painter, const QRectF &cell);
|
||||||
|
|
||||||
|
static void drawHeader2(QPainter &painter, const QString &text);
|
||||||
|
|
||||||
|
protected:
|
||||||
|
virtual void printHeader(QPainter &painter) const;
|
||||||
|
virtual void printTests(QPainter &painter) const;
|
||||||
|
virtual void printSummary(QPainter &painter) const;
|
||||||
|
};
|
|
@ -30,5 +30,7 @@ target_include_directories(${PROJECT_NAME}
|
||||||
|
|
||||||
target_link_libraries(${PROJECT_NAME}
|
target_link_libraries(${PROJECT_NAME}
|
||||||
PRIVATE
|
PRIVATE
|
||||||
|
PrintableModel
|
||||||
|
Age
|
||||||
Qt5::Widgets
|
Qt5::Widgets
|
||||||
)
|
)
|
||||||
|
|
|
@ -20,7 +20,7 @@ unsigned int PRMap::lookup(const Age &age, const unsigned int &points)
|
||||||
|
|
||||||
if (m_ages.back() < age)
|
if (m_ages.back() < age)
|
||||||
{
|
{
|
||||||
return m_ages.size() - 1;
|
return m_ages.size() - 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (size_t index = 1; index < m_ages.size(); ++index)
|
for (size_t index = 1; index < m_ages.size(); ++index)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "../Age.h"
|
#include "Age.h"
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
class PRMap
|
class PRMap
|
||||||
|
|
|
@ -10,13 +10,15 @@
|
||||||
#include "PassivPR.h"
|
#include "PassivPR.h"
|
||||||
#include "GenitivPR.h"
|
#include "GenitivPR.h"
|
||||||
|
|
||||||
|
#include "PrintableModel.h"
|
||||||
|
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
|
|
||||||
ResultModel::ResultModel(QObject *parent)
|
ResultModel::ResultModel(QObject *parent)
|
||||||
: QAbstractTableModel(parent)
|
: QAbstractTableModel(parent)
|
||||||
{
|
{
|
||||||
m_results = { { "V2", "SVK", "VE", "Passiv", "Genus", "Akkusativ", "Dativ",
|
m_results = {{"V2", "SVK", "VE", "Passiv", "Genus", "Akkusativ", "Dativ", "Genitiv", "Plural"}};
|
||||||
"Genitiv", "Plural" } };
|
m_results = {{"V2", "SVK", "VE", "Genus", "Akkusativ", "Dativ", "Plural", "Passiv", "Genitiv"}};
|
||||||
}
|
}
|
||||||
|
|
||||||
int ResultModel::rowCount(const QModelIndex &parent) const
|
int ResultModel::rowCount(const QModelIndex &parent) const
|
||||||
|
@ -81,8 +83,7 @@ QVariant ResultModel::data(const QModelIndex &index, int role) const
|
||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
|
|
||||||
QVariant ResultModel::headerData(
|
QVariant ResultModel::headerData(int section, Qt::Orientation orientation, int role) const
|
||||||
int section, Qt::Orientation orientation, int role) const
|
|
||||||
{
|
{
|
||||||
if (role != Qt::DisplayRole)
|
if (role != Qt::DisplayRole)
|
||||||
{
|
{
|
||||||
|
@ -123,21 +124,21 @@ void ResultModel::setAge(const Age &age)
|
||||||
|
|
||||||
void ResultModel::setPluralResult(unsigned int points)
|
void ResultModel::setPluralResult(unsigned int points)
|
||||||
{
|
{
|
||||||
if (m_results[8].points() != points)
|
if (m_results[6].points() != points)
|
||||||
{
|
{
|
||||||
m_results[8].setPoints(points);
|
m_results[6].setPoints(points);
|
||||||
m_results[8].setPR(PluralPR().lookup(m_age, points));
|
m_results[6].setPR(PluralPR().lookup(m_age, points));
|
||||||
emit dataChanged(index(0, 8), index(4, 8));
|
emit dataChanged(index(0, 6), index(4, 6));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void ResultModel::setGenusResult(unsigned int points)
|
void ResultModel::setGenusResult(unsigned int points)
|
||||||
{
|
{
|
||||||
if (m_results[4].points() != points)
|
if (m_results[3].points() != points)
|
||||||
{
|
{
|
||||||
m_results[4].setPoints(points);
|
m_results[3].setPoints(points);
|
||||||
m_results[4].setPR(GenusPR().lookup(m_age, points));
|
m_results[3].setPR(GenusPR().lookup(m_age, points));
|
||||||
emit dataChanged(index(0, 4), index(4, 4));
|
emit dataChanged(index(0, 3), index(4, 3));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -153,21 +154,21 @@ void ResultModel::setVerbEndResult(unsigned int points)
|
||||||
|
|
||||||
void ResultModel::setAkkusativResult(unsigned int points)
|
void ResultModel::setAkkusativResult(unsigned int points)
|
||||||
{
|
{
|
||||||
if (m_results[5].points() != points)
|
if (m_results[4].points() != points)
|
||||||
{
|
{
|
||||||
m_results[5].setPoints(points);
|
m_results[4].setPoints(points);
|
||||||
m_results[5].setPR(AkkusativPR().lookup(m_age, points));
|
m_results[4].setPR(AkkusativPR().lookup(m_age, points));
|
||||||
emit dataChanged(index(0, 5), index(4, 5));
|
emit dataChanged(index(0, 4), index(4, 4));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void ResultModel::setDativResult(unsigned int points)
|
void ResultModel::setDativResult(unsigned int points)
|
||||||
{
|
{
|
||||||
if (m_results[6].points() != points)
|
if (m_results[5].points() != points)
|
||||||
{
|
{
|
||||||
m_results[6].setPoints(points);
|
m_results[5].setPoints(points);
|
||||||
m_results[6].setPR(DativPR().lookup(m_age, points));
|
m_results[5].setPR(DativPR().lookup(m_age, points));
|
||||||
emit dataChanged(index(0, 6), index(4, 6));
|
emit dataChanged(index(0, 5), index(4, 5));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -193,20 +194,66 @@ void ResultModel::setSvkResult(unsigned int points)
|
||||||
|
|
||||||
void ResultModel::setPassivResult(unsigned int points)
|
void ResultModel::setPassivResult(unsigned int points)
|
||||||
{
|
{
|
||||||
if (m_results[3].points() != points)
|
if (m_results[7].points() != points)
|
||||||
{
|
{
|
||||||
m_results[3].setPoints(points);
|
m_results[7].setPoints(points);
|
||||||
m_results[3].setPR(PassivPR().lookup(m_age, points));
|
m_results[7].setPR(PassivPR().lookup(m_age, points));
|
||||||
emit dataChanged(index(0, 3), index(4, 3));
|
emit dataChanged(index(0, 7), index(4, 7));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void ResultModel::setGenitivResult(unsigned int points)
|
void ResultModel::setGenitivResult(unsigned int points)
|
||||||
{
|
{
|
||||||
if (m_results[7].points() != points)
|
if (m_results[8].points() != points)
|
||||||
{
|
{
|
||||||
m_results[7].setPoints(points);
|
m_results[8].setPoints(points);
|
||||||
m_results[7].setPR(GenitivPR().lookup(m_age, points));
|
m_results[8].setPR(GenitivPR().lookup(m_age, points));
|
||||||
emit dataChanged(index(0, 7), index(4, 7));
|
emit dataChanged(index(0, 8), index(4, 8));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void ResultModel::printTo(QPainter &painter) const
|
||||||
|
{
|
||||||
|
PrintableModel::drawHeader2(painter, "Prozentränge (PR)");
|
||||||
|
|
||||||
|
painter.setFont(PrintableModel::tableFont());
|
||||||
|
painter.setPen(PrintableModel::tablePen());
|
||||||
|
|
||||||
|
auto width = painter.device()->width();
|
||||||
|
auto height = 1.5 * painter.fontMetrics().lineSpacing();
|
||||||
|
|
||||||
|
double cellWidth = width / (m_results.size() + 1);
|
||||||
|
double rowHeight = 2 * height;
|
||||||
|
|
||||||
|
double x = 0;
|
||||||
|
double y = 0;
|
||||||
|
|
||||||
|
PrintableModel::drawTextSquare(painter, {x, y + 0 * rowHeight, cellWidth, rowHeight}, "");
|
||||||
|
PrintableModel::drawTextSquare(painter, {x, y + 1 * rowHeight, cellWidth, rowHeight},
|
||||||
|
u8"\u2265 PR 84");
|
||||||
|
PrintableModel::drawTextSquare(painter, {x, y + 2 * rowHeight, cellWidth, rowHeight},
|
||||||
|
"< PR 84");
|
||||||
|
|
||||||
|
PrintableModel::drawGreySquare(painter, {x, y + 3 * rowHeight, cellWidth, rowHeight});
|
||||||
|
PrintableModel::drawTextSquare(painter, {x, y + 3 * rowHeight, cellWidth, rowHeight},
|
||||||
|
u8"\u2264 PR 16");
|
||||||
|
|
||||||
|
x += cellWidth;
|
||||||
|
for (const auto &result : m_results)
|
||||||
|
{
|
||||||
|
PrintableModel::drawTextSquare(painter, {x, y + 0 * rowHeight, cellWidth, rowHeight},
|
||||||
|
result.name());
|
||||||
|
const auto pr = result.pr();
|
||||||
|
|
||||||
|
PrintableModel::drawTextSquare(painter, {x, y + 1 * rowHeight, cellWidth, rowHeight},
|
||||||
|
pr >= 84 ? QString::number(pr) : "-");
|
||||||
|
PrintableModel::drawTextSquare(painter, {x, y + 2 * rowHeight, cellWidth, rowHeight},
|
||||||
|
pr < 84 && pr > 16 ? QString::number(pr) : "-");
|
||||||
|
|
||||||
|
PrintableModel::drawGreySquare(painter, {x, y + 3 * rowHeight, cellWidth, rowHeight});
|
||||||
|
PrintableModel::drawTextSquare(painter, {x, y + 3 * rowHeight, cellWidth, rowHeight},
|
||||||
|
pr <= 16 ? QString::number(pr) : "-");
|
||||||
|
|
||||||
|
x += cellWidth;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "../Age.h"
|
#include "Age.h"
|
||||||
|
|
||||||
#include <QAbstractTableModel>
|
#include <QAbstractTableModel>
|
||||||
|
#include <QPainter>
|
||||||
|
|
||||||
class TestResult
|
class TestResult
|
||||||
{
|
{
|
||||||
|
@ -72,4 +74,6 @@ public:
|
||||||
void setSvkResult(unsigned int points);
|
void setSvkResult(unsigned int points);
|
||||||
void setPassivResult(unsigned int points);
|
void setPassivResult(unsigned int points);
|
||||||
void setGenitivResult(unsigned int points);
|
void setGenitivResult(unsigned int points);
|
||||||
|
|
||||||
|
void printTo(QPainter &painter) const;
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#include "AkkusativModel.h"
|
#include "AkkusativModel.h"
|
||||||
|
|
||||||
AkkusativModel::AkkusativModel(QObject *parent)
|
AkkusativModel::AkkusativModel(QObject *parent)
|
||||||
: CheckableTestModel(parent)
|
: PrintableModel(parent)
|
||||||
{
|
{
|
||||||
m_tests = {{"Akkusativ Nominalphrase",
|
m_tests = {{"Akkusativ Nominalphrase",
|
||||||
{"Tiger", "Katze", "Affe", "Gans", "Bär", "Pferd", "Hund", "Elefant"}},
|
{"Tiger", "Katze", "Affe", "Gans", "Bär", "Pferd", "Hund", "Elefant"}},
|
||||||
|
@ -105,3 +105,8 @@ void AkkusativModel::write(ESGRAF48::AkkusativModel &model) const
|
||||||
futterModel->set_zucker(testItems[7].isChecked());
|
futterModel->set_zucker(testItems[7].isChecked());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void AkkusativModel::printHeader(QPainter &painter) const
|
||||||
|
{
|
||||||
|
drawHeader2(painter, "Subtest 4: Akkusativ und Dativ");
|
||||||
|
}
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "CheckableTestModel.h"
|
#include "PrintableModel.h"
|
||||||
#include "AkkusativModel.pb.h"
|
#include "AkkusativModel.pb.h"
|
||||||
|
|
||||||
class AkkusativModel : public CheckableTestModel
|
class AkkusativModel : public PrintableModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
|
@ -12,4 +12,7 @@ public:
|
||||||
|
|
||||||
void read(const ESGRAF48::AkkusativModel &model);
|
void read(const ESGRAF48::AkkusativModel &model);
|
||||||
void write(ESGRAF48::AkkusativModel &model) const;
|
void write(ESGRAF48::AkkusativModel &model) const;
|
||||||
|
|
||||||
|
protected:
|
||||||
|
void printHeader(QPainter &painter) const override;
|
||||||
};
|
};
|
||||||
|
|
|
@ -43,9 +43,7 @@ target_include_directories(${PROJECT_NAME}
|
||||||
|
|
||||||
target_link_libraries(${PROJECT_NAME}
|
target_link_libraries(${PROJECT_NAME}
|
||||||
PRIVATE
|
PRIVATE
|
||||||
CheckableItem
|
PrintableModel
|
||||||
CheckableTest
|
|
||||||
CheckableTestModel
|
|
||||||
Qt5::Widgets
|
Qt5::Widgets
|
||||||
${Protobuf_LIBRARIES}
|
${Protobuf_LIBRARIES}
|
||||||
)
|
)
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
#include "DativModel.h"
|
#include "DativModel.h"
|
||||||
|
|
||||||
DativModel::DativModel(QObject *parent)
|
DativModel::DativModel(QObject *parent)
|
||||||
: CheckableTestModel(parent)
|
: PrintableModel(parent)
|
||||||
{
|
{
|
||||||
m_tests = {{"Dativ Nominalphrase",
|
m_tests = {{"Dativ Nominalphrase",
|
||||||
{"Tiger", "Katze", "Affe", "Gans", "Bär", "Pferd", "Hund", "Elefant"}},
|
{"Affe", "Gans", "Tiger", "Hund", "Elefant", "Pferd", "Bär", "Katze"}},
|
||||||
{"Präpositionalphrase (Verstecke)",
|
{"Präpositionalphrase (Verstecke)",
|
||||||
{"Vorhang", "Kiste", "Holz", "Kiste", "Baum", "Vorhang", "Holz", "Baum"}},
|
{"Vorhang", "Kiste", "Holz", "Kiste", "Baum", "Vorhang", "Holz", "Baum"}},
|
||||||
{"Nominalphrase (Tiere)",
|
{"Nominalphrase (Tiere)",
|
||||||
{"Salat", "Fleisch", "Knochen", "Banane", "Apfel", "Karotte", "Honig", "Zucker"}}};
|
{"Gans", "Tiger", "Hund", "Affe", "Elefant", "Pferd", "Bär", "Katze"}}};
|
||||||
}
|
}
|
||||||
|
|
||||||
void DativModel::read(const ESGRAF48::DativModel &model)
|
void DativModel::read(const ESGRAF48::DativModel &model)
|
||||||
|
@ -17,14 +17,14 @@ void DativModel::read(const ESGRAF48::DativModel &model)
|
||||||
{
|
{
|
||||||
auto &testItems = m_tests.at(0).items();
|
auto &testItems = m_tests.at(0).items();
|
||||||
|
|
||||||
testItems[0].setState(tiereModel.tiger());
|
testItems[0].setState(tiereModel.affe());
|
||||||
testItems[1].setState(tiereModel.katze());
|
testItems[1].setState(tiereModel.gans());
|
||||||
testItems[2].setState(tiereModel.affe());
|
testItems[2].setState(tiereModel.tiger());
|
||||||
testItems[3].setState(tiereModel.gans());
|
testItems[3].setState(tiereModel.hund());
|
||||||
testItems[4].setState(tiereModel.baer());
|
testItems[4].setState(tiereModel.elefant());
|
||||||
testItems[5].setState(tiereModel.pferd());
|
testItems[5].setState(tiereModel.pferd());
|
||||||
testItems[6].setState(tiereModel.hund());
|
testItems[6].setState(tiereModel.baer());
|
||||||
testItems[7].setState(tiereModel.elefant());
|
testItems[7].setState(tiereModel.katze());
|
||||||
}
|
}
|
||||||
|
|
||||||
const auto &versteckeModel = model.verstecke();
|
const auto &versteckeModel = model.verstecke();
|
||||||
|
@ -41,18 +41,18 @@ void DativModel::read(const ESGRAF48::DativModel &model)
|
||||||
testItems[7].setState(versteckeModel.baum2());
|
testItems[7].setState(versteckeModel.baum2());
|
||||||
}
|
}
|
||||||
|
|
||||||
const auto &futterModel = model.futter();
|
const auto &nomTiereModel = model.nomtiere();
|
||||||
{
|
{
|
||||||
auto &testItems = m_tests.at(2).items();
|
auto &testItems = m_tests.at(2).items();
|
||||||
|
|
||||||
testItems[0].setState(futterModel.salat());
|
testItems[0].setState(nomTiereModel.gans());
|
||||||
testItems[1].setState(futterModel.fleisch());
|
testItems[1].setState(nomTiereModel.tiger());
|
||||||
testItems[2].setState(futterModel.knochen());
|
testItems[2].setState(nomTiereModel.hund());
|
||||||
testItems[3].setState(futterModel.banane());
|
testItems[3].setState(nomTiereModel.affe());
|
||||||
testItems[4].setState(futterModel.apfel());
|
testItems[4].setState(nomTiereModel.elefant());
|
||||||
testItems[5].setState(futterModel.karotte());
|
testItems[5].setState(nomTiereModel.pferd());
|
||||||
testItems[6].setState(futterModel.honig());
|
testItems[6].setState(nomTiereModel.baer());
|
||||||
testItems[7].setState(futterModel.zucker());
|
testItems[7].setState(nomTiereModel.katze());
|
||||||
}
|
}
|
||||||
|
|
||||||
emit dataChanged(index(0, 0), index(rowCount() - 1, columnCount() - 1));
|
emit dataChanged(index(0, 0), index(rowCount() - 1, columnCount() - 1));
|
||||||
|
@ -65,14 +65,14 @@ void DativModel::write(ESGRAF48::DativModel &model) const
|
||||||
{
|
{
|
||||||
const auto &testItems = m_tests.at(0).items();
|
const auto &testItems = m_tests.at(0).items();
|
||||||
|
|
||||||
tiereModel->set_tiger(testItems[0].isChecked());
|
tiereModel->set_affe(testItems[0].isChecked());
|
||||||
tiereModel->set_katze(testItems[1].isChecked());
|
tiereModel->set_gans(testItems[1].isChecked());
|
||||||
tiereModel->set_affe(testItems[2].isChecked());
|
tiereModel->set_tiger(testItems[2].isChecked());
|
||||||
tiereModel->set_gans(testItems[3].isChecked());
|
tiereModel->set_hund(testItems[3].isChecked());
|
||||||
tiereModel->set_baer(testItems[4].isChecked());
|
tiereModel->set_elefant(testItems[4].isChecked());
|
||||||
tiereModel->set_pferd(testItems[5].isChecked());
|
tiereModel->set_pferd(testItems[5].isChecked());
|
||||||
tiereModel->set_hund(testItems[6].isChecked());
|
tiereModel->set_baer(testItems[6].isChecked());
|
||||||
tiereModel->set_elefant(testItems[7].isChecked());
|
tiereModel->set_katze(testItems[7].isChecked());
|
||||||
}
|
}
|
||||||
|
|
||||||
auto *versteckeModel = model.mutable_verstecke();
|
auto *versteckeModel = model.mutable_verstecke();
|
||||||
|
@ -90,18 +90,23 @@ void DativModel::write(ESGRAF48::DativModel &model) const
|
||||||
versteckeModel->set_baum2(testItems[7].isChecked());
|
versteckeModel->set_baum2(testItems[7].isChecked());
|
||||||
}
|
}
|
||||||
|
|
||||||
auto *futterModel = model.mutable_futter();
|
auto *nomTiereModel = model.mutable_nomtiere();
|
||||||
if (futterModel != nullptr)
|
if (nomTiereModel != nullptr)
|
||||||
{
|
{
|
||||||
const auto &testItems = m_tests.at(2).items();
|
const auto &testItems = m_tests.at(2).items();
|
||||||
|
|
||||||
futterModel->set_salat(testItems[0].isChecked());
|
nomTiereModel->set_gans(testItems[0].isChecked());
|
||||||
futterModel->set_fleisch(testItems[1].isChecked());
|
nomTiereModel->set_tiger(testItems[1].isChecked());
|
||||||
futterModel->set_knochen(testItems[2].isChecked());
|
nomTiereModel->set_hund(testItems[2].isChecked());
|
||||||
futterModel->set_banane(testItems[3].isChecked());
|
nomTiereModel->set_affe(testItems[3].isChecked());
|
||||||
futterModel->set_apfel(testItems[4].isChecked());
|
nomTiereModel->set_elefant(testItems[4].isChecked());
|
||||||
futterModel->set_karotte(testItems[5].isChecked());
|
nomTiereModel->set_pferd(testItems[5].isChecked());
|
||||||
futterModel->set_honig(testItems[6].isChecked());
|
nomTiereModel->set_baer(testItems[6].isChecked());
|
||||||
futterModel->set_zucker(testItems[7].isChecked());
|
nomTiereModel->set_katze(testItems[7].isChecked());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void DativModel::printHeader(QPainter &painter) const
|
||||||
|
{
|
||||||
|
painter.translate(0, -1.5 * painter.fontMetrics().lineSpacing());
|
||||||
|
}
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "CheckableTestModel.h"
|
#include "PrintableModel.h"
|
||||||
#include "DativModel.pb.h"
|
#include "DativModel.pb.h"
|
||||||
|
|
||||||
class DativModel : public CheckableTestModel
|
class DativModel : public PrintableModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
|
@ -12,4 +12,7 @@ public:
|
||||||
|
|
||||||
void read(const ESGRAF48::DativModel &model);
|
void read(const ESGRAF48::DativModel &model);
|
||||||
void write(ESGRAF48::DativModel &model) const;
|
void write(ESGRAF48::DativModel &model) const;
|
||||||
|
|
||||||
|
protected:
|
||||||
|
void printHeader(QPainter &painter) const override;
|
||||||
};
|
};
|
||||||
|
|
|
@ -39,9 +39,7 @@ target_include_directories(${PROJECT_NAME}
|
||||||
|
|
||||||
target_link_libraries(${PROJECT_NAME}
|
target_link_libraries(${PROJECT_NAME}
|
||||||
PRIVATE
|
PRIVATE
|
||||||
CheckableItem
|
PrintableModel
|
||||||
CheckableTest
|
|
||||||
CheckableTestModel
|
|
||||||
Qt5::Widgets
|
Qt5::Widgets
|
||||||
${Protobuf_LIBRARIES}
|
${Protobuf_LIBRARIES}
|
||||||
)
|
)
|
||||||
|
|
|
@ -1,15 +1,17 @@
|
||||||
#include "GenusModel.h"
|
#include "GenusModel.h"
|
||||||
|
|
||||||
GenusModel::GenusModel(QObject *parent)
|
GenusModel::GenusModel(QObject *parent)
|
||||||
: CheckableTestModel(parent)
|
: PrintableModel(parent)
|
||||||
{
|
{
|
||||||
|
m_title = "Subtest 3: Genus";
|
||||||
|
|
||||||
m_tests = {{"Tiere", {"Tiger", "Bär", "Katze", "Pferd", "Gans", "Elefant", "Affe", "Hund"}},
|
m_tests = {{"Tiere", {"Tiger", "Bär", "Katze", "Pferd", "Gans", "Elefant", "Affe", "Hund"}},
|
||||||
{"Futter",
|
{"Futter",
|
||||||
{"Salat", "Fleisch", "Knochen", "Banane", "Apfel", "Karotte", "Honig", "Zucker"}},
|
{"Salat", "Fleisch", "Knochen", "Banane", "Apfel", "Karotte", "Honig", "Zucker"}},
|
||||||
{"Zirkus", {"Kiste", "Holz", "Vorhang", "Baum"}}};
|
{"Zirkus", {"Kiste", "Holz", "Vorhang", "Baum"}}};
|
||||||
}
|
}
|
||||||
|
|
||||||
void GenusModel::readProtoBuf(const ESGRAF48::GenusModel &model)
|
void GenusModel::read(const ESGRAF48::GenusModel &model)
|
||||||
{
|
{
|
||||||
const auto &tiereModel = model.tiere();
|
const auto &tiereModel = model.tiere();
|
||||||
{
|
{
|
||||||
|
@ -52,7 +54,7 @@ void GenusModel::readProtoBuf(const ESGRAF48::GenusModel &model)
|
||||||
emit dataChanged(index(0, 0), index(rowCount() - 1, columnCount() - 1));
|
emit dataChanged(index(0, 0), index(rowCount() - 1, columnCount() - 1));
|
||||||
}
|
}
|
||||||
|
|
||||||
void GenusModel::writeProtoBuf(ESGRAF48::GenusModel &model) const
|
void GenusModel::write(ESGRAF48::GenusModel &model) const
|
||||||
{
|
{
|
||||||
auto *tiereModel = model.mutable_tiere();
|
auto *tiereModel = model.mutable_tiere();
|
||||||
if (tiereModel != nullptr)
|
if (tiereModel != nullptr)
|
||||||
|
|
|
@ -1,15 +1,15 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "CheckableTestModel.h"
|
#include "PrintableModel.h"
|
||||||
#include "GenusModel.pb.h"
|
#include "GenusModel.pb.h"
|
||||||
|
|
||||||
class GenusModel : public CheckableTestModel
|
class GenusModel : public PrintableModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
GenusModel(QObject *parent);
|
GenusModel(QObject *parent);
|
||||||
|
|
||||||
void readProtoBuf(const ESGRAF48::GenusModel &model);
|
void read(const ESGRAF48::GenusModel &model);
|
||||||
void writeProtoBuf(ESGRAF48::GenusModel &model) const;
|
void write(ESGRAF48::GenusModel &model) const;
|
||||||
};
|
};
|
||||||
|
|
|
@ -22,6 +22,7 @@ protobuf_generate_cpp(LateSkills_PROTO_SRCS LateSkills_PROTO_HDRS
|
||||||
|
|
||||||
add_library(${PROJECT_NAME}
|
add_library(${PROJECT_NAME}
|
||||||
LateSkillsWidget.cpp
|
LateSkillsWidget.cpp
|
||||||
|
LateSkillsModel.cpp
|
||||||
PassivModel.cpp
|
PassivModel.cpp
|
||||||
GenitivModel.cpp
|
GenitivModel.cpp
|
||||||
${UI_HEADERS}
|
${UI_HEADERS}
|
||||||
|
@ -43,9 +44,7 @@ target_include_directories(${PROJECT_NAME}
|
||||||
|
|
||||||
target_link_libraries(${PROJECT_NAME}
|
target_link_libraries(${PROJECT_NAME}
|
||||||
PRIVATE
|
PRIVATE
|
||||||
CheckableItem
|
PrintableModel
|
||||||
CheckableTest
|
|
||||||
CheckableTestModel
|
|
||||||
Qt5::Widgets
|
Qt5::Widgets
|
||||||
${Protobuf_LIBRARIES}
|
${Protobuf_LIBRARIES}
|
||||||
)
|
)
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#include "GenitivModel.h"
|
#include "GenitivModel.h"
|
||||||
|
|
||||||
GenitivModel::GenitivModel(QObject *parent)
|
GenitivModel::GenitivModel(QObject *parent)
|
||||||
: CheckableTestModel(parent)
|
: LateSkillsModel(parent)
|
||||||
{
|
{
|
||||||
m_tests = {
|
m_tests = {
|
||||||
{"Genitiv Präpositionen",
|
{"Genitiv Präpositionen",
|
||||||
|
@ -107,3 +107,8 @@ void GenitivModel::write(ESGRAF48::LateSkillsGenitivModel &model) const
|
||||||
attributierungModel->set_guertel2(testItems[9].isChecked());
|
attributierungModel->set_guertel2(testItems[9].isChecked());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void GenitivModel::printHeader(QPainter &painter) const
|
||||||
|
{
|
||||||
|
painter.translate(0, -1.5 * painter.fontMetrics().lineSpacing());
|
||||||
|
}
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "CheckableTestModel.h"
|
#include "LateSkillsModel.h"
|
||||||
#include "LateSkillsGenitivModel.pb.h"
|
#include "LateSkillsGenitivModel.pb.h"
|
||||||
|
|
||||||
class GenitivModel : public CheckableTestModel
|
class GenitivModel : public LateSkillsModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
|
@ -14,4 +14,7 @@ public:
|
||||||
|
|
||||||
void read(const ESGRAF48::LateSkillsGenitivModel &model);
|
void read(const ESGRAF48::LateSkillsGenitivModel &model);
|
||||||
void write(ESGRAF48::LateSkillsGenitivModel &model) const;
|
void write(ESGRAF48::LateSkillsGenitivModel &model) const;
|
||||||
|
|
||||||
|
protected:
|
||||||
|
void printHeader(QPainter &painter) const override;
|
||||||
};
|
};
|
||||||
|
|
|
@ -0,0 +1,64 @@
|
||||||
|
#include "LateSkillsModel.h"
|
||||||
|
|
||||||
|
#include <regex>
|
||||||
|
|
||||||
|
LateSkillsModel::LateSkillsModel(QObject *parent)
|
||||||
|
: PrintableModel(parent)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
void LateSkillsModel::printTests(QPainter &painter) const
|
||||||
|
{
|
||||||
|
painter.setFont(tableFont());
|
||||||
|
painter.setPen(tablePen());
|
||||||
|
|
||||||
|
auto width = painter.device()->width();
|
||||||
|
auto height = 1.5 * painter.fontMetrics().lineSpacing();
|
||||||
|
|
||||||
|
double headerWidth = headerWidthFactor() * width;
|
||||||
|
double cellHeaderWidth = cellWidthFactor() * width;
|
||||||
|
double cellWidth = 0.5 * cellHeaderWidth;
|
||||||
|
double rowHeight = height;
|
||||||
|
|
||||||
|
double x = 0;
|
||||||
|
double y = 0;
|
||||||
|
for (const auto &test : m_tests)
|
||||||
|
{
|
||||||
|
QString testName = QString::fromStdString(
|
||||||
|
std::regex_replace(test.name().toStdString(), std::regex("\\s"), "\n"));
|
||||||
|
|
||||||
|
drawTextSquare(painter, {0, y, headerWidth, 3 * rowHeight}, testName);
|
||||||
|
|
||||||
|
const auto &items = test.items();
|
||||||
|
|
||||||
|
x = headerWidth;
|
||||||
|
for (unsigned int i = 0; i < items.size(); i += 2)
|
||||||
|
{
|
||||||
|
const auto &item = test.items().at(i);
|
||||||
|
QString itemText = QString::fromStdString(item.getText()).split(" ").at(0);
|
||||||
|
|
||||||
|
drawTextSquare(painter, {x, y, cellHeaderWidth, rowHeight}, itemText);
|
||||||
|
|
||||||
|
x += cellHeaderWidth;
|
||||||
|
}
|
||||||
|
y += rowHeight;
|
||||||
|
|
||||||
|
x = headerWidth;
|
||||||
|
for (const auto &item : items)
|
||||||
|
{
|
||||||
|
drawTextSquare(painter, {x, y, cellWidth, rowHeight}, QString::number(item.value()));
|
||||||
|
drawCheckSquare(painter, {x, y + rowHeight, cellWidth, rowHeight}, item.isChecked());
|
||||||
|
|
||||||
|
x += cellWidth;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (m_tests.size() > 1)
|
||||||
|
{
|
||||||
|
drawResultSquare(painter, y + rowHeight, true, test.getPoints());
|
||||||
|
}
|
||||||
|
|
||||||
|
y += 2 * rowHeight;
|
||||||
|
}
|
||||||
|
|
||||||
|
painter.translate(0, y + rowHeight);
|
||||||
|
}
|
|
@ -0,0 +1,15 @@
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "PrintableModel.h"
|
||||||
|
#include "LateSkillsPassivModel.pb.h"
|
||||||
|
|
||||||
|
class LateSkillsModel : public PrintableModel
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
LateSkillsModel(QObject *parent);
|
||||||
|
|
||||||
|
protected:
|
||||||
|
void printTests(QPainter &painter) const override;
|
||||||
|
};
|
|
@ -1,7 +1,7 @@
|
||||||
#include "PassivModel.h"
|
#include "PassivModel.h"
|
||||||
|
|
||||||
PassivModel::PassivModel(QObject *parent)
|
PassivModel::PassivModel(QObject *parent)
|
||||||
: CheckableTestModel(parent)
|
: LateSkillsModel(parent)
|
||||||
{
|
{
|
||||||
m_tests = {{"Passiv",
|
m_tests = {{"Passiv",
|
||||||
{"Elefant (1)", "Elefant (2)", "Pferde (1)", "Pferde (2)", "Bälle (1)", "Bälle (2)",
|
{"Elefant (1)", "Elefant (2)", "Pferde (1)", "Pferde (2)", "Bälle (1)", "Bälle (2)",
|
||||||
|
@ -65,3 +65,8 @@ void PassivModel::write(ESGRAF48::LateSkillsPassivModel &model) const
|
||||||
model.set_fleisch1(testItems[8].isChecked());
|
model.set_fleisch1(testItems[8].isChecked());
|
||||||
model.set_fleisch2(testItems[9].isChecked());
|
model.set_fleisch2(testItems[9].isChecked());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void PassivModel::printHeader(QPainter &painter) const
|
||||||
|
{
|
||||||
|
drawHeader2(painter, "Subtest 6: Späte Fähigkeiten (7;0-8;11)");
|
||||||
|
}
|
||||||
|
|
|
@ -1,17 +1,19 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "CheckableTestModel.h"
|
#include "LateSkillsModel.h"
|
||||||
#include "LateSkillsPassivModel.pb.h"
|
#include "LateSkillsPassivModel.pb.h"
|
||||||
|
|
||||||
class PassivModel : public CheckableTestModel
|
class PassivModel : public LateSkillsModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
PassivModel(QObject *parent);
|
PassivModel(QObject *parent);
|
||||||
bool setData(const QModelIndex &index, const QVariant &value,
|
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
|
||||||
int role = Qt::EditRole) override;
|
|
||||||
|
|
||||||
void read(const ESGRAF48::LateSkillsPassivModel &model);
|
void read(const ESGRAF48::LateSkillsPassivModel &model);
|
||||||
void write(ESGRAF48::LateSkillsPassivModel &model) const;
|
void write(ESGRAF48::LateSkillsPassivModel &model) const;
|
||||||
|
|
||||||
|
protected:
|
||||||
|
void printHeader(QPainter &painter) const override;
|
||||||
};
|
};
|
||||||
|
|
|
@ -39,9 +39,7 @@ target_include_directories(${PROJECT_NAME}
|
||||||
|
|
||||||
target_link_libraries(${PROJECT_NAME}
|
target_link_libraries(${PROJECT_NAME}
|
||||||
PRIVATE
|
PRIVATE
|
||||||
CheckableItem
|
PrintableModel
|
||||||
CheckableTest
|
|
||||||
CheckableTestModel
|
|
||||||
Qt5::Widgets
|
Qt5::Widgets
|
||||||
${Protobuf_LIBRARIES}
|
${Protobuf_LIBRARIES}
|
||||||
)
|
)
|
||||||
|
|
|
@ -2,24 +2,18 @@
|
||||||
|
|
||||||
#include <QSize>
|
#include <QSize>
|
||||||
|
|
||||||
|
#include <regex>
|
||||||
|
|
||||||
PluralModel::PluralModel(QObject *parent)
|
PluralModel::PluralModel(QObject *parent)
|
||||||
: CheckableTestModel(parent)
|
: PrintableModel(parent)
|
||||||
{
|
{
|
||||||
m_tests = {{"",
|
m_title = "Subtest 5: Plural";
|
||||||
|
|
||||||
|
m_tests = {{"Plural",
|
||||||
{"Fisch /-e/", "Banane /-n/", "Bonbon /-s/", "Ei /-er/", "Eimer /-ø/",
|
{"Fisch /-e/", "Banane /-n/", "Bonbon /-s/", "Ei /-er/", "Eimer /-ø/",
|
||||||
"Korn UML+/-er/", "Nuss UML+/-e/", "Bär /-en/", "Apfel UML"}}};
|
"Korn UML+/-er/", "Nuss UML+/-e/", "Bär /-en/", "Apfel UML"}}};
|
||||||
}
|
}
|
||||||
|
|
||||||
QVariant PluralModel::data(const QModelIndex &index, int role) const
|
|
||||||
{
|
|
||||||
if (role == Qt::SizeHintRole)
|
|
||||||
{
|
|
||||||
return QSize(180, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
return CheckableTestModel::data(index, role);
|
|
||||||
}
|
|
||||||
|
|
||||||
void PluralModel::read(const ESGRAF48::PluralModel &model)
|
void PluralModel::read(const ESGRAF48::PluralModel &model)
|
||||||
{
|
{
|
||||||
auto &testItems = m_tests.at(0).items();
|
auto &testItems = m_tests.at(0).items();
|
||||||
|
@ -51,3 +45,39 @@ void PluralModel::write(ESGRAF48::PluralModel &model) const
|
||||||
model.set_baer(testItems[7].isChecked());
|
model.set_baer(testItems[7].isChecked());
|
||||||
model.set_apfel(testItems[8].isChecked());
|
model.set_apfel(testItems[8].isChecked());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void PluralModel::printTests(QPainter &painter) const
|
||||||
|
{
|
||||||
|
painter.setFont(tableFont());
|
||||||
|
painter.setPen(tablePen());
|
||||||
|
|
||||||
|
auto width = painter.device()->width();
|
||||||
|
auto height = 1.5 * painter.fontMetrics().lineSpacing();
|
||||||
|
|
||||||
|
double headerWidth = headerWidthFactor() * width;
|
||||||
|
double cellWidth = cellWidthFactor() * width;
|
||||||
|
double rowHeight = height;
|
||||||
|
|
||||||
|
double x = 0;
|
||||||
|
double y = 0;
|
||||||
|
for (const auto &test : m_tests)
|
||||||
|
{
|
||||||
|
drawTextSquare(painter, {0, y, headerWidth, 3 * rowHeight}, test.name());
|
||||||
|
x = headerWidth;
|
||||||
|
|
||||||
|
for (const auto &item : test.items())
|
||||||
|
{
|
||||||
|
QString itemText =
|
||||||
|
QString::fromStdString(std::regex_replace(item.getText(), std::regex("\\s"), "\n"));
|
||||||
|
|
||||||
|
drawTextSquare(painter, {x, y, cellWidth, 2 * rowHeight}, itemText);
|
||||||
|
drawCheckSquare(painter, {x, y + 2 * rowHeight, cellWidth, rowHeight},
|
||||||
|
item.isChecked());
|
||||||
|
|
||||||
|
x += cellWidth;
|
||||||
|
}
|
||||||
|
y += 2 * rowHeight;
|
||||||
|
}
|
||||||
|
|
||||||
|
painter.translate(0, y + 2 * rowHeight);
|
||||||
|
}
|
||||||
|
|
|
@ -1,18 +1,18 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "CheckableTestModel.h"
|
#include "PrintableModel.h"
|
||||||
#include "PluralModel.pb.h"
|
#include "PluralModel.pb.h"
|
||||||
|
|
||||||
class PluralModel : public CheckableTestModel
|
class PluralModel : public PrintableModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
PluralModel(QObject *parent);
|
PluralModel(QObject *parent);
|
||||||
|
|
||||||
QVariant data(
|
|
||||||
const QModelIndex &index, int role = Qt::DisplayRole) const override;
|
|
||||||
|
|
||||||
void read(const ESGRAF48::PluralModel &model);
|
void read(const ESGRAF48::PluralModel &model);
|
||||||
void write(ESGRAF48::PluralModel &model) const;
|
void write(ESGRAF48::PluralModel &model) const;
|
||||||
|
|
||||||
|
protected:
|
||||||
|
virtual void printTests(QPainter &painter) const;
|
||||||
};
|
};
|
||||||
|
|
|
@ -8,6 +8,8 @@ PluralWidget::PluralWidget(QWidget *parent)
|
||||||
, ui(new Ui::PluralWidget)
|
, ui(new Ui::PluralWidget)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
|
ui->pluralTableView->horizontalHeader()->hide();
|
||||||
}
|
}
|
||||||
|
|
||||||
PluralWidget::~PluralWidget()
|
PluralWidget::~PluralWidget()
|
||||||
|
@ -18,5 +20,4 @@ PluralWidget::~PluralWidget()
|
||||||
void PluralWidget::setModel(PluralModel *model)
|
void PluralWidget::setModel(PluralModel *model)
|
||||||
{
|
{
|
||||||
ui->pluralTableView->setModel(model);
|
ui->pluralTableView->setModel(model);
|
||||||
ui->pluralTableView->resizeColumnsToContents();
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,17 +15,7 @@
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout">
|
<layout class="QVBoxLayout" name="verticalLayout">
|
||||||
<item>
|
<item>
|
||||||
<widget class="QTableView" name="pluralTableView">
|
<widget class="QTableView" name="pluralTableView"/>
|
||||||
<attribute name="horizontalHeaderVisible">
|
|
||||||
<bool>false</bool>
|
|
||||||
</attribute>
|
|
||||||
<attribute name="horizontalHeaderDefaultSectionSize">
|
|
||||||
<number>120</number>
|
|
||||||
</attribute>
|
|
||||||
<attribute name="verticalHeaderVisible">
|
|
||||||
<bool>false</bool>
|
|
||||||
</attribute>
|
|
||||||
</widget>
|
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
|
|
|
@ -20,6 +20,10 @@ protobuf_generate_cpp(V2Svk_PROTO_SRCS V2Svk_PROTO_HDRS ${V2Svk_PROTO_FILES})
|
||||||
add_library(${PROJECT_NAME}
|
add_library(${PROJECT_NAME}
|
||||||
V2SvkWidget.cpp
|
V2SvkWidget.cpp
|
||||||
V2SvkModel.cpp
|
V2SvkModel.cpp
|
||||||
|
WFModel.cpp
|
||||||
|
OTModel.cpp
|
||||||
|
TPrModel.cpp
|
||||||
|
TPeModel.cpp
|
||||||
${UI_HEADERS}
|
${UI_HEADERS}
|
||||||
${V2Svk_PROTO_SRCS}
|
${V2Svk_PROTO_SRCS}
|
||||||
${V2Svk_PROTO_HDRS}
|
${V2Svk_PROTO_HDRS}
|
||||||
|
@ -39,9 +43,7 @@ target_include_directories(${PROJECT_NAME}
|
||||||
|
|
||||||
target_link_libraries(${PROJECT_NAME}
|
target_link_libraries(${PROJECT_NAME}
|
||||||
PRIVATE
|
PRIVATE
|
||||||
CheckableItem
|
PrintableModel
|
||||||
CheckableTest
|
|
||||||
CheckableTestModel
|
|
||||||
Qt5::Widgets
|
Qt5::Widgets
|
||||||
${Protobuf_LIBRARIES}
|
${Protobuf_LIBRARIES}
|
||||||
)
|
)
|
||||||
|
|
|
@ -0,0 +1,115 @@
|
||||||
|
#include "OTModel.h"
|
||||||
|
|
||||||
|
OTModel::OTModel(QObject *parent)
|
||||||
|
: V2SvkModel(parent)
|
||||||
|
{
|
||||||
|
m_tests = {
|
||||||
|
{"Objekt-Topikalisierung",
|
||||||
|
{"Affe", "Affe", "Affe", "Affe", "Schwein", "Schwein", "Schwein", "Schwein", "Gans",
|
||||||
|
"Gans", "Gans", "Gans"}},
|
||||||
|
{"SVK: Stamm",
|
||||||
|
{"Affe", "Affe", "Affe", "Affe", "Schwein", "Schwein", "Schwein", "Schwein", "Gans",
|
||||||
|
"Gans", "Gans", "Gans"}},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
unsigned int OTModel::getV2Points() const
|
||||||
|
{
|
||||||
|
unsigned int points = 0;
|
||||||
|
|
||||||
|
for (auto testIndex : {0})
|
||||||
|
{
|
||||||
|
const auto &test = m_tests.at(testIndex);
|
||||||
|
|
||||||
|
for (const auto &item : test.items())
|
||||||
|
{
|
||||||
|
if (item.isChecked())
|
||||||
|
{
|
||||||
|
points++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return points;
|
||||||
|
}
|
||||||
|
|
||||||
|
unsigned int OTModel::getSvkPoints() const
|
||||||
|
{
|
||||||
|
unsigned int points = 0;
|
||||||
|
|
||||||
|
for (auto testIndex : {1})
|
||||||
|
{
|
||||||
|
const auto &test = m_tests.at(testIndex);
|
||||||
|
|
||||||
|
for (const auto &item : test.items())
|
||||||
|
{
|
||||||
|
if (item.isChecked())
|
||||||
|
{
|
||||||
|
points++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return points;
|
||||||
|
}
|
||||||
|
|
||||||
|
void OTModel::write(ESGRAF48::V2SvkModel &model) const
|
||||||
|
{
|
||||||
|
auto writeFourVals = [&](ESGRAF48::V2SvkModel::FourEach *modelData, int testIndex) {
|
||||||
|
if (modelData != nullptr)
|
||||||
|
{
|
||||||
|
const auto &testItems = m_tests.at(testIndex).items();
|
||||||
|
|
||||||
|
modelData->set_affe1(testItems[0].isChecked());
|
||||||
|
modelData->set_affe2(testItems[1].isChecked());
|
||||||
|
modelData->set_affe3(testItems[2].isChecked());
|
||||||
|
modelData->set_affe4(testItems[3].isChecked());
|
||||||
|
modelData->set_schwein1(testItems[4].isChecked());
|
||||||
|
modelData->set_schwein2(testItems[5].isChecked());
|
||||||
|
modelData->set_schwein3(testItems[6].isChecked());
|
||||||
|
modelData->set_schwein4(testItems[7].isChecked());
|
||||||
|
modelData->set_gans1(testItems[8].isChecked());
|
||||||
|
modelData->set_gans2(testItems[9].isChecked());
|
||||||
|
modelData->set_gans3(testItems[10].isChecked());
|
||||||
|
modelData->set_gans4(testItems[11].isChecked());
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
writeFourVals(model.mutable_objtop(), 0);
|
||||||
|
writeFourVals(model.mutable_svkstamm(), 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
void OTModel::read(const ESGRAF48::V2SvkModel &model)
|
||||||
|
{
|
||||||
|
auto readFourVals = [&](const ESGRAF48::V2SvkModel::FourEach &modelData, int testIndex) {
|
||||||
|
auto &testItems = m_tests.at(testIndex).items();
|
||||||
|
|
||||||
|
testItems[0].setState(modelData.affe1());
|
||||||
|
testItems[1].setState(modelData.affe2());
|
||||||
|
testItems[2].setState(modelData.affe3());
|
||||||
|
testItems[3].setState(modelData.affe4());
|
||||||
|
testItems[4].setState(modelData.schwein1());
|
||||||
|
testItems[5].setState(modelData.schwein2());
|
||||||
|
testItems[6].setState(modelData.schwein3());
|
||||||
|
testItems[7].setState(modelData.schwein4());
|
||||||
|
testItems[8].setState(modelData.gans1());
|
||||||
|
testItems[9].setState(modelData.gans2());
|
||||||
|
testItems[10].setState(modelData.gans3());
|
||||||
|
testItems[11].setState(modelData.gans4());
|
||||||
|
};
|
||||||
|
|
||||||
|
readFourVals(model.objtop(), 0);
|
||||||
|
readFourVals(model.svkstamm(), 1);
|
||||||
|
|
||||||
|
emit dataChanged(index(0, 0), index(rowCount() - 1, columnCount() - 1));
|
||||||
|
}
|
||||||
|
|
||||||
|
std::set<int> OTModel::v2Tests() const
|
||||||
|
{
|
||||||
|
return {0};
|
||||||
|
};
|
||||||
|
|
||||||
|
std::set<int> OTModel::svkTests() const
|
||||||
|
{
|
||||||
|
return {1};
|
||||||
|
};
|
|
@ -0,0 +1,24 @@
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "V2SvkModel.h"
|
||||||
|
#include "V2SvkModel.pb.h"
|
||||||
|
|
||||||
|
class OTModel : public V2SvkModel
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
OTModel(QObject *parent);
|
||||||
|
|
||||||
|
unsigned int getV2Points() const override;
|
||||||
|
unsigned int getSvkPoints() const override;
|
||||||
|
|
||||||
|
void write(ESGRAF48::V2SvkModel &model) const override;
|
||||||
|
void read(const ESGRAF48::V2SvkModel &model) override;
|
||||||
|
|
||||||
|
protected:
|
||||||
|
void printHeader(QPainter &) const override {};
|
||||||
|
|
||||||
|
std::set<int> v2Tests() const override;
|
||||||
|
std::set<int> svkTests() const override;
|
||||||
|
};
|
|
@ -0,0 +1,105 @@
|
||||||
|
#include "TPeModel.h"
|
||||||
|
|
||||||
|
TPeModel::TPeModel(QObject *parent)
|
||||||
|
: V2SvkModel(parent)
|
||||||
|
{
|
||||||
|
m_tests = {
|
||||||
|
{"Temporaladverb Perfekt", {"Affe", "Affe", "Schwein", "Schwein", "Gans", "Gans"}},
|
||||||
|
{"Verbtrennung", {"Affe", "Affe", "Schwein", "Schwein", "Gans", "Gans"}},
|
||||||
|
{"SVK: /-e/ o. Stamm", {"Affe", "Affe", "Schwein", "Schwein", "Gans", "Gans"}},
|
||||||
|
{"Partizip", {"Affe", "Affe", "Schwein", "Schwein", "Gans", "Gans"}},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
unsigned int TPeModel::getV2Points() const
|
||||||
|
{
|
||||||
|
unsigned int points = 0;
|
||||||
|
|
||||||
|
for (auto testIndex : {0, 1})
|
||||||
|
{
|
||||||
|
const auto &test = m_tests.at(testIndex);
|
||||||
|
|
||||||
|
for (const auto &item : test.items())
|
||||||
|
{
|
||||||
|
if (item.isChecked())
|
||||||
|
{
|
||||||
|
points++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return points;
|
||||||
|
}
|
||||||
|
|
||||||
|
unsigned int TPeModel::getSvkPoints() const
|
||||||
|
{
|
||||||
|
unsigned int points = 0;
|
||||||
|
|
||||||
|
for (auto testIndex : {2, 3})
|
||||||
|
{
|
||||||
|
const auto &test = m_tests.at(testIndex);
|
||||||
|
|
||||||
|
for (const auto &item : test.items())
|
||||||
|
{
|
||||||
|
if (item.isChecked())
|
||||||
|
{
|
||||||
|
points++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return points;
|
||||||
|
}
|
||||||
|
|
||||||
|
void TPeModel::write(ESGRAF48::V2SvkModel &model) const
|
||||||
|
{
|
||||||
|
auto writeTwoVals = [&](ESGRAF48::V2SvkModel::TwoEach *modelData, int testIndex) {
|
||||||
|
if (modelData != nullptr)
|
||||||
|
{
|
||||||
|
const auto &testItems = m_tests.at(testIndex).items();
|
||||||
|
|
||||||
|
modelData->set_affe1(testItems[0].isChecked());
|
||||||
|
modelData->set_affe2(testItems[1].isChecked());
|
||||||
|
modelData->set_schwein1(testItems[2].isChecked());
|
||||||
|
modelData->set_schwein2(testItems[3].isChecked());
|
||||||
|
modelData->set_gans1(testItems[4].isChecked());
|
||||||
|
modelData->set_gans2(testItems[5].isChecked());
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
writeTwoVals(model.mutable_tempperf(), 0);
|
||||||
|
writeTwoVals(model.mutable_verbtrennung2(), 1);
|
||||||
|
writeTwoVals(model.mutable_svke2(), 2);
|
||||||
|
writeTwoVals(model.mutable_partizip(), 3);
|
||||||
|
}
|
||||||
|
|
||||||
|
void TPeModel::read(const ESGRAF48::V2SvkModel &model)
|
||||||
|
{
|
||||||
|
auto readTwoVals = [&](const ESGRAF48::V2SvkModel::TwoEach &modelData, int testIndex) {
|
||||||
|
auto &testItems = m_tests.at(testIndex).items();
|
||||||
|
|
||||||
|
testItems[0].setState(modelData.affe1());
|
||||||
|
testItems[1].setState(modelData.affe2());
|
||||||
|
testItems[2].setState(modelData.schwein1());
|
||||||
|
testItems[3].setState(modelData.schwein2());
|
||||||
|
testItems[4].setState(modelData.gans1());
|
||||||
|
testItems[5].setState(modelData.gans2());
|
||||||
|
};
|
||||||
|
|
||||||
|
readTwoVals(model.tempperf(), 0);
|
||||||
|
readTwoVals(model.verbtrennung2(), 1);
|
||||||
|
readTwoVals(model.svke2(), 2);
|
||||||
|
readTwoVals(model.partizip(), 3);
|
||||||
|
|
||||||
|
emit dataChanged(index(0, 0), index(rowCount() - 1, columnCount() - 1));
|
||||||
|
}
|
||||||
|
|
||||||
|
std::set<int> TPeModel::v2Tests() const
|
||||||
|
{
|
||||||
|
return {0, 1};
|
||||||
|
};
|
||||||
|
|
||||||
|
std::set<int> TPeModel::svkTests() const
|
||||||
|
{
|
||||||
|
return {2, 3};
|
||||||
|
};
|
|
@ -0,0 +1,24 @@
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "V2SvkModel.h"
|
||||||
|
#include "V2SvkModel.pb.h"
|
||||||
|
|
||||||
|
class TPeModel : public V2SvkModel
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
TPeModel(QObject *parent);
|
||||||
|
|
||||||
|
unsigned int getV2Points() const override;
|
||||||
|
unsigned int getSvkPoints() const override;
|
||||||
|
|
||||||
|
void write(ESGRAF48::V2SvkModel &model) const override;
|
||||||
|
void read(const ESGRAF48::V2SvkModel &model) override;
|
||||||
|
|
||||||
|
protected:
|
||||||
|
void printHeader(QPainter &) const override {};
|
||||||
|
|
||||||
|
std::set<int> v2Tests() const override;
|
||||||
|
std::set<int> svkTests() const override;
|
||||||
|
};
|
|
@ -0,0 +1,99 @@
|
||||||
|
#include "TPrModel.h"
|
||||||
|
|
||||||
|
TPrModel::TPrModel(QObject *parent)
|
||||||
|
: V2SvkModel(parent)
|
||||||
|
{
|
||||||
|
m_tests = {
|
||||||
|
{"Temporaladverb Präsens", {"Affe", "Affe", "Schwein", "Schwein", "Gans", "Gans"}},
|
||||||
|
{"SKV: /-e/ o. Stamm", {"Affe", "Affe", "Schwein", "Schwein", "Gans", "Gans"}},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
unsigned int TPrModel::getV2Points() const
|
||||||
|
{
|
||||||
|
unsigned int points = 0;
|
||||||
|
|
||||||
|
for (auto testIndex : {0})
|
||||||
|
{
|
||||||
|
const auto &test = m_tests.at(testIndex);
|
||||||
|
|
||||||
|
for (const auto &item : test.items())
|
||||||
|
{
|
||||||
|
if (item.isChecked())
|
||||||
|
{
|
||||||
|
points++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return points;
|
||||||
|
}
|
||||||
|
|
||||||
|
unsigned int TPrModel::getSvkPoints() const
|
||||||
|
{
|
||||||
|
unsigned int points = 0;
|
||||||
|
|
||||||
|
for (auto testIndex : {1})
|
||||||
|
{
|
||||||
|
const auto &test = m_tests.at(testIndex);
|
||||||
|
|
||||||
|
for (const auto &item : test.items())
|
||||||
|
{
|
||||||
|
if (item.isChecked())
|
||||||
|
{
|
||||||
|
points++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return points;
|
||||||
|
}
|
||||||
|
|
||||||
|
void TPrModel::write(ESGRAF48::V2SvkModel &model) const
|
||||||
|
{
|
||||||
|
auto writeTwoVals = [&](ESGRAF48::V2SvkModel::TwoEach *modelData, int testIndex) {
|
||||||
|
if (modelData != nullptr)
|
||||||
|
{
|
||||||
|
const auto &testItems = m_tests.at(testIndex).items();
|
||||||
|
|
||||||
|
modelData->set_affe1(testItems[0].isChecked());
|
||||||
|
modelData->set_affe2(testItems[1].isChecked());
|
||||||
|
modelData->set_schwein1(testItems[2].isChecked());
|
||||||
|
modelData->set_schwein2(testItems[3].isChecked());
|
||||||
|
modelData->set_gans1(testItems[4].isChecked());
|
||||||
|
modelData->set_gans2(testItems[5].isChecked());
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
writeTwoVals(model.mutable_temppraes(), 0);
|
||||||
|
writeTwoVals(model.mutable_svke1(), 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
void TPrModel::read(const ESGRAF48::V2SvkModel &model)
|
||||||
|
{
|
||||||
|
auto readTwoVals = [&](const ESGRAF48::V2SvkModel::TwoEach &modelData, int testIndex) {
|
||||||
|
auto &testItems = m_tests.at(testIndex).items();
|
||||||
|
|
||||||
|
testItems[0].setState(modelData.affe1());
|
||||||
|
testItems[1].setState(modelData.affe2());
|
||||||
|
testItems[2].setState(modelData.schwein1());
|
||||||
|
testItems[3].setState(modelData.schwein2());
|
||||||
|
testItems[4].setState(modelData.gans1());
|
||||||
|
testItems[5].setState(modelData.gans2());
|
||||||
|
};
|
||||||
|
|
||||||
|
readTwoVals(model.temppraes(), 0);
|
||||||
|
readTwoVals(model.svke1(), 1);
|
||||||
|
|
||||||
|
emit dataChanged(index(0, 0), index(rowCount() - 1, columnCount() - 1));
|
||||||
|
}
|
||||||
|
|
||||||
|
std::set<int> TPrModel::v2Tests() const
|
||||||
|
{
|
||||||
|
return {0};
|
||||||
|
};
|
||||||
|
|
||||||
|
std::set<int> TPrModel::svkTests() const
|
||||||
|
{
|
||||||
|
return {1};
|
||||||
|
};
|
|
@ -0,0 +1,24 @@
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "V2SvkModel.h"
|
||||||
|
#include "V2SvkModel.pb.h"
|
||||||
|
|
||||||
|
class TPrModel : public V2SvkModel
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
TPrModel(QObject *parent);
|
||||||
|
|
||||||
|
unsigned int getV2Points() const override;
|
||||||
|
unsigned int getSvkPoints() const override;
|
||||||
|
|
||||||
|
void write(ESGRAF48::V2SvkModel &model) const override;
|
||||||
|
void read(const ESGRAF48::V2SvkModel &model) override;
|
||||||
|
|
||||||
|
protected:
|
||||||
|
void printHeader(QPainter &) const override{};
|
||||||
|
|
||||||
|
std::set<int> v2Tests() const override;
|
||||||
|
std::set<int> svkTests() const override;
|
||||||
|
};
|
|
@ -1,201 +1,137 @@
|
||||||
#include "V2SvkModel.h"
|
#include "V2SvkModel.h"
|
||||||
|
|
||||||
|
#include <regex>
|
||||||
|
|
||||||
V2SvkModel::V2SvkModel(QObject *parent)
|
V2SvkModel::V2SvkModel(QObject *parent)
|
||||||
: CheckableTestModel(parent)
|
: PrintableModel(parent)
|
||||||
{
|
{
|
||||||
m_tests = {
|
|
||||||
{"W-Frage",
|
|
||||||
{"Affe", "Affe", "Affe", "Affe", "Schwein", "Schwein", "Schwein", "Schwein", "Gans",
|
|
||||||
"Gans", "Gans", "Gans"}},
|
|
||||||
{"Verbtrennung", {"", "Affe", "", "", "", "", "", "Schwein", "", "", "Gans", ""}},
|
|
||||||
{"SVK: /-st/",
|
|
||||||
{"Affe", "Affe", "Affe", "Affe", "Schwein", "Schwein", "Schwein", "Schwein", "Gans",
|
|
||||||
"Gans", "Gans", "Gans"}},
|
|
||||||
|
|
||||||
{"Objekt-Topikalisierung",
|
|
||||||
{"Affe", "Affe", "Affe", "Affe", "Schwein", "Schwein", "Schwein", "Schwein", "Gans",
|
|
||||||
"Gans", "Gans", "Gans"}},
|
|
||||||
{"SVK: Stamm",
|
|
||||||
{"Affe", "Affe", "Affe", "Affe", "Schwein", "Schwein", "Schwein", "Schwein", "Gans",
|
|
||||||
"Gans", "Gans", "Gans"}},
|
|
||||||
|
|
||||||
{"Temporaladverb Präsens", {"Affe", "Affe", "Schwein", "Schwein", "Gans", "Gans"}},
|
|
||||||
{"SKV: /-e/ o. Stamm", {"Affe", "Affe", "Schwein", "Schwein", "Gans", "Gans"}},
|
|
||||||
|
|
||||||
{"Temporaladverb Perfekt", {"Affe", "Affe", "Schwein", "Schwein", "Gans", "Gans"}},
|
|
||||||
{"Verbtrennung", {"Affe", "Affe", "Schwein", "Schwein", "Gans", "Gans"}},
|
|
||||||
{"SVK: /-e/ o. Stamm", {"Affe", "Affe", "Schwein", "Schwein", "Gans", "Gans"}},
|
|
||||||
{"Partizip", {"Affe", "Affe", "Schwein", "Schwein", "Gans", "Gans"}},
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned int V2SvkModel::getV2Points()
|
void V2SvkModel::printTests(QPainter &painter) const
|
||||||
{
|
{
|
||||||
unsigned int points = 0;
|
painter.setFont(tableFont());
|
||||||
|
painter.setPen(tablePen());
|
||||||
|
|
||||||
for (auto testIndex : {0, 1, 3, 5, 7, 8})
|
auto width = painter.device()->width();
|
||||||
|
auto height = 1.5 * painter.fontMetrics().lineSpacing();
|
||||||
|
|
||||||
|
auto v2TestIndices = v2Tests();
|
||||||
|
auto svkTestIndices = svkTests();
|
||||||
|
|
||||||
|
double x = 0;
|
||||||
|
double y = 0;
|
||||||
|
auto testIndex = 0;
|
||||||
|
for (const auto &test : m_tests)
|
||||||
{
|
{
|
||||||
const auto &test = m_tests.at(testIndex);
|
double rowHeaderWidth = headerWidthFactor() * width;
|
||||||
|
double resultCellWidth = (test.size() > 8 ? 0.5 : 1) * cellWidthFactor() * width;
|
||||||
|
double rowHeight = height;
|
||||||
|
|
||||||
|
QString testName = test.name();
|
||||||
|
if (testName.length() > 20)
|
||||||
|
{
|
||||||
|
testName = QString::fromStdString(
|
||||||
|
std::regex_replace(testName.toStdString(), std::regex("[\\s-]"), "\n"));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (testIndex == 0)
|
||||||
|
{
|
||||||
|
drawTextSquare(painter, {x, y, rowHeaderWidth, 2 * rowHeight}, testName);
|
||||||
|
x += rowHeaderWidth;
|
||||||
|
|
||||||
|
std::vector<std::pair<std::string, unsigned int>> columnHeaders;
|
||||||
|
for (const auto &item : test.items())
|
||||||
|
{
|
||||||
|
const auto &itemText = item.getText();
|
||||||
|
if (!columnHeaders.empty() && columnHeaders.back().first == itemText)
|
||||||
|
{
|
||||||
|
columnHeaders.back().second++;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
columnHeaders.emplace_back(itemText, 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const auto &columnHeader : columnHeaders)
|
||||||
|
{
|
||||||
|
double cellWidth = columnHeader.second * resultCellWidth;
|
||||||
|
drawTextSquare(painter, {x, y, cellWidth, rowHeight}, columnHeader.first.c_str());
|
||||||
|
x += cellWidth;
|
||||||
|
}
|
||||||
|
x = rowHeaderWidth;
|
||||||
|
y += rowHeight;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
drawTextSquare(painter, {x, y, rowHeaderWidth, rowHeight}, testName);
|
||||||
|
x += rowHeaderWidth;
|
||||||
|
}
|
||||||
|
|
||||||
|
unsigned int emptyItemsStack = 0;
|
||||||
for (const auto &item : test.items())
|
for (const auto &item : test.items())
|
||||||
{
|
{
|
||||||
if (item.isChecked())
|
if (item.getText().empty())
|
||||||
{
|
{
|
||||||
points++;
|
emptyItemsStack++;
|
||||||
}
|
}
|
||||||
}
|
else
|
||||||
}
|
|
||||||
|
|
||||||
return points;
|
|
||||||
}
|
|
||||||
|
|
||||||
unsigned int V2SvkModel::getSvkPoints()
|
|
||||||
{
|
|
||||||
unsigned int points = 0;
|
|
||||||
|
|
||||||
for (auto testIndex : {2, 4, 6, 9, 10})
|
|
||||||
{
|
|
||||||
const auto &test = m_tests.at(testIndex);
|
|
||||||
|
|
||||||
for (const auto &item : test.items())
|
|
||||||
{
|
|
||||||
if (item.isChecked())
|
|
||||||
{
|
{
|
||||||
points++;
|
if (emptyItemsStack > 0)
|
||||||
|
{
|
||||||
|
drawGreySquare(painter, {x - emptyItemsStack * resultCellWidth, y,
|
||||||
|
emptyItemsStack * resultCellWidth, rowHeight});
|
||||||
|
emptyItemsStack = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
drawCheckSquare(painter, {x, y, resultCellWidth, rowHeight}, item.isChecked());
|
||||||
}
|
}
|
||||||
|
x += resultCellWidth;
|
||||||
}
|
}
|
||||||
|
if (emptyItemsStack > 0)
|
||||||
|
{
|
||||||
|
drawGreySquare(painter, {x - emptyItemsStack * resultCellWidth, y,
|
||||||
|
emptyItemsStack * resultCellWidth, rowHeight});
|
||||||
|
emptyItemsStack = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (v2TestIndices.find(testIndex) != v2TestIndices.end())
|
||||||
|
{
|
||||||
|
drawResultSquare(painter, y, false, test.getPoints());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (svkTestIndices.find(testIndex) != svkTestIndices.end())
|
||||||
|
{
|
||||||
|
drawResultSquare(painter, y, true, test.getPoints());
|
||||||
|
}
|
||||||
|
|
||||||
|
x = 0;
|
||||||
|
y += rowHeight;
|
||||||
|
|
||||||
|
testIndex++;
|
||||||
}
|
}
|
||||||
|
|
||||||
return points;
|
x = 0;
|
||||||
|
y += height;
|
||||||
|
|
||||||
|
painter.translate(0, y);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool V2SvkModel::isValidIndex(const QModelIndex &index) const
|
void V2SvkModel::printSummary(QPainter &painter, unsigned int v2Points, unsigned int svkPoints)
|
||||||
{
|
{
|
||||||
switch (index.row())
|
painter.setFont(PrintableModel::tableFont());
|
||||||
{
|
painter.setPen(PrintableModel::tablePen());
|
||||||
case 1:
|
|
||||||
return index.column() == 1 || index.column() == 7 || index.column() == 10;
|
auto width = painter.device()->width();
|
||||||
case 5:
|
auto height = 1.5 * painter.fontMetrics().lineSpacing();
|
||||||
case 6:
|
|
||||||
case 7:
|
painter.drawText(0, 0, 0.91 * width, height, Qt::AlignRight | Qt::AlignVCenter,
|
||||||
case 8:
|
"Rohwertpunkte Total:");
|
||||||
case 9:
|
|
||||||
case 10:
|
painter.setPen(resultPen());
|
||||||
return index.column() < 6;
|
drawNumberSquare(painter, 0.93 * width, 0, v2Points);
|
||||||
default:
|
drawNumberSquare(painter, 0.97 * width, 0, svkPoints);
|
||||||
return CheckableTestModel::isValidIndex(index);
|
|
||||||
}
|
painter.translate(0, 3 * height);
|
||||||
}
|
}
|
||||||
|
|
||||||
void V2SvkModel::writeProtoBuf(ESGRAF48::V2SvkModel &model) const
|
|
||||||
{
|
|
||||||
auto writeOneVal = [&](ESGRAF48::V2SvkModel::OneEach *modelData, int testIndex) {
|
|
||||||
if (modelData != nullptr)
|
|
||||||
{
|
|
||||||
const auto &testItems = m_tests.at(testIndex).items();
|
|
||||||
|
|
||||||
modelData->set_affe(testItems[1].isChecked());
|
|
||||||
modelData->set_schwein(testItems[7].isChecked());
|
|
||||||
modelData->set_gans(testItems[10].isChecked());
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
auto writeTwoVals = [&](ESGRAF48::V2SvkModel::TwoEach *modelData, int testIndex) {
|
|
||||||
if (modelData != nullptr)
|
|
||||||
{
|
|
||||||
const auto &testItems = m_tests.at(testIndex).items();
|
|
||||||
|
|
||||||
modelData->set_affe1(testItems[0].isChecked());
|
|
||||||
modelData->set_affe2(testItems[1].isChecked());
|
|
||||||
modelData->set_schwein1(testItems[2].isChecked());
|
|
||||||
modelData->set_schwein2(testItems[3].isChecked());
|
|
||||||
modelData->set_gans1(testItems[4].isChecked());
|
|
||||||
modelData->set_gans2(testItems[5].isChecked());
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
auto writeFourVals = [&](ESGRAF48::V2SvkModel::FourEach *modelData, int testIndex) {
|
|
||||||
if (modelData != nullptr)
|
|
||||||
{
|
|
||||||
const auto &testItems = m_tests.at(testIndex).items();
|
|
||||||
|
|
||||||
modelData->set_affe1(testItems[0].isChecked());
|
|
||||||
modelData->set_affe2(testItems[1].isChecked());
|
|
||||||
modelData->set_affe3(testItems[2].isChecked());
|
|
||||||
modelData->set_affe4(testItems[3].isChecked());
|
|
||||||
modelData->set_schwein1(testItems[4].isChecked());
|
|
||||||
modelData->set_schwein2(testItems[5].isChecked());
|
|
||||||
modelData->set_schwein3(testItems[6].isChecked());
|
|
||||||
modelData->set_schwein4(testItems[7].isChecked());
|
|
||||||
modelData->set_gans1(testItems[8].isChecked());
|
|
||||||
modelData->set_gans2(testItems[9].isChecked());
|
|
||||||
modelData->set_gans3(testItems[10].isChecked());
|
|
||||||
modelData->set_gans4(testItems[11].isChecked());
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
writeFourVals(model.mutable_wfrage(), 0);
|
|
||||||
writeOneVal(model.mutable_verbtrennung1(), 1);
|
|
||||||
writeFourVals(model.mutable_svkst(), 2);
|
|
||||||
writeFourVals(model.mutable_objtop(), 3);
|
|
||||||
writeFourVals(model.mutable_svkstamm(), 4);
|
|
||||||
writeTwoVals(model.mutable_temppraes(), 5);
|
|
||||||
writeTwoVals(model.mutable_svke1(), 6);
|
|
||||||
writeTwoVals(model.mutable_tempperf(), 7);
|
|
||||||
writeTwoVals(model.mutable_verbtrennung2(), 8);
|
|
||||||
writeTwoVals(model.mutable_svke2(), 9);
|
|
||||||
writeTwoVals(model.mutable_partizip(), 10);
|
|
||||||
}
|
|
||||||
|
|
||||||
void V2SvkModel::readProtoBuf(const ESGRAF48::V2SvkModel &model)
|
|
||||||
{
|
|
||||||
auto readOneVal = [&](const ESGRAF48::V2SvkModel::OneEach &modelData, int testIndex) {
|
|
||||||
auto &testItems = m_tests.at(testIndex).items();
|
|
||||||
|
|
||||||
testItems[1].setState(modelData.affe());
|
|
||||||
testItems[7].setState(modelData.schwein());
|
|
||||||
testItems[10].setState(modelData.gans());
|
|
||||||
};
|
|
||||||
|
|
||||||
auto readTwoVals = [&](const ESGRAF48::V2SvkModel::TwoEach &modelData, int testIndex) {
|
|
||||||
auto &testItems = m_tests.at(testIndex).items();
|
|
||||||
|
|
||||||
testItems[0].setState(modelData.affe1());
|
|
||||||
testItems[1].setState(modelData.affe2());
|
|
||||||
testItems[2].setState(modelData.schwein1());
|
|
||||||
testItems[3].setState(modelData.schwein2());
|
|
||||||
testItems[4].setState(modelData.gans1());
|
|
||||||
testItems[5].setState(modelData.gans2());
|
|
||||||
};
|
|
||||||
|
|
||||||
auto readFourVals = [&](const ESGRAF48::V2SvkModel::FourEach &modelData, int testIndex) {
|
|
||||||
auto &testItems = m_tests.at(testIndex).items();
|
|
||||||
|
|
||||||
testItems[0].setState(modelData.affe1());
|
|
||||||
testItems[1].setState(modelData.affe2());
|
|
||||||
testItems[2].setState(modelData.affe3());
|
|
||||||
testItems[3].setState(modelData.affe4());
|
|
||||||
testItems[4].setState(modelData.schwein1());
|
|
||||||
testItems[5].setState(modelData.schwein2());
|
|
||||||
testItems[6].setState(modelData.schwein3());
|
|
||||||
testItems[7].setState(modelData.schwein4());
|
|
||||||
testItems[8].setState(modelData.gans1());
|
|
||||||
testItems[9].setState(modelData.gans2());
|
|
||||||
testItems[10].setState(modelData.gans3());
|
|
||||||
testItems[11].setState(modelData.gans4());
|
|
||||||
};
|
|
||||||
|
|
||||||
readFourVals(model.wfrage(), 0);
|
|
||||||
readOneVal(model.verbtrennung1(), 1);
|
|
||||||
readFourVals(model.svkst(), 2);
|
|
||||||
readFourVals(model.objtop(), 3);
|
|
||||||
readFourVals(model.svkstamm(), 4);
|
|
||||||
readTwoVals(model.temppraes(), 5);
|
|
||||||
readTwoVals(model.svke1(), 6);
|
|
||||||
readTwoVals(model.tempperf(), 7);
|
|
||||||
readTwoVals(model.verbtrennung2(), 8);
|
|
||||||
readTwoVals(model.svke2(), 9);
|
|
||||||
readTwoVals(model.partizip(), 10);
|
|
||||||
|
|
||||||
emit dataChanged(index(0, 0), index(rowCount() - 1, columnCount() - 1));
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,21 +1,27 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "CheckableTestModel.h"
|
#include "PrintableModel.h"
|
||||||
#include "V2SvkModel.pb.h"
|
#include "V2SvkModel.pb.h"
|
||||||
|
|
||||||
class V2SvkModel : public CheckableTestModel
|
class V2SvkModel : public PrintableModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
V2SvkModel(QObject *parent);
|
V2SvkModel(QObject *parent);
|
||||||
|
|
||||||
unsigned int getV2Points();
|
virtual unsigned int getV2Points() const = 0;
|
||||||
unsigned int getSvkPoints();
|
virtual unsigned int getSvkPoints() const = 0;
|
||||||
|
|
||||||
void writeProtoBuf(ESGRAF48::V2SvkModel &model) const;
|
virtual void write(ESGRAF48::V2SvkModel &model) const = 0;
|
||||||
void readProtoBuf(const ESGRAF48::V2SvkModel &model);
|
virtual void read(const ESGRAF48::V2SvkModel &model) = 0;
|
||||||
|
|
||||||
|
static void printSummary(QPainter &painter, unsigned int v2Points, unsigned int svkPoints);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
bool isValidIndex(const QModelIndex &index) const override;
|
void printTests(QPainter &painter) const override;
|
||||||
|
void printSummary(QPainter &painter) const override {};
|
||||||
|
|
||||||
|
virtual std::set<int> v2Tests() const = 0;
|
||||||
|
virtual std::set<int> svkTests() const = 0;
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,14 +1,20 @@
|
||||||
#include "V2SvkWidget.h"
|
#include "V2SvkWidget.h"
|
||||||
#include "ui_V2SvkWidget.h"
|
#include "ui_V2SvkWidget.h"
|
||||||
|
|
||||||
#include "V2SvkModel.h"
|
#include "WFModel.h"
|
||||||
|
#include "OTModel.h"
|
||||||
|
#include "TPrModel.h"
|
||||||
|
#include "TPeModel.h"
|
||||||
|
|
||||||
V2SvkWidget::V2SvkWidget(QWidget *parent)
|
V2SvkWidget::V2SvkWidget(QWidget *parent)
|
||||||
: QWidget(parent)
|
: QWidget(parent)
|
||||||
, ui(new Ui::V2SvkWidget)
|
, ui(new Ui::V2SvkWidget)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
ui->v2SvkTableView->horizontalHeader()->hide();
|
ui->wfTableView->horizontalHeader()->hide();
|
||||||
|
ui->otTableView->horizontalHeader()->hide();
|
||||||
|
ui->tprTableView->horizontalHeader()->hide();
|
||||||
|
ui->tpeTableView->horizontalHeader()->hide();
|
||||||
}
|
}
|
||||||
|
|
||||||
V2SvkWidget::~V2SvkWidget()
|
V2SvkWidget::~V2SvkWidget()
|
||||||
|
@ -16,7 +22,22 @@ V2SvkWidget::~V2SvkWidget()
|
||||||
delete ui;
|
delete ui;
|
||||||
}
|
}
|
||||||
|
|
||||||
void V2SvkWidget::setV2SvkModel(V2SvkModel *model)
|
void V2SvkWidget::setWFModel(WFModel *model)
|
||||||
{
|
{
|
||||||
ui->v2SvkTableView->setModel(model);
|
ui->wfTableView->setModel(model);
|
||||||
|
}
|
||||||
|
|
||||||
|
void V2SvkWidget::setOTModel(OTModel *model)
|
||||||
|
{
|
||||||
|
ui->otTableView->setModel(model);
|
||||||
|
}
|
||||||
|
|
||||||
|
void V2SvkWidget::setTPrModel(TPrModel *model)
|
||||||
|
{
|
||||||
|
ui->tprTableView->setModel(model);
|
||||||
|
}
|
||||||
|
|
||||||
|
void V2SvkWidget::setTPeModel(TPeModel *model)
|
||||||
|
{
|
||||||
|
ui->tpeTableView->setModel(model);
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,10 @@
|
||||||
|
|
||||||
#include <QWidget>
|
#include <QWidget>
|
||||||
|
|
||||||
class V2SvkModel;
|
class WFModel;
|
||||||
|
class OTModel;
|
||||||
|
class TPrModel;
|
||||||
|
class TPeModel;
|
||||||
|
|
||||||
namespace Ui {
|
namespace Ui {
|
||||||
class V2SvkWidget;
|
class V2SvkWidget;
|
||||||
|
@ -19,5 +22,8 @@ public:
|
||||||
V2SvkWidget(QWidget *parent = nullptr);
|
V2SvkWidget(QWidget *parent = nullptr);
|
||||||
~V2SvkWidget();
|
~V2SvkWidget();
|
||||||
|
|
||||||
void setV2SvkModel(V2SvkModel *model);
|
void setWFModel(WFModel *model);
|
||||||
|
void setOTModel(OTModel *model);
|
||||||
|
void setTPrModel(TPrModel *model);
|
||||||
|
void setTPeModel(TPeModel *model);
|
||||||
};
|
};
|
||||||
|
|
|
@ -15,7 +15,16 @@
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout">
|
<layout class="QVBoxLayout" name="verticalLayout">
|
||||||
<item>
|
<item>
|
||||||
<widget class="QTableView" name="v2SvkTableView"/>
|
<widget class="QTableView" name="wfTableView"/>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QTableView" name="otTableView"/>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QTableView" name="tprTableView"/>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QTableView" name="tpeTableView"/>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
|
|
|
@ -0,0 +1,147 @@
|
||||||
|
#include "WFModel.h"
|
||||||
|
|
||||||
|
WFModel::WFModel(QObject *parent)
|
||||||
|
: V2SvkModel(parent)
|
||||||
|
{
|
||||||
|
m_title = "Subtest 1: Verbzweitstellungsregel (V2) und Subjekt-Verb-Kontrollregel (SVK)";
|
||||||
|
|
||||||
|
m_tests = {
|
||||||
|
{"W-Frage",
|
||||||
|
{"Affe", "Affe", "Affe", "Affe", "Schwein", "Schwein", "Schwein", "Schwein", "Gans",
|
||||||
|
"Gans", "Gans", "Gans"}},
|
||||||
|
{"Verbtrennung", {"", "Affe", "", "", "", "", "", "Schwein", "", "", "Gans", ""}},
|
||||||
|
{"SVK: /-st/",
|
||||||
|
{"Affe", "Affe", "Affe", "Affe", "Schwein", "Schwein", "Schwein", "Schwein", "Gans",
|
||||||
|
"Gans", "Gans", "Gans"}},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
unsigned int WFModel::getV2Points() const
|
||||||
|
{
|
||||||
|
unsigned int points = 0;
|
||||||
|
|
||||||
|
for (auto testIndex : {0, 1})
|
||||||
|
{
|
||||||
|
const auto &test = m_tests.at(testIndex);
|
||||||
|
|
||||||
|
for (const auto &item : test.items())
|
||||||
|
{
|
||||||
|
if (item.isChecked())
|
||||||
|
{
|
||||||
|
points++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return points;
|
||||||
|
}
|
||||||
|
|
||||||
|
unsigned int WFModel::getSvkPoints() const
|
||||||
|
{
|
||||||
|
unsigned int points = 0;
|
||||||
|
|
||||||
|
for (auto testIndex : {2})
|
||||||
|
{
|
||||||
|
const auto &test = m_tests.at(testIndex);
|
||||||
|
|
||||||
|
for (const auto &item : test.items())
|
||||||
|
{
|
||||||
|
if (item.isChecked())
|
||||||
|
{
|
||||||
|
points++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return points;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool WFModel::isValidIndex(const QModelIndex &index) const
|
||||||
|
{
|
||||||
|
if (index.row() == 1)
|
||||||
|
{
|
||||||
|
return index.column() == 1 || index.column() == 7 || index.column() == 10;
|
||||||
|
}
|
||||||
|
|
||||||
|
return CheckableTestModel::isValidIndex(index);
|
||||||
|
}
|
||||||
|
|
||||||
|
void WFModel::write(ESGRAF48::V2SvkModel &model) const
|
||||||
|
{
|
||||||
|
auto writeOneVal = [&](ESGRAF48::V2SvkModel::OneEach *modelData, int testIndex) {
|
||||||
|
if (modelData != nullptr)
|
||||||
|
{
|
||||||
|
const auto &testItems = m_tests.at(testIndex).items();
|
||||||
|
|
||||||
|
modelData->set_affe(testItems[1].isChecked());
|
||||||
|
modelData->set_schwein(testItems[7].isChecked());
|
||||||
|
modelData->set_gans(testItems[10].isChecked());
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
auto writeFourVals = [&](ESGRAF48::V2SvkModel::FourEach *modelData, int testIndex) {
|
||||||
|
if (modelData != nullptr)
|
||||||
|
{
|
||||||
|
const auto &testItems = m_tests.at(testIndex).items();
|
||||||
|
|
||||||
|
modelData->set_affe1(testItems[0].isChecked());
|
||||||
|
modelData->set_affe2(testItems[1].isChecked());
|
||||||
|
modelData->set_affe3(testItems[2].isChecked());
|
||||||
|
modelData->set_affe4(testItems[3].isChecked());
|
||||||
|
modelData->set_schwein1(testItems[4].isChecked());
|
||||||
|
modelData->set_schwein2(testItems[5].isChecked());
|
||||||
|
modelData->set_schwein3(testItems[6].isChecked());
|
||||||
|
modelData->set_schwein4(testItems[7].isChecked());
|
||||||
|
modelData->set_gans1(testItems[8].isChecked());
|
||||||
|
modelData->set_gans2(testItems[9].isChecked());
|
||||||
|
modelData->set_gans3(testItems[10].isChecked());
|
||||||
|
modelData->set_gans4(testItems[11].isChecked());
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
writeFourVals(model.mutable_wfrage(), 0);
|
||||||
|
writeOneVal(model.mutable_verbtrennung1(), 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
void WFModel::read(const ESGRAF48::V2SvkModel &model)
|
||||||
|
{
|
||||||
|
auto readOneVal = [&](const ESGRAF48::V2SvkModel::OneEach &modelData, int testIndex) {
|
||||||
|
auto &testItems = m_tests.at(testIndex).items();
|
||||||
|
|
||||||
|
testItems[1].setState(modelData.affe());
|
||||||
|
testItems[7].setState(modelData.schwein());
|
||||||
|
testItems[10].setState(modelData.gans());
|
||||||
|
};
|
||||||
|
|
||||||
|
auto readFourVals = [&](const ESGRAF48::V2SvkModel::FourEach &modelData, int testIndex) {
|
||||||
|
auto &testItems = m_tests.at(testIndex).items();
|
||||||
|
|
||||||
|
testItems[0].setState(modelData.affe1());
|
||||||
|
testItems[1].setState(modelData.affe2());
|
||||||
|
testItems[2].setState(modelData.affe3());
|
||||||
|
testItems[3].setState(modelData.affe4());
|
||||||
|
testItems[4].setState(modelData.schwein1());
|
||||||
|
testItems[5].setState(modelData.schwein2());
|
||||||
|
testItems[6].setState(modelData.schwein3());
|
||||||
|
testItems[7].setState(modelData.schwein4());
|
||||||
|
testItems[8].setState(modelData.gans1());
|
||||||
|
testItems[9].setState(modelData.gans2());
|
||||||
|
testItems[10].setState(modelData.gans3());
|
||||||
|
testItems[11].setState(modelData.gans4());
|
||||||
|
};
|
||||||
|
|
||||||
|
readFourVals(model.wfrage(), 0);
|
||||||
|
readOneVal(model.verbtrennung1(), 1);
|
||||||
|
|
||||||
|
emit dataChanged(index(0, 0), index(rowCount() - 1, columnCount() - 1));
|
||||||
|
}
|
||||||
|
|
||||||
|
std::set<int> WFModel::v2Tests() const
|
||||||
|
{
|
||||||
|
return {0, 1};
|
||||||
|
};
|
||||||
|
|
||||||
|
std::set<int> WFModel::svkTests() const
|
||||||
|
{
|
||||||
|
return {2};
|
||||||
|
};
|
|
@ -0,0 +1,24 @@
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "V2SvkModel.h"
|
||||||
|
#include "V2SvkModel.pb.h"
|
||||||
|
|
||||||
|
class WFModel : public V2SvkModel
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
WFModel(QObject *parent);
|
||||||
|
|
||||||
|
unsigned int getV2Points() const override;
|
||||||
|
unsigned int getSvkPoints() const override;
|
||||||
|
|
||||||
|
void write(ESGRAF48::V2SvkModel &model) const override;
|
||||||
|
void read(const ESGRAF48::V2SvkModel &model) override;
|
||||||
|
|
||||||
|
protected:
|
||||||
|
std::set<int> v2Tests() const override;
|
||||||
|
std::set<int> svkTests() const override;
|
||||||
|
|
||||||
|
bool isValidIndex(const QModelIndex &index) const override;
|
||||||
|
};
|
|
@ -42,6 +42,7 @@ target_link_libraries(${PROJECT_NAME}
|
||||||
CheckableItem
|
CheckableItem
|
||||||
CheckableTest
|
CheckableTest
|
||||||
CheckableTestModel
|
CheckableTestModel
|
||||||
|
PrintableModel
|
||||||
Qt5::Widgets
|
Qt5::Widgets
|
||||||
${Protobuf_LIBRARIES}
|
${Protobuf_LIBRARIES}
|
||||||
)
|
)
|
||||||
|
|
|
@ -1,18 +1,17 @@
|
||||||
#include "VerbEndModel.h"
|
#include "VerbEndModel.h"
|
||||||
|
|
||||||
VerbEndModel::VerbEndModel(QObject *parent)
|
VerbEndModel::VerbEndModel(QObject *parent)
|
||||||
: CheckableTestModel(parent)
|
: PrintableModel(parent)
|
||||||
{
|
{
|
||||||
m_tests = { { "Telefonat",
|
m_title = "Subtest 2: Verbendstellungsregel (VE)";
|
||||||
{ "Kausal", "Kausal", "Relativ", "Kausal",
|
|
||||||
"Final", "Temporal", "Temporal" } },
|
m_tests = {
|
||||||
{ "Zaubertrick", { "Relativ", "Final", "Kausal", "Final",
|
{"Telefonat", {"Kausal", "Kausal", "Relativ", "Kausal", "Final", "Temporal", "Temporal"}},
|
||||||
"Temporal", "Kausal", "Temporal" } },
|
{"Zaubertrick", {"Relativ", "Final", "Kausal", "Final", "Temporal", "Kausal", "Temporal"}},
|
||||||
{ "Zauberregel", { "Temporal", "Kausal", "Final", "Relativ",
|
{"Zauberregel", {"Temporal", "Kausal", "Final", "Relativ", "Temporal", "Relativ"}}};
|
||||||
"Temporal", "Relativ" } } };
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void VerbEndModel::writeProtoBuf(ESGRAF48::VerbEndModel &model) const
|
void VerbEndModel::write(ESGRAF48::VerbEndModel &model) const
|
||||||
{
|
{
|
||||||
auto *telefonatModel = model.mutable_telefonat();
|
auto *telefonatModel = model.mutable_telefonat();
|
||||||
if (telefonatModel != nullptr)
|
if (telefonatModel != nullptr)
|
||||||
|
@ -56,7 +55,7 @@ void VerbEndModel::writeProtoBuf(ESGRAF48::VerbEndModel &model) const
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void VerbEndModel::readProtoBuf(const ESGRAF48::VerbEndModel &model)
|
void VerbEndModel::read(const ESGRAF48::VerbEndModel &model)
|
||||||
{
|
{
|
||||||
const auto &telefonatModel = model.telefonat();
|
const auto &telefonatModel = model.telefonat();
|
||||||
{
|
{
|
||||||
|
@ -98,3 +97,32 @@ void VerbEndModel::readProtoBuf(const ESGRAF48::VerbEndModel &model)
|
||||||
|
|
||||||
emit dataChanged(index(0, 0), index(rowCount() - 1, columnCount() - 1));
|
emit dataChanged(index(0, 0), index(rowCount() - 1, columnCount() - 1));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
unsigned int VerbEndModel::getKausalPoints() const
|
||||||
|
{
|
||||||
|
auto points = [&](unsigned int testId, unsigned int itemId) {
|
||||||
|
return m_tests.at(testId).items().at(itemId).points();
|
||||||
|
};
|
||||||
|
|
||||||
|
return points(0, 0) + points(0, 1) + points(0, 3) + points(1, 2) + points(1, 5) + points(2, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
void VerbEndModel::printSummary(QPainter &painter) const
|
||||||
|
{
|
||||||
|
painter.setFont(tableFont());
|
||||||
|
|
||||||
|
auto width = painter.device()->width();
|
||||||
|
auto height = 1.5 * painter.fontMetrics().lineSpacing();
|
||||||
|
|
||||||
|
painter.drawText(0, 0, 0.71 * width, height, Qt::AlignRight | Qt::AlignVCenter,
|
||||||
|
"Rohwertpunkte Kausalsätze:");
|
||||||
|
painter.drawText(0, 0, 0.95 * width, height, Qt::AlignRight | Qt::AlignVCenter,
|
||||||
|
"Rohwertpunkte Total:");
|
||||||
|
|
||||||
|
drawNumberSquare(painter, 0.73 * width, 0, getKausalPoints());
|
||||||
|
|
||||||
|
painter.setPen(resultPen());
|
||||||
|
drawNumberSquare(painter, 0.97 * width, 0, getKausalPoints());
|
||||||
|
|
||||||
|
painter.translate(0, 3 * height);
|
||||||
|
}
|
||||||
|
|
|
@ -1,15 +1,20 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "CheckableTestModel.h"
|
#include "PrintableModel.h"
|
||||||
#include "VerbEndModel.pb.h"
|
#include "VerbEndModel.pb.h"
|
||||||
|
|
||||||
class VerbEndModel : public CheckableTestModel
|
class VerbEndModel : public PrintableModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
VerbEndModel(QObject *parent);
|
VerbEndModel(QObject *parent);
|
||||||
|
|
||||||
void writeProtoBuf(ESGRAF48::VerbEndModel &model) const;
|
void write(ESGRAF48::VerbEndModel &model) const;
|
||||||
void readProtoBuf(const ESGRAF48::VerbEndModel &model);
|
void read(const ESGRAF48::VerbEndModel &model);
|
||||||
|
|
||||||
|
unsigned int getKausalPoints() const;
|
||||||
|
|
||||||
|
protected:
|
||||||
|
void printSummary(QPainter &painter) const override;
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#include "mainwindow.h"
|
#include "mainwindow.h"
|
||||||
#include "ui_mainwindow.h"
|
#include "ui_mainwindow.h"
|
||||||
|
|
||||||
#include "DataModel.h"
|
#include "version.h"
|
||||||
|
|
||||||
#include <QJsonObject>
|
#include <QJsonObject>
|
||||||
#include <QJsonDocument>
|
#include <QJsonDocument>
|
||||||
|
@ -13,6 +13,7 @@
|
||||||
#include <QtPrintSupport/QPrinter>
|
#include <QtPrintSupport/QPrinter>
|
||||||
#include <QtPrintSupport/QPrintDialog>
|
#include <QtPrintSupport/QPrintDialog>
|
||||||
#include <QTextDocument>
|
#include <QTextDocument>
|
||||||
|
#include <QPainter>
|
||||||
|
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
|
|
||||||
|
@ -21,16 +22,53 @@
|
||||||
MainWindow::MainWindow(QWidget *parent)
|
MainWindow::MainWindow(QWidget *parent)
|
||||||
: QMainWindow(parent)
|
: QMainWindow(parent)
|
||||||
, ui(new Ui::MainWindow)
|
, ui(new Ui::MainWindow)
|
||||||
|
, m_dataModel(this)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
setupUi();
|
||||||
|
|
||||||
|
newFile();
|
||||||
|
}
|
||||||
|
|
||||||
|
MainWindow::MainWindow(QWidget *parent, const QString &filename)
|
||||||
|
: QMainWindow(parent)
|
||||||
|
, ui(new Ui::MainWindow)
|
||||||
|
, m_dataModel(this)
|
||||||
|
{
|
||||||
|
ui->setupUi(this);
|
||||||
|
setupUi();
|
||||||
|
|
||||||
|
openFile(filename);
|
||||||
|
}
|
||||||
|
|
||||||
|
void MainWindow::setupUi()
|
||||||
|
{
|
||||||
|
ui->metaDataWidget->setModel(&m_dataModel.m_metaData);
|
||||||
|
ui->verbEndWidget->setModel(&m_dataModel.m_verbEnd);
|
||||||
|
ui->genusWidget->setModel(&m_dataModel.m_genus);
|
||||||
|
ui->pluralWidget->setModel(&m_dataModel.m_plural);
|
||||||
|
ui->akkusativDativWidget->setAkkusativModel(&m_dataModel.m_akkusativ);
|
||||||
|
ui->akkusativDativWidget->setDativModel(&m_dataModel.m_dativ);
|
||||||
|
|
||||||
|
ui->v2SvkWidget->setWFModel(&m_dataModel.m_wfModel);
|
||||||
|
ui->v2SvkWidget->setOTModel(&m_dataModel.m_otModel);
|
||||||
|
ui->v2SvkWidget->setTPrModel(&m_dataModel.m_tPrModel);
|
||||||
|
ui->v2SvkWidget->setTPeModel(&m_dataModel.m_tPeModel);
|
||||||
|
|
||||||
|
ui->lateSkillsWidget->setPassivModel(&m_dataModel.m_passiv);
|
||||||
|
ui->lateSkillsWidget->setGenitivModel(&m_dataModel.m_genitiv);
|
||||||
|
ui->resultWidget->setModel(&m_dataModel.m_results);
|
||||||
|
|
||||||
connect(ui->actionNew, &QAction::triggered, this, &MainWindow::newFile);
|
connect(ui->actionNew, &QAction::triggered, this, &MainWindow::newFile);
|
||||||
connect(ui->actionOpen, &QAction::triggered, this, &MainWindow::openFile);
|
connect(ui->actionOpen, &QAction::triggered, this, qOverload<>(&MainWindow::openFile));
|
||||||
connect(ui->actionSave, &QAction::triggered, this, qOverload<>(&MainWindow::saveFile));
|
connect(ui->actionSave, &QAction::triggered, this, qOverload<>(&MainWindow::saveFile));
|
||||||
connect(ui->actionSave_as, &QAction::triggered, this, &MainWindow::saveFileAs);
|
connect(ui->actionSave_as, &QAction::triggered, this, &MainWindow::saveFileAs);
|
||||||
connect(ui->actionPrint, &QAction::triggered, this, &MainWindow::print);
|
connect(ui->actionPrint, &QAction::triggered, this, &MainWindow::print);
|
||||||
|
connect(ui->actionExport_PDF, &QAction::triggered, this, qOverload<>(&MainWindow::savePdf));
|
||||||
|
|
||||||
newFile();
|
connect(ui->actionAbout, &QAction::triggered, this, &MainWindow::aboutDialog);
|
||||||
|
|
||||||
|
connect(&m_dataModel, &DataModel::modelChanged, this, &MainWindow::dataModelChanged);
|
||||||
}
|
}
|
||||||
|
|
||||||
MainWindow::~MainWindow()
|
MainWindow::~MainWindow()
|
||||||
|
@ -42,21 +80,6 @@ void MainWindow::newFile()
|
||||||
{
|
{
|
||||||
closeFile();
|
closeFile();
|
||||||
|
|
||||||
m_dataModel = std::make_unique<DataModel>(this);
|
|
||||||
ui->metaDataWidget->setModel(&m_dataModel->m_metaData);
|
|
||||||
ui->verbEndWidget->setModel(&m_dataModel->m_verbEnd);
|
|
||||||
ui->genusWidget->setModel(&m_dataModel->m_genus);
|
|
||||||
ui->pluralWidget->setModel(&m_dataModel->m_plural);
|
|
||||||
ui->akkusativDativWidget->setAkkusativModel(&m_dataModel->m_akkusativ);
|
|
||||||
ui->akkusativDativWidget->setDativModel(&m_dataModel->m_dativ);
|
|
||||||
ui->v2SvkWidget->setV2SvkModel(&m_dataModel->m_v2Svk);
|
|
||||||
ui->lateSkillsWidget->setPassivModel(&m_dataModel->m_passiv);
|
|
||||||
ui->lateSkillsWidget->setGenitivModel(&m_dataModel->m_genitiv);
|
|
||||||
|
|
||||||
ui->resultWidget->setModel(&m_dataModel->m_results);
|
|
||||||
|
|
||||||
connect(&*m_dataModel, &DataModel::modelChanged, this, &MainWindow::dataModelChanged);
|
|
||||||
|
|
||||||
setWindowModified(false);
|
setWindowModified(false);
|
||||||
setWindowTitle("untitled[*]");
|
setWindowTitle("untitled[*]");
|
||||||
m_filename = "";
|
m_filename = "";
|
||||||
|
@ -72,10 +95,22 @@ void MainWindow::openFile()
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
openFile(filename);
|
||||||
|
}
|
||||||
|
catch (std::exception &e)
|
||||||
|
{
|
||||||
|
QString errorMessage = QString("Error loading \"") + filename + "\": " + e.what();
|
||||||
|
QMessageBox::critical(this, "Error", errorMessage);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void MainWindow::openFile(const QString &filename)
|
||||||
|
{
|
||||||
closeFile();
|
closeFile();
|
||||||
|
|
||||||
std::fstream protoInFile(filename.toStdString(), std::ios::in | std::ios::binary);
|
m_dataModel.read(filename);
|
||||||
m_dataModel->readProtoBuf(protoInFile);
|
|
||||||
|
|
||||||
setWindowModified(false);
|
setWindowModified(false);
|
||||||
setWindowTitle(filename + "[*]");
|
setWindowTitle(filename + "[*]");
|
||||||
|
@ -99,14 +134,19 @@ void MainWindow::saveFile()
|
||||||
|
|
||||||
void MainWindow::saveFileAs()
|
void MainWindow::saveFileAs()
|
||||||
{
|
{
|
||||||
QString filename =
|
QFileDialog saveFilenameDialog(this);
|
||||||
QFileDialog::getSaveFileName(this, "Save file", "", "ESGRAF 4-8 (*.esgraf48)");
|
saveFilenameDialog.setAcceptMode(QFileDialog::AcceptSave);
|
||||||
if (filename.isEmpty())
|
saveFilenameDialog.setDefaultSuffix("esgraf48");
|
||||||
|
saveFilenameDialog.setFileMode(QFileDialog::AnyFile);
|
||||||
|
saveFilenameDialog.setNameFilter("ESGRAF 4-8 (*.esgraf48)");
|
||||||
|
saveFilenameDialog.setWindowTitle("Save file");
|
||||||
|
|
||||||
|
if (!saveFilenameDialog.exec())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
saveFile(filename);
|
saveFile(saveFilenameDialog.selectedFiles().first());
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::closeFile()
|
void MainWindow::closeFile()
|
||||||
|
@ -128,10 +168,9 @@ void MainWindow::closeFile()
|
||||||
|
|
||||||
void MainWindow::print() const
|
void MainWindow::print() const
|
||||||
{
|
{
|
||||||
//std::ofstream htmlfile("print.html");
|
|
||||||
//htmlfile << m_dataModel->toHtml();
|
|
||||||
|
|
||||||
QPrinter printer;
|
QPrinter printer;
|
||||||
|
printer.setPaperSize(QPrinter::A4);
|
||||||
|
printer.setPageMargins(20, 20, 20, 20, QPrinter::Millimeter);
|
||||||
|
|
||||||
QPrintDialog dialog(&printer);
|
QPrintDialog dialog(&printer);
|
||||||
if (dialog.exec() != QDialog::Accepted)
|
if (dialog.exec() != QDialog::Accepted)
|
||||||
|
@ -139,10 +178,7 @@ void MainWindow::print() const
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
QTextDocument printDoc;
|
m_dataModel.printTo(printer);
|
||||||
printDoc.setHtml(QString::fromStdString(m_dataModel->toHtml()));
|
|
||||||
|
|
||||||
printDoc.print(&printer);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::dataModelChanged()
|
void MainWindow::dataModelChanged()
|
||||||
|
@ -151,6 +187,22 @@ void MainWindow::dataModelChanged()
|
||||||
setWindowModified(true);
|
setWindowModified(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void MainWindow::savePdf()
|
||||||
|
{
|
||||||
|
QFileDialog saveFilenameDialog(this);
|
||||||
|
saveFilenameDialog.setDefaultSuffix("pdf");
|
||||||
|
saveFilenameDialog.setFileMode(QFileDialog::AnyFile);
|
||||||
|
saveFilenameDialog.setNameFilter("PDF File (*.pdf)");
|
||||||
|
saveFilenameDialog.setWindowTitle("Save file");
|
||||||
|
|
||||||
|
if (!saveFilenameDialog.exec())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
savePdf(saveFilenameDialog.selectedFiles().first());
|
||||||
|
}
|
||||||
|
|
||||||
void MainWindow::closeEvent(QCloseEvent *event)
|
void MainWindow::closeEvent(QCloseEvent *event)
|
||||||
{
|
{
|
||||||
closeFile();
|
closeFile();
|
||||||
|
@ -158,9 +210,16 @@ void MainWindow::closeEvent(QCloseEvent *event)
|
||||||
|
|
||||||
void MainWindow::saveFile(const QString &filename)
|
void MainWindow::saveFile(const QString &filename)
|
||||||
{
|
{
|
||||||
std::fstream protoOutFile(filename.toStdString(),
|
try
|
||||||
std::ios::out | std::ios::trunc | std::ios::binary);
|
{
|
||||||
m_dataModel->writeProtoBuf(protoOutFile);
|
m_dataModel.write(filename);
|
||||||
|
}
|
||||||
|
catch (std::exception &e)
|
||||||
|
{
|
||||||
|
QString errorMessage = QString("Error saving \"") + filename + "\": " + e.what();
|
||||||
|
QMessageBox::critical(this, "Error", errorMessage);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
qDebug() << "Wrote" << filename;
|
qDebug() << "Wrote" << filename;
|
||||||
|
|
||||||
|
@ -169,3 +228,21 @@ void MainWindow::saveFile(const QString &filename)
|
||||||
m_filename = filename;
|
m_filename = filename;
|
||||||
m_saveOnClose = false;
|
m_saveOnClose = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void MainWindow::savePdf(const QString &filename)
|
||||||
|
{
|
||||||
|
QPrinter printer;
|
||||||
|
printer.setOutputFormat(QPrinter::PdfFormat);
|
||||||
|
printer.setPaperSize(QPrinter::A4);
|
||||||
|
printer.setPageMargins(20, 20, 20, 20, QPrinter::Millimeter);
|
||||||
|
printer.setOutputFileName(filename);
|
||||||
|
|
||||||
|
m_dataModel.printTo(printer);
|
||||||
|
}
|
||||||
|
|
||||||
|
void MainWindow::aboutDialog()
|
||||||
|
{
|
||||||
|
QString infoString =
|
||||||
|
QString::fromUtf8(ESGRAF48_DESCRIPTION) + " Version " + QString::fromUtf8(ESGRAF48_VERSION);
|
||||||
|
QMessageBox::information(this, ESGRAF48_DESCRIPTION, infoString);
|
||||||
|
}
|
||||||
|
|
|
@ -1,8 +1,11 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <QMainWindow>
|
#include "DataModel.h"
|
||||||
|
|
||||||
|
#include <QMainWindow>
|
||||||
|
#include <QString>
|
||||||
|
#include <QFont>
|
||||||
|
|
||||||
#include <memory>
|
|
||||||
|
|
||||||
class DataModel;
|
class DataModel;
|
||||||
class QDataWidgetMapper;
|
class QDataWidgetMapper;
|
||||||
|
@ -17,26 +20,32 @@ class MainWindow : public QMainWindow
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Ui::MainWindow *ui;
|
Ui::MainWindow *ui;
|
||||||
std::unique_ptr<DataModel> m_dataModel;
|
DataModel m_dataModel;
|
||||||
QString m_filename;
|
QString m_filename;
|
||||||
bool m_saveOnClose = false;
|
bool m_saveOnClose = false;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
MainWindow(QWidget *parent = nullptr);
|
MainWindow(QWidget *parent);
|
||||||
|
MainWindow(QWidget *parent, const QString &filename);
|
||||||
~MainWindow();
|
~MainWindow();
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
void newFile();
|
void newFile();
|
||||||
void openFile();
|
void openFile();
|
||||||
|
void openFile(const QString &filename);
|
||||||
void saveFile();
|
void saveFile();
|
||||||
void saveFileAs();
|
void saveFileAs();
|
||||||
void closeFile();
|
void closeFile();
|
||||||
void print() const;
|
void print() const;
|
||||||
void dataModelChanged();
|
void dataModelChanged();
|
||||||
|
void savePdf();
|
||||||
|
void aboutDialog();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void closeEvent(QCloseEvent *event) override;
|
void closeEvent(QCloseEvent *event) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
void setupUi();
|
||||||
void saveFile(const QString &filename);
|
void saveFile(const QString &filename);
|
||||||
|
void savePdf(const QString &filename);
|
||||||
};
|
};
|
||||||
|
|
|
@ -133,10 +133,18 @@
|
||||||
<addaction name="actionSave_as"/>
|
<addaction name="actionSave_as"/>
|
||||||
<addaction name="separator"/>
|
<addaction name="separator"/>
|
||||||
<addaction name="actionPrint"/>
|
<addaction name="actionPrint"/>
|
||||||
|
<addaction name="actionExport_PDF"/>
|
||||||
<addaction name="separator"/>
|
<addaction name="separator"/>
|
||||||
<addaction name="actionQuit"/>
|
<addaction name="actionQuit"/>
|
||||||
</widget>
|
</widget>
|
||||||
|
<widget class="QMenu" name="menuHelp">
|
||||||
|
<property name="title">
|
||||||
|
<string>Help</string>
|
||||||
|
</property>
|
||||||
|
<addaction name="actionAbout"/>
|
||||||
|
</widget>
|
||||||
<addaction name="menuFile"/>
|
<addaction name="menuFile"/>
|
||||||
|
<addaction name="menuHelp"/>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QToolBar" name="toolBar">
|
<widget class="QToolBar" name="toolBar">
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
|
@ -228,6 +236,19 @@
|
||||||
<string>Ctrl+P</string>
|
<string>Ctrl+P</string>
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
|
<action name="actionExport_PDF">
|
||||||
|
<property name="text">
|
||||||
|
<string>Export PDF</string>
|
||||||
|
</property>
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>Export as PDF file</string>
|
||||||
|
</property>
|
||||||
|
</action>
|
||||||
|
<action name="actionAbout">
|
||||||
|
<property name="text">
|
||||||
|
<string>About</string>
|
||||||
|
</property>
|
||||||
|
</action>
|
||||||
</widget>
|
</widget>
|
||||||
<customwidgets>
|
<customwidgets>
|
||||||
<customwidget>
|
<customwidget>
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#define ESGRAF48_VERSION "@PROJECT_VERSION@"
|
||||||
|
#define ESGRAF48_DESCRIPTION "@PROJECT_DESCRIPTION@"
|
|
@ -0,0 +1,40 @@
|
||||||
|
#include <catch2/catch.hpp>
|
||||||
|
|
||||||
|
#include "Age.h"
|
||||||
|
|
||||||
|
TEST_CASE("default initialization")
|
||||||
|
{
|
||||||
|
Age age;
|
||||||
|
REQUIRE(age.years() == 0);
|
||||||
|
REQUIRE(age.months() == 0);
|
||||||
|
REQUIRE(age.toString() == "0;0");
|
||||||
|
|
||||||
|
Age age2;
|
||||||
|
REQUIRE(!(age < age));
|
||||||
|
REQUIRE(!(age < age2));
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST_CASE("year/month initialization")
|
||||||
|
{
|
||||||
|
for (unsigned int year = 0; year <= 100; ++year)
|
||||||
|
{
|
||||||
|
for (unsigned int month = 0; month < 12; ++month)
|
||||||
|
{
|
||||||
|
Age age(year, month);
|
||||||
|
|
||||||
|
REQUIRE(age.years() == year);
|
||||||
|
REQUIRE(age.months() == month);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST_CASE("age by reference")
|
||||||
|
{
|
||||||
|
QDate birth(1970, 1, 1);
|
||||||
|
QDate reference(1980, 1, 1);
|
||||||
|
|
||||||
|
Age age(birth, reference);
|
||||||
|
|
||||||
|
REQUIRE(age.years() == 10);
|
||||||
|
REQUIRE(age.months() == 0);
|
||||||
|
}
|
|
@ -0,0 +1,21 @@
|
||||||
|
cmake_minimum_required(VERSION 3.5)
|
||||||
|
project(run-tests)
|
||||||
|
|
||||||
|
find_package(Catch2 REQUIRED)
|
||||||
|
|
||||||
|
add_executable(${PROJECT_NAME}
|
||||||
|
main.cpp
|
||||||
|
dummy.cpp
|
||||||
|
Age.cpp
|
||||||
|
)
|
||||||
|
|
||||||
|
target_link_libraries(${PROJECT_NAME}
|
||||||
|
PRIVATE
|
||||||
|
Catch2::Catch2
|
||||||
|
Age
|
||||||
|
)
|
||||||
|
|
||||||
|
include(CTest)
|
||||||
|
include(Catch)
|
||||||
|
catch_discover_tests(${PROJECT_NAME})
|
||||||
|
|
|
@ -0,0 +1,7 @@
|
||||||
|
#include <catch2/catch.hpp>
|
||||||
|
|
||||||
|
TEST_CASE("Dummy")
|
||||||
|
{
|
||||||
|
REQUIRE(true == true);
|
||||||
|
}
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
#define CATCH_CONFIG_MAIN
|
||||||
|
#include <catch2/catch.hpp>
|
Loading…
Reference in New Issue