Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 4081e4fa authored by Serrière Guillaume's avatar Serrière Guillaume
Browse files

Designer: various fix + update about informations.

parent 1a6cf902
No related branches found
No related tags found
No related merge requests found
...@@ -37,8 +37,7 @@ Lead Software Engineer : ...@@ -37,8 +37,7 @@ Lead Software Engineer :
- Jussi T. Lindgren, Inria - Jussi T. Lindgren, Inria
Core Developers : Core Developers :
- Alison Cellard, Inria - Nathanaël Foy, Inria
- Loic Mahe, Inria
- Guillaume Serrière, Inria - Guillaume Serrière, Inria
SED Support Engineer : SED Support Engineer :
...@@ -51,11 +50,14 @@ Current contributors : ...@@ -51,11 +50,14 @@ Current contributors :
- mBrainTrain dev team (Serbia) - mBrainTrain dev team (Serbia)
- MCS / MKS (Russia) - MCS / MKS (Russia)
- Ozan Caglayan, Galatasaray Univ. (Turkey) - Ozan Caglayan, Galatasaray Univ. (Turkey)
- Ant neuro dev team (Netherland)
Previous Contributors : Previous Contributors :
- http://openvibe.inria.fr/contributors/ - http://openvibe.inria.fr/contributors/
Former Core Developers Former Core Developers
- Alison Cellard, Inria
- Loic Mahe, Inria
- Yann Renard, Inria - Yann Renard, Inria
- Laurent Bonnet, Inria - Laurent Bonnet, Inria
- Jozef Legény, Inria - Jozef Legény, Inria
...@@ -77,11 +79,12 @@ Scientific Steering Committee : ...@@ -77,11 +79,12 @@ Scientific Steering Committee :
- Yann Renard, Inria - Yann Renard, Inria
- Laurent Bonnet, Inria - Laurent Bonnet, Inria
- Jozef Legény, Inria - Jozef Legény, Inria
Contributions also from :
- Jussi T. Lindgren, Inria - Jussi T. Lindgren, Inria
- Loic Mahe, Inria - Loic Mahe, Inria
- Alison Cellard, Inria - Alison Cellard, Inria
- Guillaume Serrière, Inria
Contributions also from :
- Baptiste Payan, Inria - Baptiste Payan, Inria
- Vincent Delannoy, Inria - Vincent Delannoy, Inria
- Guillaume Gibert, INSERM - Guillaume Gibert, INSERM
......
...@@ -447,6 +447,7 @@ static void window_menu_check_item_toggled_cb(GtkCheckMenuItem* pCheckMenuItem, ...@@ -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) 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); gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(pApplication->m_pBuilderInterface, "openvibe-menu_edit")), false);
return false; return false;
...@@ -2539,7 +2540,7 @@ void CApplication::changeCurrentScenario(int32 i32PageIndex) ...@@ -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_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_next")), true);
gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(m_pBuilderInterface, "openvibe-button_forward")), l_ePlayerStatus!=PlayerStatus_Forward); 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); 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); gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(m_pBuilderInterface, "openvibe-button_windowmanager")), l_ePlayerStatus==PlayerStatus_Stop);
......
...@@ -373,24 +373,28 @@ void CLogListenerDesigner::log(const ELogLevel eLogLevel) ...@@ -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, "[", -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, "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); gtk_text_buffer_insert_with_tags_by_name(m_pCurrentLog->getTextBuffer(), &l_oEndLogIter, "] ", -1, "w_bold", "f_mono", NULL);
++m_ui32CountWarnings;
break; break;
case LogLevel_ImportantWarning: 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, "[", -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, "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); gtk_text_buffer_insert_with_tags_by_name(m_pCurrentLog->getTextBuffer(), &l_oEndLogIter, "] ", -1, "w_bold", "f_mono", NULL);
++m_ui32CountWarnings;
break; break;
case LogLevel_Error: 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, "[ ", -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, "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); gtk_text_buffer_insert_with_tags_by_name(m_pCurrentLog->getTextBuffer(), &l_oEndLogIter, " ] ", -1, "w_bold", "f_mono", NULL);
++m_ui32CountErrors;
break; break;
case LogLevel_Fatal: 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, "[ ", -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, "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); gtk_text_buffer_insert_with_tags_by_name(m_pCurrentLog->getTextBuffer(), &l_oEndLogIter, " ] ", -1, "w_bold", "f_mono", NULL);
++m_ui32CountErrors;
break; break;
default: default:
......
...@@ -69,6 +69,12 @@ boolean CBoxAlgorithmCrop::initialize(void) ...@@ -69,6 +69,12 @@ boolean CBoxAlgorithmCrop::initialize(void)
getStaticBoxContext().getSettingValue(2, l_sSettingValue); getStaticBoxContext().getSettingValue(2, l_sSettingValue);
m_f64MaxCropValue=::atof(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; return true;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment