Merge branch 'master' of ssh://git.renater.fr:2222/xtandempipeline

src/gui/tandem_run_dialog/tandemrundialog.cpp

@@ -45,7 +45,7 @@
 TandemRunDialog::TandemRunDialog(QWidget *parent)
   : QDialog(parent), ui(new Ui::TandemRunDialog)
 {
-  qDebug() << "TandemRunDialog::TandemRunDialog begin";
+  qDebug() << __FILE__ << " " << __FUNCTION__ << " " << __LINE__;
   ui->setupUi(this);
   this->setModal(true);
   _p_fasta_file_list = new QStringListModel();
@@ -178,13 +178,13 @@ TandemRunDialog::fillPresetComboBox()
 void
 TandemRunDialog::reset()
 {
+  qDebug() << __FILE__ << " " << __FUNCTION__ << " " << __LINE__;
   QSettings settings;
   QString default_output_location =
     settings.value("path/identificationfiles", "").toString();
   ui->output_directory_label->setText(default_output_location);
 
-  QString tandem_bin_path =
-    settings.value("path/tandem_bin", "/usr/bin/tandem").toString();
+  QString tandem_bin_path = settings.value("path/tandem_bin", "").toString();
   fillTandemBinPath(tandem_bin_path, false);
 
   _p_fasta_file_list->stringList().clear();
@@ -194,6 +194,7 @@ TandemRunDialog::reset()
       settings.setValue("path/identificationfiles",
   QFileInfo(filenames[0]).absolutePath());
   }*/
+  qDebug() << __FILE__ << " " << __FUNCTION__ << " " << __LINE__;
 }
 
 void
@@ -466,14 +467,24 @@ void
 TandemRunDialog::fillTandemBinPath(const QString &tandem_bin_path_in,
                                    bool popup_firefox)
 {
+  qDebug() << __FILE__ << " " << __FUNCTION__ << " " << __LINE__ << " "
+           << tandem_bin_path_in;
   QSettings settings;
   if(tandem_bin_path_in.isEmpty())
     {
       // try to find default X!Tandem, depending on platform
+        ui->tandem_bin_label->setText(
+        "");
       if(QFileInfo("/usr/bin/tandem").exists())
         {
           fillTandemBinPath("/usr/bin/tandem", false);
         }
+      else
+        {
+      ui->tandem_version_label->setText(
+        "<font color=\"red\">Please select the tandem.exe file path</font>");
+          ui->exe_groupbox->setChecked(true);
+        }
     }
   else
     {
@@ -512,6 +523,7 @@ TandemRunDialog::fillTandemBinPath(const QString &tandem_bin_path_in,
             tr("%1 is not executable.").arg(tandem_bin_path));
         }
     }
+  qDebug() << __FILE__ << " " << __FUNCTION__ << " " << __LINE__;
 }