Aufgrund einer Störung des s3 Storage, könnten in nächster Zeit folgende GitLab Funktionen nicht zur Verfügung stehen: LFS, Container Registry, Job Artifacs, Uploads (Wiki, Bilder, Projekt-Exporte). Wir bitten um Verständnis. Es wird mit Hochdruck an der Behebung des Problems gearbeitet. Weitere Informationen zur Störung des Object Storage finden Sie hier: https://maintenance.itc.rwth-aachen.de/ticket/status/messages/59-object-storage-pilot

Commit 922bcd0e authored by Leander Schulten's avatar Leander Schulten
Browse files

Fix error with not registered types

Fix error when removing Programs/Filter/consumer from a programblock
Fix wrong Version of QtQuick.Controls
parent 67096718
import QtQuick 2.9
import QtQuick.Controls 2.5
import QtQuick.Controls 2.4
import QtQuick.Layouts 1.3
import custom.licht 1.0
import QtQuick.Dialogs 1.2
......
......@@ -89,6 +89,9 @@ int main(int argc, char *argv[])
QQmlApplicationEngine engine;
ControlPanel::setQmlEngine(&engine);
ProgramBlockEditor::engine = &engine;
// normally this should be done automatically
qRegisterMetaType<QAbstractListModel*>("QAbstractListModel*");
qRegisterMetaType<PropertyInformationModel*>("PropertyInformationModel*");
//qmlRegisterType<const ChannelVector*>("my.models",1,0,"ChannelVector");
qmlRegisterType<ChannelProgrammEditor>("custom.licht",1,0,"ChannelProgrammEditor");
qmlRegisterType<GUI::MapView>("custom.licht",1,0,"MapView");
......
......@@ -216,7 +216,7 @@ namespace Modules {
template<typename F>
void removeConsumer(F f){
// see https://stackoverflow.com/questions/24263259/c-stdseterase-with-stdremove-if
for (auto it{consumer.begin()}, end{consumer.end()}; it != end; ) {
for (auto it{consumer.begin()}; it != consumer.end(); ) {
if (f(*it)) {
it = consumer.erase(it);
}
......@@ -228,7 +228,7 @@ namespace Modules {
template<typename F>
void removeFilter(F f){
// see https://stackoverflow.com/questions/24263259/c-stdseterase-with-stdremove-if
for (auto it{filter.begin()}, end{filter.end()}; it != end; ) {
for (auto it{filter.begin()}; it != filter.end(); ) {
if (f(*it)) {
removeConnectionsToOutputDataProducer(static_cast<Filter*>(it->second.source.get()));
it = filter.erase(it);
......@@ -241,7 +241,7 @@ namespace Modules {
template<typename F>
void removeProgram(F f){
// see https://stackoverflow.com/questions/24263259/c-stdseterase-with-stdremove-if
for (auto it{programs.begin()}, end{programs.end()}; it != end; ) {
for (auto it{programs.begin()}; it != programs.end(); ) {
if (f(*it)) {
removeConnectionsToOutputDataProducer(static_cast<Program*>(it->get()));
it = programs.erase(it);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment