correcting tutorial, adding export for statistics, fixing typo

lifs-tools · May 31, 2022 · 94fefb9 · 94fefb9
1 parent af00f41
commit 94fefb9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/lipidspace/importtable.h b/lipidspace/importtable.h
@@ -28,6 +28,7 @@ class ImportTable : public QDialog
     string sheet;
     Ui::ImportTable *ui;
     string data_table_file;
+    QString file_name;
     map<QString, int> original_column_index;
 
     explicit ImportTable(QWidget *parent = nullptr);

diff --git a/src/Tutorial.cpp b/src/Tutorial.cpp
@@ -301,7 +301,9 @@ void Tutorial::action_performed(){
                 case FOpenImport:
                     {
                         ImportTable &it = lipidSpaceGUI->import_table;
-                        if (it.sheet != "Example-Dataset"){
+                        QFileInfo qFileInfo(it.file_name);
+                        string cleaned_file_name = qFileInfo.baseName().toStdString();
+                        if (cleaned_file_name != "Example-Dataset" || it.sheet != "Data"){
                             QMessageBox::warning(this, "Wrong table", "You have selected the wrong file, please select the correct file according to the tutorial.");
                             it.accept();
                         }

diff --git a/src/importtable.cpp b/src/importtable.cpp
@@ -93,6 +93,8 @@ ImportTable::ImportTable(QWidget *parent) : QDialog(parent), ui(new Ui::ImportTa
     connect(ui->lipidListWidgetRow, SIGNAL(oneItemViolation(string, int)), this, SLOT(oneItemViolated(string, int)));
     connect(ui->lipidListWidgetFlat, SIGNAL(oneItemViolation(string, int)), this, SLOT(oneItemViolated(string, int)));
     connect(ui->quantListWidgetFlat, SIGNAL(oneItemViolation(string, int)), this, SLOT(oneItemViolated(string, int)));
+
+    file_name = "";
 } 
 
 void ImportTable::show(){
@@ -113,7 +115,7 @@ void ImportTable::show(){
     ui->tableWidget->setColumnCount(0);
     ui->tabWidget->setCurrentIndex(0);
 
-    QString file_name = QFileDialog::getOpenFileName(this, "Select a lipid data table", GlobalData::last_folder, "Worksheets *.xlsx (*.xlsx);;Data Tables *.csv *.tsv (*.csv *.tsv)");
+    file_name = QFileDialog::getOpenFileName(this, "Select a lipid data table", GlobalData::last_folder, "Worksheets *.xlsx (*.xlsx);;Data Tables *.csv *.tsv (*.csv *.tsv)");
     if (!file_name.length()) {
         QMetaObject::invokeMethod(this, "close", Qt::QueuedConnection);
         return;

diff --git a/src/statistics.cpp b/src/statistics.cpp
@@ -621,7 +621,7 @@ void Statistics::updateBoxPlot(){
         else if (nom_counter > 2){
             double p_anova = p_value_anova(series);
             stat_results.insert({"p_value(ANOVA)", p_anova});
-            chart->setTitle(QString("Statistics: <i>p-value</i><sub>AONVA</sub> = %1").arg(QString::number(p_anova, 'g', 3)));
+            chart->setTitle(QString("Statistics: <i>p-value</i><sub>ANOVA</sub> = %1").arg(QString::number(p_anova, 'g', 3)));
         }
     }
     else {