diff --git a/src/gui/load_results_dialog/load_results_dialog.ui b/src/gui/load_results_dialog/load_results_dialog.ui index 98de36a7eec19af2ed3a87207a3097b929e018b8..f2ee0a20a10e558e06f0d4246dabe17298e56534 100644 --- a/src/gui/load_results_dialog/load_results_dialog.ui +++ b/src/gui/load_results_dialog/load_results_dialog.ui @@ -41,6 +41,37 @@ <layout class="QVBoxLayout" name="filter_parameter_layout"/> </widget> </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="pushButton_2"> + <property name="text"> + <string>Cancel</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="pushButton"> + <property name="text"> + <string>OK</string> + </property> + </widget> + </item> + </layout> + </item> </layout> </widget> <resources/> @@ -52,8 +83,8 @@ <slot>chooseFiles()</slot> <hints> <hint type="sourcelabel"> - <x>319</x> - <y>236</y> + <x>345</x> + <y>202</y> </hint> <hint type="destinationlabel"> <x>550</x> @@ -61,8 +92,42 @@ </hint> </hints> </connection> + <connection> + <sender>pushButton_2</sender> + <signal>clicked()</signal> + <receiver>LoadResultsDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>371</x> + <y>271</y> + </hint> + <hint type="destinationlabel"> + <x>568</x> + <y>234</y> + </hint> + </hints> + </connection> + <connection> + <sender>pushButton</sender> + <signal>clicked()</signal> + <receiver>LoadResultsDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>508</x> + <y>275</y> + </hint> + <hint type="destinationlabel"> + <x>648</x> + <y>216</y> + </hint> + </hints> + </connection> </connections> <slots> <slot>chooseFiles()</slot> + <slot>reject()</slot> + <slot>accept()</slot> </slots> </ui> diff --git a/src/gui/load_results_dialog/loadresultsdialog.cpp b/src/gui/load_results_dialog/loadresultsdialog.cpp index 6a1a5f0e9dc6db55d097831f12f6bf533fbc1ce7..0a6971eb15b3fb9602d9fe7d09b93f2b0c0dc16a 100644 --- a/src/gui/load_results_dialog/loadresultsdialog.cpp +++ b/src/gui/load_results_dialog/loadresultsdialog.cpp @@ -41,6 +41,7 @@ LoadResultsDialog::LoadResultsDialog(QWidget * parent): AutomaticFilterWidget* p_automatic_filter_widget = new AutomaticFilterWidget(this); + p_automatic_filter_widget->hideButton(); ui->filter_parameter_layout->addWidget(p_automatic_filter_widget); #if QT_VERSION >= 0x050000 // Qt5 code diff --git a/src/gui/project_view/automatic_filter_widget/automaticfilterwidget.cpp b/src/gui/project_view/automatic_filter_widget/automaticfilterwidget.cpp index f20f9ef8ea349f3a5d72add2221d2f8bd01a3bd4..783bbc2aa149c2e3ce644b06d499a1c6a72b02d8 100644 --- a/src/gui/project_view/automatic_filter_widget/automaticfilterwidget.cpp +++ b/src/gui/project_view/automatic_filter_widget/automaticfilterwidget.cpp @@ -43,6 +43,11 @@ AutomaticFilterWidget::~AutomaticFilterWidget() delete ui; } +void AutomaticFilterWidget::hideButton() { + qDebug() << "AutomaticFilterWidget::hideButton begin "; + ui->set_param_button->setVisible(false); + qDebug() << "AutomaticFilterWidget::hideButton end "; +} void AutomaticFilterWidget::setAutomaticFilterParameters(const AutomaticFilterParameters & params) { qDebug() << "AutomaticFilterWidget::setAutomaticFilterParameters begin "; _parameters = params; diff --git a/src/gui/project_view/automatic_filter_widget/automaticfilterwidget.h b/src/gui/project_view/automatic_filter_widget/automaticfilterwidget.h index cfccc9add23b7ce59b8e2073ff1724a6e7a55ed7..b9e66d2d55f69fdaddccf2157c138d4049d9ae6a 100644 --- a/src/gui/project_view/automatic_filter_widget/automaticfilterwidget.h +++ b/src/gui/project_view/automatic_filter_widget/automaticfilterwidget.h @@ -41,6 +41,7 @@ public: ~AutomaticFilterWidget(); void setAutomaticFilterParameters(const AutomaticFilterParameters & params); + void hideButton(); public slots: void doPeptideEvalue(double evalue); diff --git a/src/gui/project_view/projectwindow.cpp b/src/gui/project_view/projectwindow.cpp index bb0d790d4384e3a6ff8210c08353d4b2d8e090c9..551022b34de705edeb49fb5b8b8fae257f047793 100644 --- a/src/gui/project_view/projectwindow.cpp +++ b/src/gui/project_view/projectwindow.cpp @@ -58,8 +58,7 @@ ProjectWindow::ProjectWindow(MainWindow *parent): // Qt4 code //connect (_protein_list_window, SIGNAL(proteinMatchClicked(ProteinMatch *)), this //,SLOT(doProteinMatchClicked(ProteinMatch *))); connect (_p_automatic_filter_widget, SIGNAL(automaticFilterParametersChanged(AutomaticFilterParameters)), this,SLOT(doAutomaticFilterParametersChanged(AutomaticFilterParameters))); - connect (this, SIGNAL(identificationGroupGrouped(IdentificationGroup *)), _p_automatic_filter_widget,SLOT(doIdentificationGroupGrouped(IdentificationGroup *))); - + #endif /* */