Skip to content
Snippets Groups Projects
Commit 00ab01fb authored by Langella Olivier's avatar Langella Olivier
Browse files

choose preset directory, accept tandem run dialog

parent 64644804
No related branches found
No related tags found
No related merge requests found
...@@ -88,6 +88,7 @@ MainWindow::MainWindow(QWidget *parent): ...@@ -88,6 +88,7 @@ MainWindow::MainWindow(QWidget *parent):
#else #else
// Qt4 code // Qt4 code
connect(_p_tandem_run_dialog, SIGNAL(accepted()), this,SLOT(doAcceptedTandemRunDialog()));
connect(_p_load_results_dialog, SIGNAL(accepted()), this,SLOT(doAcceptedLoadResultDialog())); connect(_p_load_results_dialog, SIGNAL(accepted()), this,SLOT(doAcceptedLoadResultDialog()));
connect(_p_export_spreadsheet_dialog, SIGNAL(accepted()), this,SLOT(doAcceptedExportSpreadsheetDialog())); connect(_p_export_spreadsheet_dialog, SIGNAL(accepted()), this,SLOT(doAcceptedExportSpreadsheetDialog()));
...@@ -170,6 +171,12 @@ void MainWindow::doAcceptedExportSpreadsheetDialog() { ...@@ -170,6 +171,12 @@ void MainWindow::doAcceptedExportSpreadsheetDialog() {
qDebug() << "MainWindow::doAcceptedExportSpreadsheetDialog end"; qDebug() << "MainWindow::doAcceptedExportSpreadsheetDialog end";
} }
void MainWindow::doAcceptedTandemRunDialog()
{
qDebug() << "MainWindow::doAcceptedTandemRunDialog begin";
qDebug() << "MainWindow::doAcceptedTandemRunDialog end";
}
void MainWindow::doAcceptedLoadResultDialog() { void MainWindow::doAcceptedLoadResultDialog() {
qDebug() << "MainWindow::doAcceptedLoadResultDialog begin"; qDebug() << "MainWindow::doAcceptedLoadResultDialog begin";
AutomaticFilterParameters param = _p_load_results_dialog->getAutomaticFilterParameters(); AutomaticFilterParameters param = _p_load_results_dialog->getAutomaticFilterParameters();
......
...@@ -72,6 +72,7 @@ public slots: ...@@ -72,6 +72,7 @@ public slots:
void doProjectReady(ProjectSp project_sp); void doProjectReady(ProjectSp project_sp);
void doProjectNotReady(QString error); void doProjectNotReady(QString error);
void doAcceptedLoadResultDialog(); void doAcceptedLoadResultDialog();
void doAcceptedTandemRunDialog();
void doAcceptedExportSpreadsheetDialog(); void doAcceptedExportSpreadsheetDialog();
void doOperationFailed(QString); void doOperationFailed(QString);
void doOperationFinished(); void doOperationFinished();
......
...@@ -57,7 +57,14 @@ ...@@ -57,7 +57,14 @@
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_7"> <layout class="QHBoxLayout" name="horizontalLayout_7">
<item> <item>
<widget class="QComboBox" name="preset_combobox"/> <widget class="QComboBox" name="preset_combobox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item> </item>
<item> <item>
<spacer name="horizontalSpacer_6"> <spacer name="horizontalSpacer_6">
...@@ -360,6 +367,22 @@ ...@@ -360,6 +367,22 @@
</hint> </hint>
</hints> </hints>
</connection> </connection>
<connection>
<sender>pushButton_7</sender>
<signal>clicked()</signal>
<receiver>TandemRunDialog</receiver>
<slot>selectPresetDirectory()</slot>
<hints>
<hint type="sourcelabel">
<x>541</x>
<y>135</y>
</hint>
<hint type="destinationlabel">
<x>642</x>
<y>135</y>
</hint>
</hints>
</connection>
</connections> </connections>
<slots> <slots>
<slot>reject()</slot> <slot>reject()</slot>
...@@ -368,5 +391,6 @@ ...@@ -368,5 +391,6 @@
<slot>selectMzFiles()</slot> <slot>selectMzFiles()</slot>
<slot>selectOutputDirectory()</slot> <slot>selectOutputDirectory()</slot>
<slot>setPresetName(QString)</slot> <slot>setPresetName(QString)</slot>
<slot>selectPresetDirectory()</slot>
</slots> </slots>
</ui> </ui>
...@@ -110,6 +110,24 @@ void TandemRunDialog::reset() { ...@@ -110,6 +110,24 @@ void TandemRunDialog::reset() {
}*/ }*/
} }
void TandemRunDialog::selectPresetDirectory() {
try {
QSettings settings;
QString default_preset_location = settings.value("path/tandemrun_preset_directory", "").toString();
QString directory = QFileDialog::getExistingDirectory(this,tr("Choose preset directory"),default_preset_location );
if (!directory.isEmpty()) {
settings.setValue("path/tandemrun_preset_directory", directory);
fillPresetComboBox();
}
}
catch (pappso::PappsoException & error) {
//QMessageBox::warning(this,
// tr("Error choosing identification result files : %1").arg(error.qwhat()), error);
}
}
void TandemRunDialog::selectOutputDirectory() { void TandemRunDialog::selectOutputDirectory() {
try { try {
QSettings settings; QSettings settings;
......
...@@ -53,6 +53,7 @@ public slots: ...@@ -53,6 +53,7 @@ public slots:
void selectFastaFiles(); void selectFastaFiles();
void selectMzFiles(); void selectMzFiles();
void selectOutputDirectory(); void selectOutputDirectory();
void selectPresetDirectory();
void setPresetName(QString preset_name); void setPresetName(QString preset_name);
signals: signals:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment