From 1f5d5b76f1c741d2d6554d1d53d7b279a5df6144 Mon Sep 17 00:00:00 2001 From: Tobias Baumann Date: Fri, 6 May 2022 11:55:20 +0000 Subject: [PATCH] =?UTF-8?q?Dateien=20hochladen=20nach=20=E2=80=9Esrc/Tacti?= =?UTF-8?q?leVisualization=E2=80=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...pCBoxAlgorithmP300TactileVisualization.cpp | 37 +++++++++++++------ 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/src/TactileVisualization/ovpCBoxAlgorithmP300TactileVisualization.cpp b/src/TactileVisualization/ovpCBoxAlgorithmP300TactileVisualization.cpp index 19e9781..b5b640c 100644 --- a/src/TactileVisualization/ovpCBoxAlgorithmP300TactileVisualization.cpp +++ b/src/TactileVisualization/ovpCBoxAlgorithmP300TactileVisualization.cpp @@ -68,6 +68,17 @@ bool CBoxAlgorithmP300TactileVisualization::initialize() m_selectedFontSize = FSettingValueAutoCast(*this->getBoxAlgorithmContext(), 14); m_nTactilos = FSettingValueAutoCast(*this->getBoxAlgorithmContext(), 15); + + //set m_nTactilos to 2 if lower than 2 + if(m_nTactilos < 2) + { + m_nTactilos = 2; + } + //set m_nTactilos to MAX if greater than MAX_TACTILOS + if(m_nTactilos > MAX_TACTILOS) + { + m_nTactilos = MAX_TACTILOS; + } // ---------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -174,20 +185,23 @@ bool CBoxAlgorithmP300TactileVisualization::initialize() //Set Pointer to Mainmenu m_currMenu = &m_Menu[0]; - - //Init Gtk Labels - for(int i = 0; i < 6; i++) - { - std::string label_id = "label-" + std::to_string(i+1); - std::string label_text = m_currMenu->get_LabelText(i); - m_Label.push_back(GTK_LABEL(gtk_builder_get_object(m_mainWidgetInterface, label_id.c_str()))); - gtk_label_set_text(m_Label[i], label_text.c_str()); - } } - else + else //Create default menu for m_nTactilos != 6 { - + m_Menu.push_back(TactileMenu(m_nTactilos)); + m_currMenu = &m_Menu[0]; } + + //Init Gtk Labels + for(int i = 0; i < m_nTactilos; i++) + { + std::string label_id = "label-" + std::to_string(i+1); + std::string label_text = m_currMenu->get_LabelText(i); + + m_Label.push_back(GTK_LABEL(gtk_builder_get_object(m_mainWidgetInterface, label_id.c_str()))); + gtk_label_set_text(m_Label[i], label_text.c_str()); + } + //End Menu Initialization --------------------------------------------------------------------------------------- gtk_builder_connect_signals(m_mainWidgetInterface, nullptr); @@ -659,6 +673,7 @@ bool CBoxAlgorithmP300TactileVisualization::process() for(int i = 0; i < 6; i++) { std::string label_text = m_currMenu->get_LabelText(i); + gtk_label_set_text(m_Label[i], label_text.c_str()); } }