diff --git a/applications/platform/designer/share/interface.ui-base b/applications/platform/designer/share/interface.ui-base index b69c3d94e45330255b5df528c84d55eb28bbfa25..e5a9aaa520aef629baacbf165c632203554ab049 100644 --- a/applications/platform/designer/share/interface.ui-base +++ b/applications/platform/designer/share/interface.ui-base @@ -37,8 +37,7 @@ Lead Software Engineer : - Jussi T. Lindgren, Inria Core Developers : - - Alison Cellard, Inria - - Loic Mahe, Inria + - Nathanaël Foy, Inria - Guillaume Serrière, Inria SED Support Engineer : @@ -51,11 +50,14 @@ Current contributors : - mBrainTrain dev team (Serbia) - MCS / MKS (Russia) - Ozan Caglayan, Galatasaray Univ. (Turkey) + - Ant neuro dev team (Netherland) Previous Contributors : - http://openvibe.inria.fr/contributors/ Former Core Developers + - Alison Cellard, Inria + - Loic Mahe, Inria - Yann Renard, Inria - Laurent Bonnet, Inria - Jozef Legény, Inria @@ -77,11 +79,12 @@ Scientific Steering Committee : - Yann Renard, Inria - Laurent Bonnet, Inria - Jozef Legény, Inria - -Contributions also from : - Jussi T. Lindgren, Inria - Loic Mahe, Inria - Alison Cellard, Inria + - Guillaume Serrière, Inria + +Contributions also from : - Baptiste Payan, Inria - Vincent Delannoy, Inria - Guillaume Gibert, INSERM diff --git a/applications/platform/designer/src/ovdCApplication.cpp b/applications/platform/designer/src/ovdCApplication.cpp index 2c055d8eb2288bd64c16e032411199fafa23fdca..7b515536c3576295bf05932eef5fb18e58d6b73d 100644 --- a/applications/platform/designer/src/ovdCApplication.cpp +++ b/applications/platform/designer/src/ovdCApplication.cpp @@ -447,6 +447,7 @@ static void window_menu_check_item_toggled_cb(GtkCheckMenuItem* pCheckMenuItem, static gboolean searchbox_focus_in_cb(::GtkWidget* pWidget, ::GdkEvent* pEvent, CApplication* pApplication) { + //TODO check if this line is necessary gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(pApplication->m_pBuilderInterface, "openvibe-menu_edit")), false); return false; @@ -2539,7 +2540,7 @@ void CApplication::changeCurrentScenario(int32 i32PageIndex) gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(m_pBuilderInterface, "openvibe-button_play_pause")), true); gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(m_pBuilderInterface, "openvibe-button_next")), true); gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(m_pBuilderInterface, "openvibe-button_forward")), l_ePlayerStatus!=PlayerStatus_Forward); - gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(gtk_builder_get_object(m_pBuilderInterface, "openvibe-button_play_pause")), (l_ePlayerStatus==PlayerStatus_Stop || l_ePlayerStatus==PlayerStatus_Pause || l_ePlayerStatus==PlayerStatus_Uninitialized) ? GTK_STOCK_MEDIA_PLAY : GTK_STOCK_MEDIA_PAUSE); + gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(gtk_builder_get_object(m_pBuilderInterface, "openvibe-button_play_pause")), (l_ePlayerStatus==PlayerStatus_Play) ? GTK_STOCK_MEDIA_PAUSE : GTK_STOCK_MEDIA_PLAY); g_signal_handlers_disconnect_by_func(G_OBJECT(gtk_builder_get_object(m_pBuilderInterface, "openvibe-togglebutton_cpu_usage")), G_CALLBACK2(cpu_usage_cb), this); gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(m_pBuilderInterface, "openvibe-button_windowmanager")), l_ePlayerStatus==PlayerStatus_Stop); diff --git a/applications/platform/designer/src/ovdCLogListenerDesigner.cpp b/applications/platform/designer/src/ovdCLogListenerDesigner.cpp index 0ee14dfa7de92c6d7de2d378aa51a924aab740d4..3d016812ab2dd0451369a14d7c2102804725a18a 100644 --- a/applications/platform/designer/src/ovdCLogListenerDesigner.cpp +++ b/applications/platform/designer/src/ovdCLogListenerDesigner.cpp @@ -373,24 +373,28 @@ void CLogListenerDesigner::log(const ELogLevel eLogLevel) gtk_text_buffer_insert_with_tags_by_name(m_pCurrentLog->getTextBuffer(), &l_oEndLogIter, "[", -1, "w_bold", "f_mono", NULL); gtk_text_buffer_insert_with_tags_by_name(m_pCurrentLog->getTextBuffer(), &l_oEndLogIter, "WARNING", -1, "w_bold", "f_mono", "c_darkViolet", NULL); gtk_text_buffer_insert_with_tags_by_name(m_pCurrentLog->getTextBuffer(), &l_oEndLogIter, "] ", -1, "w_bold", "f_mono", NULL); + ++m_ui32CountWarnings; break; case LogLevel_ImportantWarning: gtk_text_buffer_insert_with_tags_by_name(m_pCurrentLog->getTextBuffer(), &l_oEndLogIter, "[", -1, "w_bold", "f_mono", NULL); gtk_text_buffer_insert_with_tags_by_name(m_pCurrentLog->getTextBuffer(), &l_oEndLogIter, "WARNING", -1, "w_bold", "f_mono", "c_darkOrange", NULL); gtk_text_buffer_insert_with_tags_by_name(m_pCurrentLog->getTextBuffer(), &l_oEndLogIter, "] ", -1, "w_bold", "f_mono", NULL); + ++m_ui32CountWarnings; break; case LogLevel_Error: gtk_text_buffer_insert_with_tags_by_name(m_pCurrentLog->getTextBuffer(), &l_oEndLogIter, "[ ", -1, "w_bold", "f_mono", NULL); gtk_text_buffer_insert_with_tags_by_name(m_pCurrentLog->getTextBuffer(), &l_oEndLogIter, "ERROR", -1, "w_bold", "f_mono", "c_red", NULL); gtk_text_buffer_insert_with_tags_by_name(m_pCurrentLog->getTextBuffer(), &l_oEndLogIter, " ] ", -1, "w_bold", "f_mono", NULL); + ++m_ui32CountErrors; break; case LogLevel_Fatal: gtk_text_buffer_insert_with_tags_by_name(m_pCurrentLog->getTextBuffer(), &l_oEndLogIter, "[ ", -1, "w_bold", "f_mono", NULL); gtk_text_buffer_insert_with_tags_by_name(m_pCurrentLog->getTextBuffer(), &l_oEndLogIter, "FATAL", -1, "w_bold", "f_mono", "c_red", NULL); gtk_text_buffer_insert_with_tags_by_name(m_pCurrentLog->getTextBuffer(), &l_oEndLogIter, " ] ", -1, "w_bold", "f_mono", NULL); + ++m_ui32CountErrors; break; default: diff --git a/plugins/processing/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmCrop.cpp b/plugins/processing/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmCrop.cpp index 616b8a607cb3d5cba574d89772eb8743bd0cc4c1..e874555a797ee5d3b034164508a7c621ac634cec 100644 --- a/plugins/processing/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmCrop.cpp +++ b/plugins/processing/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmCrop.cpp @@ -69,6 +69,12 @@ boolean CBoxAlgorithmCrop::initialize(void) getStaticBoxContext().getSettingValue(2, l_sSettingValue); m_f64MaxCropValue=::atof(l_sSettingValue); + if(m_f64MinCropValue >= m_f64MaxCropValue) + { + this->getLogManager() << LogLevel_Error << "The minimum crop value (" << m_f64MinCropValue << ") should be lower than the maximum crop value (" << m_f64MaxCropValue << ").\n"; + return false; + } + return true; }