Compare commits
11 Commits
f3692fb825
...
usb
| Author | SHA1 | Date | |
|---|---|---|---|
| 07c8846ba4 | |||
| b8b66ac15e | |||
| 0e52515730 | |||
| 243087c292 | |||
| 5e83f5d2b6 | |||
| 82a7ca5151 | |||
| b9efe93baf | |||
| e102dab939 | |||
| 8443b12937 | |||
| b4e9fb4c38 | |||
| e55032d2ed |
33
.gitignore
vendored
33
.gitignore
vendored
@@ -1,2 +1,35 @@
|
||||
*.o
|
||||
moc_*
|
||||
|
||||
# Prerequisites
|
||||
*.d
|
||||
|
||||
# Compiled Object files
|
||||
*.slo
|
||||
*.lo
|
||||
*.o
|
||||
*.obj
|
||||
|
||||
# Precompiled Headers
|
||||
*.gch
|
||||
*.pch
|
||||
|
||||
# Compiled Dynamic libraries
|
||||
*.so
|
||||
*.dylib
|
||||
*.dll
|
||||
|
||||
# Fortran module files
|
||||
*.mod
|
||||
*.smod
|
||||
|
||||
# Compiled Static libraries
|
||||
*.lai
|
||||
*.la
|
||||
*.a
|
||||
*.lib
|
||||
|
||||
# Executables
|
||||
*.exe
|
||||
*.out
|
||||
*.app
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
cmake_minimum_required(VERSION 3.1.0)
|
||||
cmake_minimum_required(VERSION 3.5)
|
||||
|
||||
project(Rennbahn)
|
||||
|
||||
@@ -29,6 +29,8 @@ set(CMAKE_AUTOMOC ON)
|
||||
# Create code from a list of Qt designer ui files
|
||||
set(CMAKE_AUTOUIC ON)
|
||||
|
||||
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
|
||||
|
||||
# uncomment for ATMega based version (needs usb library)
|
||||
#add_definitions(-DATMEGA)
|
||||
|
||||
@@ -109,4 +111,5 @@ add_executable(Rennbahn ${helloworld_SRCS} )
|
||||
|
||||
# Use the Widgets module from Qt 5
|
||||
target_link_libraries(Rennbahn Qt5::Widgets Qt5::Core Qt5::Sql ${LIBUSB_LIBRARY} pthread fmt::fmt)
|
||||
#target_link_libraries(Rennbahn Qt5::Widgets Qt5::Core Qt5::Sql ${LIBUSB_LIBRARY} pthread)
|
||||
target_link_libraries(Rennbahn ${Boost_LIBRARIES})
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE QtCreatorProject>
|
||||
<!-- Written by QtCreator 4.3.1, 2017-12-24T15:47:52. -->
|
||||
<!-- Written by QtCreator 4.7.2, 2018-12-08T19:06:59. -->
|
||||
<qtcreator>
|
||||
<data>
|
||||
<variable>EnvironmentId</variable>
|
||||
<value type="QByteArray">{fa7f3dc3-5b46-4468-a19f-ea195cf466a8}</value>
|
||||
<value type="QByteArray">{d65476ef-0da9-4e40-9dc0-9f44335f5fac}</value>
|
||||
</data>
|
||||
<data>
|
||||
<variable>ProjectExplorer.Project.ActiveTarget</variable>
|
||||
<value type="int">0</value>
|
||||
<value type="int">1</value>
|
||||
</data>
|
||||
<data>
|
||||
<variable>ProjectExplorer.Project.EditorSettings</variable>
|
||||
@@ -55,80 +55,21 @@
|
||||
<data>
|
||||
<variable>ProjectExplorer.Project.PluginSettings</variable>
|
||||
<valuemap type="QVariantMap">
|
||||
<valuelist type="QVariantList" key="ClangStaticAnalyzer.SuppressedDiagnostics"/>
|
||||
<valuelist type="QVariantList" key="ClangCodeModel.CustomCommandLineKey"/>
|
||||
<value type="bool" key="ClangCodeModel.UseGlobalConfig">true</value>
|
||||
</valuemap>
|
||||
</data>
|
||||
<data>
|
||||
<variable>ProjectExplorer.Project.Target.0</variable>
|
||||
<valuemap type="QVariantMap">
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 5.9.1 in PATH (qt5)</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Qt 5.9.1 in PATH (qt5)</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{48e51839-112c-4842-badf-f2eb9bcf81cb}</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{7c81c2d1-6cc4-440b-a1cc-9bba845de6c4}</value>
|
||||
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
|
||||
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
|
||||
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
|
||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/johannes/Dokumente/build-RennbahnZeitmessung-Qt_5_9_1_in_PATH_qt5-Release</value>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
|
||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
|
||||
<value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
|
||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
|
||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
|
||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
|
||||
</valuemap>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
|
||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
||||
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
|
||||
<value type="QString">-w</value>
|
||||
<value type="QString">-r</value>
|
||||
</valuelist>
|
||||
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
|
||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
|
||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
|
||||
</valuemap>
|
||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
|
||||
</valuemap>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
||||
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
|
||||
<value type="QString">-w</value>
|
||||
<value type="QString">-r</value>
|
||||
</valuelist>
|
||||
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
|
||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
|
||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
|
||||
</valuemap>
|
||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Bereinigen</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
|
||||
</valuemap>
|
||||
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
|
||||
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
|
||||
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
|
||||
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
|
||||
<value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
|
||||
</valuemap>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
|
||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/johannes/Dokumente/build-RennbahnZeitmessung-Qt_5_9_1_in_PATH_qt5-Debug</value>
|
||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/johannes/Dokumente/build-RennbahnZeitmessung-Desktop-Debug</value>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||
@@ -174,7 +115,7 @@
|
||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
|
||||
</valuemap>
|
||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Bereinigen</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
|
||||
</valuemap>
|
||||
@@ -182,21 +123,141 @@
|
||||
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
|
||||
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
|
||||
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
|
||||
<value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
|
||||
</valuemap>
|
||||
<value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
|
||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/johannes/Dokumente/build-RennbahnZeitmessung-Desktop-Release</value>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
|
||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
|
||||
<value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
|
||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
|
||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
|
||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">true</value>
|
||||
</valuemap>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
|
||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
||||
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
|
||||
<value type="QString">-w</value>
|
||||
<value type="QString">-r</value>
|
||||
</valuelist>
|
||||
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
|
||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
|
||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
|
||||
</valuemap>
|
||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
|
||||
</valuemap>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
||||
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
|
||||
<value type="QString">-w</value>
|
||||
<value type="QString">-r</value>
|
||||
</valuelist>
|
||||
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
|
||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
|
||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
|
||||
</valuemap>
|
||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
|
||||
</valuemap>
|
||||
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
|
||||
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
|
||||
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
|
||||
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
|
||||
<value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
|
||||
</valuemap>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
|
||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/johannes/Dokumente/build-RennbahnZeitmessung-Desktop-Profile</value>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
|
||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
|
||||
<value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
|
||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
|
||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">true</value>
|
||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">true</value>
|
||||
</valuemap>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
|
||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
||||
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
|
||||
<value type="QString">-w</value>
|
||||
<value type="QString">-r</value>
|
||||
</valuelist>
|
||||
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
|
||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
|
||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
|
||||
</valuemap>
|
||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
|
||||
</valuemap>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
||||
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
|
||||
<value type="QString">-w</value>
|
||||
<value type="QString">-r</value>
|
||||
</valuelist>
|
||||
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
|
||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
|
||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
|
||||
</valuemap>
|
||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
|
||||
</valuemap>
|
||||
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
|
||||
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
|
||||
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Profile</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Profile</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
|
||||
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
|
||||
<value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
|
||||
</valuemap>
|
||||
<value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">3</value>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deployment</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
|
||||
</valuemap>
|
||||
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Lokales Deployment</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy Configuration</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
|
||||
</valuemap>
|
||||
@@ -250,9 +311,272 @@
|
||||
<value type="bool" key="QmakeProjectManager.QmakeRunConfiguration.UseLibrarySearchPath">true</value>
|
||||
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
|
||||
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">RennbahnZeitmessung.pro</value>
|
||||
<value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
|
||||
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
|
||||
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">/home/johannes/Dokumente/build-RennbahnZeitmessung-Qt_5_9_1_in_PATH_qt5-Release</value>
|
||||
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">/home/johannes/Dokumente/build-RennbahnZeitmessung-Desktop-Debug</value>
|
||||
<value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
|
||||
<value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
|
||||
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
|
||||
<value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
|
||||
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
|
||||
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
|
||||
</valuemap>
|
||||
<value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
|
||||
</valuemap>
|
||||
</data>
|
||||
<data>
|
||||
<variable>ProjectExplorer.Project.Target.1</variable>
|
||||
<valuemap type="QVariantMap">
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 5.11.2 in PATH (System)</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Qt 5.11.2 in PATH (System)</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{a77f7da7-30ed-4ef3-9772-7ccbc14136dd}</value>
|
||||
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
|
||||
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
|
||||
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
|
||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/johannes/Dokumente/build-RennbahnZeitmessung-Qt_5_11_2_in_PATH_System-Debug</value>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
|
||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
|
||||
<value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
|
||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
|
||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
|
||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
|
||||
</valuemap>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
|
||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
||||
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
|
||||
<value type="QString">-w</value>
|
||||
<value type="QString">-r</value>
|
||||
</valuelist>
|
||||
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
|
||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
|
||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
|
||||
</valuemap>
|
||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
|
||||
</valuemap>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
||||
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
|
||||
<value type="QString">-w</value>
|
||||
<value type="QString">-r</value>
|
||||
</valuelist>
|
||||
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
|
||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
|
||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
|
||||
</valuemap>
|
||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
|
||||
</valuemap>
|
||||
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
|
||||
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
|
||||
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
|
||||
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
|
||||
<value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
|
||||
</valuemap>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
|
||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/johannes/Dokumente/build-RennbahnZeitmessung-Qt_5_11_2_in_PATH_System-Release</value>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
|
||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
|
||||
<value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
|
||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
|
||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
|
||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">true</value>
|
||||
</valuemap>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
|
||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
||||
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
|
||||
<value type="QString">-w</value>
|
||||
<value type="QString">-r</value>
|
||||
</valuelist>
|
||||
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
|
||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
|
||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
|
||||
</valuemap>
|
||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
|
||||
</valuemap>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
||||
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
|
||||
<value type="QString">-w</value>
|
||||
<value type="QString">-r</value>
|
||||
</valuelist>
|
||||
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
|
||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
|
||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
|
||||
</valuemap>
|
||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
|
||||
</valuemap>
|
||||
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
|
||||
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
|
||||
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
|
||||
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
|
||||
<value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
|
||||
</valuemap>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
|
||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/johannes/Dokumente/build-RennbahnZeitmessung-Qt_5_11_2_in_PATH_System-Profile</value>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
|
||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
|
||||
<value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
|
||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
|
||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">true</value>
|
||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">true</value>
|
||||
</valuemap>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
|
||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
||||
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
|
||||
<value type="QString">-w</value>
|
||||
<value type="QString">-r</value>
|
||||
</valuelist>
|
||||
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
|
||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
|
||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
|
||||
</valuemap>
|
||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
|
||||
</valuemap>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
||||
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
|
||||
<value type="QString">-w</value>
|
||||
<value type="QString">-r</value>
|
||||
</valuelist>
|
||||
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
|
||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
|
||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
|
||||
</valuemap>
|
||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
|
||||
</valuemap>
|
||||
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
|
||||
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
|
||||
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Profile</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Profile</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
|
||||
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
|
||||
<value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
|
||||
</valuemap>
|
||||
<value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">3</value>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
|
||||
</valuemap>
|
||||
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy Configuration</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
|
||||
</valuemap>
|
||||
<value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
|
||||
<value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
|
||||
<value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
|
||||
<value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value>
|
||||
<value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
|
||||
<value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
|
||||
<valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
|
||||
<value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
|
||||
<value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
|
||||
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
|
||||
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
|
||||
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
|
||||
<value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
|
||||
<value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
|
||||
<value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
|
||||
<value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
|
||||
<value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
|
||||
<valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
|
||||
<value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
|
||||
<value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
|
||||
<value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
|
||||
<value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
|
||||
<value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
|
||||
<valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
|
||||
<value type="int">0</value>
|
||||
<value type="int">1</value>
|
||||
<value type="int">2</value>
|
||||
<value type="int">3</value>
|
||||
<value type="int">4</value>
|
||||
<value type="int">5</value>
|
||||
<value type="int">6</value>
|
||||
<value type="int">7</value>
|
||||
<value type="int">8</value>
|
||||
<value type="int">9</value>
|
||||
<value type="int">10</value>
|
||||
<value type="int">11</value>
|
||||
<value type="int">12</value>
|
||||
<value type="int">13</value>
|
||||
<value type="int">14</value>
|
||||
</valuelist>
|
||||
<value type="int" key="PE.EnvironmentAspect.Base">2</value>
|
||||
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">RennbahnZeitmessung</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/johannes/Dokumente/rennbahnc/RennbahnZeitmessung.pro</value>
|
||||
<value type="bool" key="QmakeProjectManager.QmakeRunConfiguration.UseLibrarySearchPath">true</value>
|
||||
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
|
||||
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">RennbahnZeitmessung.pro</value>
|
||||
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
|
||||
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">/home/johannes/Dokumente/build-RennbahnZeitmessung-Qt_5_11_2_in_PATH_System-Debug</value>
|
||||
<value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
|
||||
<value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
|
||||
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
|
||||
@@ -265,7 +589,7 @@
|
||||
</data>
|
||||
<data>
|
||||
<variable>ProjectExplorer.Project.TargetCount</variable>
|
||||
<value type="int">1</value>
|
||||
<value type="int">2</value>
|
||||
</data>
|
||||
<data>
|
||||
<variable>ProjectExplorer.Project.Updater.FileVersion</variable>
|
||||
|
||||
@@ -57,7 +57,7 @@ QStringList DataBase::getDataQStringList(std::string statement) {
|
||||
vector<vector<QString>> DataBase::getData(std::string statement, int cols) {
|
||||
|
||||
// char * buffer = new char[statement.length() + 1];
|
||||
std::shared_ptr<char> buffer(new char[statement.length() + 1]);
|
||||
std::shared_ptr<char> buffer(new char[statement.length() + 1], [](char*){});
|
||||
strcpy(buffer.get(), statement.c_str());
|
||||
vector<QString> data;
|
||||
vector<vector<QString>> lines;
|
||||
@@ -82,7 +82,7 @@ vector<vector<QString>> DataBase::getData(std::string statement, int cols) {
|
||||
}
|
||||
|
||||
void DataBase::setData(std::string statement) {
|
||||
std::shared_ptr<char> buffer(new char[statement.length() + 1]);
|
||||
std::shared_ptr<char> buffer(new char[statement.length() + 1], [](char*){});
|
||||
strcpy(buffer.get(), statement.c_str());
|
||||
bool ok = this->db->open();
|
||||
if (ok) {
|
||||
|
||||
21
datatypes.h
21
datatypes.h
@@ -16,6 +16,27 @@ struct TransCheck {
|
||||
char end;
|
||||
};
|
||||
|
||||
|
||||
enum ID{
|
||||
SHELL_SECTOR_1,
|
||||
DEA_SECTOR_1,
|
||||
SHELL_SECTOR_2,
|
||||
DEA_SECTOR_2,
|
||||
SHELL_SECTOR_3,
|
||||
DEA_SECTOR_3,
|
||||
};
|
||||
|
||||
enum SECTOR{
|
||||
SECTOR_1 = 1,
|
||||
SECTOR_2,
|
||||
SECTOR_3,
|
||||
};
|
||||
|
||||
enum Update{
|
||||
NO_UPDATE,
|
||||
UPDATE
|
||||
};
|
||||
|
||||
template <> struct fmt::formatter<TransStruct> {
|
||||
template <typename ParseContext> constexpr auto parse(ParseContext & ctx) {
|
||||
return ctx.begin();
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
// filecontrol
|
||||
#include "datatypes.h"
|
||||
#include <boost/asio/serial_port.hpp>
|
||||
#include <cstdint>
|
||||
#include <fcntl.h>
|
||||
#include <fmt/format.h>
|
||||
#include <iostream>
|
||||
@@ -25,7 +26,11 @@
|
||||
// V2 USB Atmega8
|
||||
// V3 STM32F07
|
||||
|
||||
#define PORT_PATH "/dev/ttyACM0"
|
||||
|
||||
#define LIGHT_BARRIERS 6u
|
||||
|
||||
// #define PORT_PATH "/dev/ttyACM0"
|
||||
// #define PORT_PATH "/dev/pts/4"
|
||||
|
||||
using namespace std;
|
||||
// not needed anymore -> usb
|
||||
@@ -33,10 +38,16 @@ using namespace std;
|
||||
// #define BASEPORT 0x378
|
||||
// #define BASEPORT 0xd000
|
||||
|
||||
HardwareSetup::HardwareSetup() {
|
||||
HardwareSetup::HardwareSetup(DataBase * db) {
|
||||
// if (ioperm(BASEPORT, 3, 1)) {
|
||||
// //perror("ioperm");
|
||||
// }
|
||||
this->db = db;
|
||||
this->PORT_PATH =
|
||||
this->db->getData("select interface from interface where id like 1", 1)
|
||||
.at(0)
|
||||
.at(0)
|
||||
.toStdString();
|
||||
this->stop = 0;
|
||||
#ifdef ATMEGA
|
||||
this->handle = nullptr;
|
||||
@@ -286,49 +297,49 @@ void HardwareSetup::run() {
|
||||
}
|
||||
cout << static_cast<char>(buffer.end) << endl;
|
||||
*/
|
||||
for (int i = 0; i < 6; i++) {
|
||||
fmt::print("{} ", TransStruct{buffer.data[i]});
|
||||
for (uint8_t i = 0; i < LIGHT_BARRIERS; i++) {
|
||||
// fmt::print("{} ", TransStruct{buffer.data[i]}); // removed because build fails :(
|
||||
cout << "i: " << i
|
||||
<< " time: " << static_cast<int>(received->data[i].time)
|
||||
<< " update: "
|
||||
<< static_cast<int>(received->data[i].update) << endl;
|
||||
if (received->data[i].update != 0) {
|
||||
if (received->data[i].update != NO_UPDATE) {
|
||||
switch (received->data[i].id) {
|
||||
case 0:
|
||||
case SHELL_SECTOR_1:
|
||||
cout << "Shell Zeit 1: "
|
||||
<< static_cast<int>(received->data[i].time)
|
||||
<< endl;
|
||||
emit Shell(static_cast<int>(received->data[i].time), 1);
|
||||
emit Shell(static_cast<int>(received->data[i].time), SECTOR_1);
|
||||
break;
|
||||
case 1:
|
||||
case DEA_SECTOR_1:
|
||||
cout << "Dea Zeit 1: "
|
||||
<< static_cast<int>(received->data[i].time)
|
||||
<< endl;
|
||||
emit Dea(static_cast<int>(received->data[i].time), 1);
|
||||
emit Dea(static_cast<int>(received->data[i].time), SECTOR_1);
|
||||
break;
|
||||
case 2:
|
||||
case SHELL_SECTOR_2:
|
||||
cout << "Shell Zeit 2: "
|
||||
<< static_cast<int>(received->data[i].time)
|
||||
<< endl;
|
||||
emit Shell(static_cast<int>(received->data[i].time), 2);
|
||||
emit Shell(static_cast<int>(received->data[i].time), SECTOR_2);
|
||||
break;
|
||||
case 3:
|
||||
case DEA_SECTOR_2:
|
||||
cout << "Dea Zeit 2: "
|
||||
<< static_cast<int>(received->data[i].time)
|
||||
<< endl;
|
||||
emit Dea(static_cast<int>(received->data[i].time), 2);
|
||||
emit Dea(static_cast<int>(received->data[i].time), SECTOR_2);
|
||||
break;
|
||||
case 4:
|
||||
case SHELL_SECTOR_3:
|
||||
cout << "Shell Zeit 3: "
|
||||
<< static_cast<int>(received->data[i].time)
|
||||
<< endl;
|
||||
emit Shell(static_cast<int>(received->data[i].time), 3);
|
||||
emit Shell(static_cast<int>(received->data[i].time), SECTOR_3);
|
||||
break;
|
||||
case 5:
|
||||
case DEA_SECTOR_3:
|
||||
cout << "Dea Zeit 3: "
|
||||
<< static_cast<int>(received->data[i].time)
|
||||
<< endl;
|
||||
emit Dea(static_cast<int>(received->data[i].time), 3);
|
||||
emit Dea(static_cast<int>(received->data[i].time), SECTOR_3);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -361,12 +372,12 @@ void HardwareSetup::connectSTM32() {
|
||||
close(fd);
|
||||
}
|
||||
usleep(10000);
|
||||
fd = open(PORT_PATH, O_RDONLY);
|
||||
fd = open(this->PORT_PATH.c_str(), O_RDONLY);
|
||||
while (this->fd < 0) {
|
||||
// wait 1 second
|
||||
sleep(1);
|
||||
cout << "Port can't be opened" << endl;
|
||||
fd = open(PORT_PATH, O_RDONLY);
|
||||
fd = open(PORT_PATH.c_str(), O_RDONLY);
|
||||
if (this->stop) {
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
#include <libusb.h>
|
||||
#endif
|
||||
|
||||
#include "database.h"
|
||||
#include "datatypes.h"
|
||||
#include "serial_port.h"
|
||||
|
||||
@@ -39,11 +40,13 @@ class HardwareSetup : public QThread {
|
||||
bool getDea();
|
||||
int * findBit(int * array, int zahl);
|
||||
std::unique_ptr<serial_port> sport;
|
||||
DataBase * db;
|
||||
std::string PORT_PATH;
|
||||
|
||||
public:
|
||||
void setStop();
|
||||
~HardwareSetup();
|
||||
HardwareSetup();
|
||||
HardwareSetup(DataBase * db);
|
||||
signals:
|
||||
void Shell(int, int);
|
||||
void Dea(int, int);
|
||||
|
||||
@@ -50,6 +50,21 @@ MainWindow::MainWindow(QWidget * parent)
|
||||
SLOT(WindowRennen()));
|
||||
|
||||
this->db = std::make_unique<DataBase>();
|
||||
vector<vector<QString>> interface =
|
||||
this->db->getData("select * from interface", 1);
|
||||
if (interface.size() > 0) {
|
||||
std::cout << "interface existiert" << std::endl;
|
||||
}
|
||||
else {
|
||||
std::cout << "interface existiert nicht" << std::endl;
|
||||
// create interface
|
||||
std::string statement =
|
||||
"CREATE TABLE \"Interface\" ( \"id\" INTEGER PRIMARY KEY "
|
||||
"AUTOINCREMENT, \"interface\" TEXT )";
|
||||
this->db->setData(statement);
|
||||
statement = "insert into interface (interface) values ('/dev/ttyAMC0')";
|
||||
this->db->setData(statement);
|
||||
}
|
||||
}
|
||||
void MainWindow::closeEvent(QCloseEvent * event) {
|
||||
Q_UNUSED(event);
|
||||
|
||||
@@ -23,7 +23,7 @@ int QVectorHelper::getMinSec1(const QVector<QVector<int>> x) {
|
||||
if (x.size() > 0) {
|
||||
for (auto vec : x) {
|
||||
if (vec.size() >= 4) {
|
||||
if (vec.at(0) >= minSec1) {
|
||||
if (vec.at(0) >= minSec1 && vec.at(3) >= minTrackTime) {
|
||||
min = vec.at(0);
|
||||
break;
|
||||
}
|
||||
@@ -35,9 +35,9 @@ int QVectorHelper::getMinSec1(const QVector<QVector<int>> x) {
|
||||
}
|
||||
|
||||
for (int i = 1; i < x.size(); i++) {
|
||||
if (x.at(i).size() >= 3) { // entire lap
|
||||
if (x.at(i).size() >= 4) { // entire lap
|
||||
if (x.at(i).at(0) < min) {
|
||||
if (x.at(i).at(0) >= minSec1) {
|
||||
if (x.at(i).at(0) >= minSec1 && x.at(i).at(3) >= minTrackTime) {
|
||||
min = x.at(i).at(0);
|
||||
}
|
||||
}
|
||||
@@ -49,8 +49,8 @@ int QVectorHelper::getMinSec2(const QVector<QVector<int>> x) {
|
||||
int min = 9999;
|
||||
if (x.size() > 0) {
|
||||
for (auto vec : x) {
|
||||
if (vec.size() >= 3) {
|
||||
if (vec.at(1) >= minSec2) {
|
||||
if (vec.size() >= 4) {
|
||||
if (vec.at(1) >= minSec2 && vec.at(3) >= minTrackTime) {
|
||||
min = vec.at(1);
|
||||
break;
|
||||
}
|
||||
@@ -62,9 +62,9 @@ int QVectorHelper::getMinSec2(const QVector<QVector<int>> x) {
|
||||
}
|
||||
|
||||
for (int i = 1; i < x.size(); i++) {
|
||||
if (x.at(0).size() >= 3) { // entire lap
|
||||
if (x.at(0).size() >= 4) { // entire lap
|
||||
if (x.at(i).at(1) < min) {
|
||||
if (x.at(0).at(1) >= minSec2) {
|
||||
if (x.at(0).at(1) >= minSec2 && x.at(i).at(3) >= minTrackTime) {
|
||||
min = x.at(i).at(1);
|
||||
}
|
||||
}
|
||||
@@ -76,8 +76,8 @@ int QVectorHelper::getMinSec3(const QVector<QVector<int>> x) {
|
||||
int min = 9999;
|
||||
if (x.size() > 0) {
|
||||
for (auto vec : x) {
|
||||
if (vec.size() >= 3) {
|
||||
if (vec.at(2) >= minSec3) {
|
||||
if (vec.size() >= 4) {
|
||||
if (vec.at(2) >= minSec3 && vec.at(3) >= minTrackTime) {
|
||||
min = vec.at(2);
|
||||
break;
|
||||
}
|
||||
@@ -90,9 +90,9 @@ int QVectorHelper::getMinSec3(const QVector<QVector<int>> x) {
|
||||
}
|
||||
|
||||
for (int i = 1; i < x.size(); i++) {
|
||||
if (x.at(i).size() >= 3) { // entire lap
|
||||
if (x.at(i).size() >= 4) { // entire lap
|
||||
if (x.at(i).at(2) < min) {
|
||||
if (x.at(0).at(2) >= minSec3) {
|
||||
if (x.at(0).at(2) >= minSec3 && x.at(i).at(3) >= minTrackTime) {
|
||||
min = x.at(i).at(2);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#include "racelistgenerator.h"
|
||||
|
||||
#include <random>
|
||||
RaceListGenerator::RaceListGenerator(vector<int> driverIds,
|
||||
vector<int> carIds) {
|
||||
this->driverIds = driverIds;
|
||||
@@ -53,10 +53,17 @@ vector<vector<int>> RaceListGenerator::getList() {
|
||||
}
|
||||
|
||||
// shuffle shell list
|
||||
std::random_shuffle(shellList.begin(), shellList.end(), myrandom);
|
||||
|
||||
std::random_device rd;
|
||||
std::mt19937 g(rd());
|
||||
|
||||
std::shuffle(shellList.begin(), shellList.end(), g);
|
||||
// std::random_shuffle(shellList.begin(), shellList.end(), myrandom);
|
||||
|
||||
while (1) {
|
||||
std::random_shuffle(deaList.begin(), deaList.end(), myrandom);
|
||||
|
||||
std::shuffle(deaList.begin(), deaList.end(), g);
|
||||
// std::random_shuffle(deaList.begin(), deaList.end(), myrandom);
|
||||
if (matchList(shellList, deaList) == true) {
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -18,4 +18,10 @@ to solve the problem
|
||||
|
||||
3. Hardware Version 3
|
||||
Based on STM32F07
|
||||
user need to be in group uucp
|
||||
user need to be in group uucp
|
||||
|
||||
required packages (watch CMakeLists): boost, asio, fmt
|
||||
to build:
|
||||
$ mkdir build && cd build
|
||||
$ cmake ../rennbahnc
|
||||
$ make .
|
||||
|
||||
@@ -80,20 +80,29 @@ QColor TimeModel::getColor(const QVector<QVector<int>> data, const int col,
|
||||
}
|
||||
|
||||
QVector<int> compare;
|
||||
for (int i = 0; i <= row; i++) {
|
||||
if (data.at(i).size() > col) {
|
||||
compare.append(data.at(i).at(col));
|
||||
if (col == 3) { // lap time
|
||||
for (int i = 0; i <= row; i++) {
|
||||
if (data.at(i).size() > col &&
|
||||
data.at(i).at(col) > this->minimumTimes.at(col) &&
|
||||
data.at(i).at(0) > this->minimumTimes.at(0) &&
|
||||
data.at(i).at(1) > this->minimumTimes.at(1) &&
|
||||
data.at(i).at(2) > this->minimumTimes.at(2)) {
|
||||
compare.append(data.at(i).at(col));
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
for (int i = 0; i <= row; i++) {
|
||||
if (data.at(i).size() > col &&
|
||||
data.at(i).at(col) > this->minimumTimes.at(col)) {
|
||||
compare.append(data.at(i).at(col));
|
||||
}
|
||||
}
|
||||
}
|
||||
if (data.at(row).at(col) ==
|
||||
getMin(compare)) { // at least personal best time
|
||||
if (col < 3) { // sector time
|
||||
// std::cout << this->topTime.size() <<
|
||||
// std::endl;
|
||||
if (this->topTime.size() >
|
||||
col) { // absolute top time exists
|
||||
// std::cout << "local besttime"
|
||||
// << std::endl;
|
||||
if (this->topTime.size() > col) {
|
||||
if (this->topTime.at(col) >= data.at(row).at(col)) {
|
||||
return QColor(Qt::magenta);
|
||||
}
|
||||
@@ -125,9 +134,13 @@ QColor TimeModel::getColor(const QVector<QVector<int>> data, const int col,
|
||||
|
||||
int TimeModel::getMin(const QVector<int> x) const {
|
||||
int min = 9999;
|
||||
if (x.size() > 0) {
|
||||
min = x.at(0);
|
||||
|
||||
// find first matching minimum
|
||||
for (auto i : x) {
|
||||
min = i;
|
||||
break;
|
||||
}
|
||||
|
||||
for (int i = 1; i < x.size(); i++) {
|
||||
if (x.at(i) < min) {
|
||||
min = x.at(i);
|
||||
@@ -152,7 +165,7 @@ QVariant TimeModel::data(const QModelIndex & index, int role) const {
|
||||
return QString("∞");
|
||||
}
|
||||
}
|
||||
else if (role == Qt::BackgroundColorRole) {
|
||||
else if (role == Qt::BackgroundRole) {
|
||||
return getColor(timeData, index.column(), index.row());
|
||||
}
|
||||
return QVariant();
|
||||
|
||||
@@ -39,7 +39,7 @@ Training::Training(QWidget * parent, DataBase * db)
|
||||
started = true;
|
||||
paused = false;
|
||||
|
||||
this->Hardware = std::make_shared<HardwareSetup>();
|
||||
this->Hardware = std::make_shared<HardwareSetup>(this->db);
|
||||
Hardware->start();
|
||||
|
||||
QObject::connect(Hardware.get(), SIGNAL(Dea(int, int)), this,
|
||||
|
||||
@@ -64,7 +64,7 @@ WindowRace::WindowRace(DataBase * db, QWidget * parent)
|
||||
|
||||
paused = false;
|
||||
|
||||
Hardware = std::make_unique<HardwareSetup>();
|
||||
Hardware = std::make_unique<HardwareSetup>(this->db);
|
||||
Hardware->start();
|
||||
|
||||
QObject::connect(Hardware.get(), SIGNAL(Dea(int, int)), this,
|
||||
@@ -157,6 +157,15 @@ WindowRace::WindowRace(DataBase * db, QWidget * parent)
|
||||
QObject::connect(keyReturn.get(), SIGNAL(activated()), this,
|
||||
SLOT(ReturnPress()));
|
||||
|
||||
// setup round / round
|
||||
// request amount of races
|
||||
statement = "select fahrershellid, autoshellid, fahrerdeaid, autodeaid "
|
||||
"from aktrennen where id_rennen like " +
|
||||
QString::number(this->renn_id).toStdString();
|
||||
|
||||
vector<vector<QString>> tableRaces;
|
||||
tableRaces = db->getData(statement, 4);
|
||||
this->ui->lRound->setText("1/" + QString::number(tableRaces.size()));
|
||||
// QObject::connect(shortcut, SIGNAL(activated()), this, SLOT(close()));
|
||||
}
|
||||
|
||||
@@ -261,6 +270,10 @@ void WindowRace::setDriverAndCar(vector<QString> vec) {
|
||||
this->ui->gbShell->setTitle("Shell, " + vec[0] + ", " + vec[1]);
|
||||
this->ui->gbDea->setTitle("Dea, " + vec[2] + ", " + vec[3]);
|
||||
}
|
||||
void WindowRace::setRoundCounter(uint currentRound, uint rounds) {
|
||||
this->ui->lRound->setText(QString::number(currentRound) + "/" +
|
||||
QString::number(rounds));
|
||||
}
|
||||
void WindowRace::stopClicked() {
|
||||
this->prepareNextRace();
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#ifndef WINDOWRACE_H
|
||||
#ifndef WINDOWRACE_H
|
||||
#define WINDOWRACE_H
|
||||
|
||||
#include "ampel.h"
|
||||
@@ -29,6 +29,7 @@ class WindowRace : public QMainWindow {
|
||||
~WindowRace();
|
||||
void setWindowRennliste(WindowRennliste * ptrInstance);
|
||||
void setDriverAndCar(vector<QString> vec);
|
||||
void setRoundCounter(uint currentRound, uint rounds);
|
||||
void setDriverAndCarId(vector<QString> vec);
|
||||
|
||||
private:
|
||||
|
||||
@@ -216,7 +216,7 @@
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_6" stretch="0,0,1">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_6" stretch="0,0,0,1">
|
||||
<item alignment="Qt::AlignHCenter|Qt::AlignTop">
|
||||
<widget class="QLabel" name="lCountdown">
|
||||
<property name="minimumSize">
|
||||
@@ -601,6 +601,21 @@
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="lRound">
|
||||
<property name="font">
|
||||
<font>
|
||||
<pointsize>20</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QWidget" name="widget_2" native="true"/>
|
||||
</item>
|
||||
@@ -836,7 +851,7 @@
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>1139</width>
|
||||
<height>24</height>
|
||||
<height>23</height>
|
||||
</rect>
|
||||
</property>
|
||||
</widget>
|
||||
|
||||
@@ -221,6 +221,8 @@ void WindowRennliste::changeSelection() {
|
||||
this->ui->tWRennliste->item(static_cast<int>(this->selectedRow), 4)
|
||||
->text());
|
||||
this->instanceWindowRace->setDriverAndCar(vec);
|
||||
this->instanceWindowRace->setRoundCounter(this->selectedRow + 1,
|
||||
this->tableData.size());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
#include "ui_windowssettings.h"
|
||||
#include <QStringListModel>
|
||||
#include <boost/lexical_cast.hpp>
|
||||
#include <filesystem>
|
||||
#include <iostream>
|
||||
#include <qcolordialog.h>
|
||||
#include <qmessagebox.h>
|
||||
@@ -12,6 +13,8 @@
|
||||
#include <time.h>
|
||||
#include <vector>
|
||||
|
||||
namespace fs = std::filesystem;
|
||||
|
||||
using std::cout;
|
||||
using std::endl;
|
||||
using std::string;
|
||||
@@ -21,6 +24,8 @@ WindowsSettings::WindowsSettings(DataBase * db, QWidget * parent)
|
||||
: QMainWindow(parent), ui(new Ui::WindowsSettings) {
|
||||
ui->setupUi(this);
|
||||
|
||||
QObject::connect(ui->cBInterface, SIGNAL(activated(int)), this,
|
||||
SLOT(changeInterface()));
|
||||
QObject::connect(ui->pBSpeichernStrecke, SIGNAL(clicked()), this,
|
||||
SLOT(StreckeSpeichernSlot()));
|
||||
QObject::connect(ui->pBAbbrechenStrecke, SIGNAL(clicked()), this,
|
||||
@@ -199,7 +204,27 @@ WindowsSettings::WindowsSettings(DataBase * db, QWidget * parent)
|
||||
|
||||
// fill listView of cars
|
||||
this->repaintCars();
|
||||
// this->ui->wEditCarColor->grab()
|
||||
|
||||
// setup Hardware interface
|
||||
QStringList cbInterfaceList = QStringList();
|
||||
cbInterfaceList.append("/dev/ttyAMC0");
|
||||
|
||||
std::string path = "/dev/pts/";
|
||||
for (const auto & entry : fs::directory_iterator(path)) {
|
||||
std::string pathToAppend = entry.path();
|
||||
cbInterfaceList.append(QString::fromStdString(pathToAppend));
|
||||
}
|
||||
this->ui->cBInterface->addItems(cbInterfaceList);
|
||||
|
||||
// preset combobox from database
|
||||
QString dataFromDatabase =
|
||||
this->db->getData("select interface from interface where id like 1", 1)
|
||||
.at(0)
|
||||
.at(0);
|
||||
int id = this->ui->cBInterface->findText(dataFromDatabase);
|
||||
if (id > -1) {
|
||||
this->ui->cBInterface->setCurrentIndex(id);
|
||||
}
|
||||
}
|
||||
|
||||
void WindowsSettings::saveEditCar() {
|
||||
@@ -495,6 +520,15 @@ string WindowsSettings::currentDateTime() {
|
||||
return buf;
|
||||
}
|
||||
|
||||
void WindowsSettings::changeInterface() {
|
||||
std::string curInterface =
|
||||
this->ui->cBInterface->currentText().toStdString();
|
||||
std::string statement = "update interface set interface = '" +
|
||||
curInterface + "' where id like 1";
|
||||
cout << statement << endl;
|
||||
this->db->setData(statement);
|
||||
}
|
||||
|
||||
void WindowsSettings::createRaceListAndClose() {
|
||||
vector<int> selectedCarIds;
|
||||
foreach (const QModelIndex & index,
|
||||
|
||||
@@ -55,6 +55,7 @@ class WindowsSettings : public QMainWindow {
|
||||
void openEditColor();
|
||||
void openNewColor();
|
||||
void saveNewCar();
|
||||
void changeInterface();
|
||||
};
|
||||
|
||||
#endif // WINDOWSSETTINGS_H
|
||||
|
||||
@@ -20,9 +20,18 @@
|
||||
<property name="toolTip">
|
||||
<string><html><head/><body><p>Rennliste Erstellen</p></body></html></string>
|
||||
</property>
|
||||
<property name="tabShape">
|
||||
<enum>QTabWidget::Rounded</enum>
|
||||
</property>
|
||||
<property name="currentIndex">
|
||||
<number>4</number>
|
||||
</property>
|
||||
<property name="tabsClosable">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="movable">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<widget class="QWidget" name="Dauer">
|
||||
<attribute name="title">
|
||||
<string>Dauer</string>
|
||||
@@ -705,6 +714,42 @@
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="tab_8">
|
||||
<attribute name="title">
|
||||
<string>Schnittstelle</string>
|
||||
</attribute>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_56">
|
||||
<item>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_55">
|
||||
<item>
|
||||
<widget class="QGroupBox" name="groupBox_33">
|
||||
<property name="title">
|
||||
<string>Hardwareschnittstelle</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_57">
|
||||
<item>
|
||||
<widget class="QComboBox" name="cBInterface"/>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="verticalSpacer_4">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>40</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="CreateList">
|
||||
<attribute name="title">
|
||||
<string>Rennliste Erstellen</string>
|
||||
@@ -786,6 +831,56 @@
|
||||
<container>1</container>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<tabstops>
|
||||
<tabstop>Strecke</tabstop>
|
||||
<tabstop>lVCars</tabstop>
|
||||
<tabstop>lVDrivers</tabstop>
|
||||
<tabstop>pBCancel</tabstop>
|
||||
<tabstop>pBcreateListClose</tabstop>
|
||||
<tabstop>lEMinTimeSec2</tabstop>
|
||||
<tabstop>lEMinTimeSec3</tabstop>
|
||||
<tabstop>pbAbbrechenDauer</tabstop>
|
||||
<tabstop>pbSaveAndExitDauer</tabstop>
|
||||
<tabstop>pbSaveDauer</tabstop>
|
||||
<tabstop>lEShellKurvenAussen</tabstop>
|
||||
<tabstop>lEShellKurvenInnen</tabstop>
|
||||
<tabstop>lEShellGeraden</tabstop>
|
||||
<tabstop>lEShellSteilkurveaussen</tabstop>
|
||||
<tabstop>lEShellSteilkurveInnen</tabstop>
|
||||
<tabstop>lEDeaKurvenAussen</tabstop>
|
||||
<tabstop>lEDeaKurvenInnen</tabstop>
|
||||
<tabstop>lEDeaGeraden</tabstop>
|
||||
<tabstop>lEDeaSteilkurveAussen</tabstop>
|
||||
<tabstop>lEDeaSteilkurveInnen</tabstop>
|
||||
<tabstop>pBAbbrechenStrecke</tabstop>
|
||||
<tabstop>pBSpeichernStrecke</tabstop>
|
||||
<tabstop>tabWidget</tabstop>
|
||||
<tabstop>lEEditCarName</tabstop>
|
||||
<tabstop>lEEditCarEngine</tabstop>
|
||||
<tabstop>pBEditCarChangeColor</tabstop>
|
||||
<tabstop>pBEditCarSave</tabstop>
|
||||
<tabstop>lVCarSavedCars</tabstop>
|
||||
<tabstop>leNewCarName</tabstop>
|
||||
<tabstop>lENewCarEngine</tabstop>
|
||||
<tabstop>pBNewCarChangeColor</tabstop>
|
||||
<tabstop>pBNewCarSave</tabstop>
|
||||
<tabstop>lvNewCar</tabstop>
|
||||
<tabstop>pBCarClose</tabstop>
|
||||
<tabstop>tabWidget_2</tabstop>
|
||||
<tabstop>lENewDriverName</tabstop>
|
||||
<tabstop>pBNewDriverSave</tabstop>
|
||||
<tabstop>lVNewDriverSavedDrivers</tabstop>
|
||||
<tabstop>pBNewDriverClose</tabstop>
|
||||
<tabstop>lEDriverEditName</tabstop>
|
||||
<tabstop>pushButton_2</tabstop>
|
||||
<tabstop>lVDriverEditSavedDrivers</tabstop>
|
||||
<tabstop>pBDriverEditClose</tabstop>
|
||||
<tabstop>lEMinRundenzeit</tabstop>
|
||||
<tabstop>leRenndauer</tabstop>
|
||||
<tabstop>lEMinRundenzeitAktRennen</tabstop>
|
||||
<tabstop>lEMinTimeSec1</tabstop>
|
||||
<tabstop>cBInterface</tabstop>
|
||||
</tabstops>
|
||||
<resources/>
|
||||
<connections/>
|
||||
</ui>
|
||||
|
||||
Reference in New Issue
Block a user