From e54246e3a1261b1d80af824164de955085306a11 Mon Sep 17 00:00:00 2001
From: Olivier Langella <Olivier.Langella@moulon.inra.fr>
Date: Mon, 24 Apr 2017 22:48:28 +0200
Subject: [PATCH] protein sheet is OK
---
src/CMakeLists.txt | 8 ++++----
.../export_spreadsheet_dialog.ui | 4 ++--
.../exportspreadsheetdialog.cpp | 10 ++++++++++
.../exportspreadsheetdialog.h | 1 +
src/output/ods/odsexport.cpp | 4 ++++
src/output/ods/proteinsheet.cpp | 2 +-
6 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 32266b297..c2230ed3f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -27,11 +27,11 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Xml_EXECUTABLE_COMPILE_FLAGS} ${Qt5
#sudo apt-get install libpappsomspp-dev
-#FIND_PACKAGE( Pappsomspp REQUIRED )
- SET (PAPPSOMSPP_DIR "/home/olivier/eclipse/git/pappsomspp")
+FIND_PACKAGE( Pappsomspp REQUIRED )
+# SET (PAPPSOMSPP_DIR "/home/olivier/eclipse/git/pappsomspp")
# SET (PAPPSOMSPP_DIR "/home/langella/developpement/git/pappsomspp")
- SET (PAPPSOMSPP_INCLUDE_DIR "${PAPPSOMSPP_DIR}/src")
- SET (PAPPSOMSPP_QT4_LIBRARY "${PAPPSOMSPP_DIR}/cbuild/src/libpappsomspp-qt4.so")
+# SET (PAPPSOMSPP_INCLUDE_DIR "${PAPPSOMSPP_DIR}/src")
+# SET (PAPPSOMSPP_QT4_LIBRARY "${PAPPSOMSPP_DIR}/cbuild/src/libpappsomspp-qt4.so")
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake_modules)
diff --git a/src/gui/export_spreadsheet_dialog/export_spreadsheet_dialog.ui b/src/gui/export_spreadsheet_dialog/export_spreadsheet_dialog.ui
index 552ad3a8c..23f8a492c 100644
--- a/src/gui/export_spreadsheet_dialog/export_spreadsheet_dialog.ui
+++ b/src/gui/export_spreadsheet_dialog/export_spreadsheet_dialog.ui
@@ -28,9 +28,9 @@
</widget>
</item>
<item>
- <widget class="QCheckBox" name="checkBox_2">
+ <widget class="QCheckBox" name="protein_checkbox">
<property name="text">
- <string>CheckBox</string>
+ <string>proteins</string>
</property>
</widget>
</item>
diff --git a/src/gui/export_spreadsheet_dialog/exportspreadsheetdialog.cpp b/src/gui/export_spreadsheet_dialog/exportspreadsheetdialog.cpp
index 044433b81..fa38c97bd 100644
--- a/src/gui/export_spreadsheet_dialog/exportspreadsheetdialog.cpp
+++ b/src/gui/export_spreadsheet_dialog/exportspreadsheetdialog.cpp
@@ -41,6 +41,10 @@ ExportSpreadsheetDialog::ExportSpreadsheetDialog(QWidget * parent):
if (settings.value("export_ods/simple", "true").toBool()) {
ui->simple_checkbox->setCheckState(Qt::Checked);
}
+ ui->protein_checkbox->setCheckState(Qt::Unchecked);
+ if (settings.value("export_ods/proteins", "true").toBool()) {
+ ui->protein_checkbox->setCheckState(Qt::Checked);
+ }
//param.setFilterCrossSamplePeptideNumber(settings.value("automatic_filter/cross_sample", "true").toBool());
#if QT_VERSION >= 0x050000
@@ -68,3 +72,9 @@ void ExportSpreadsheetDialog::doSimpleProteinPeptideList(bool simple) {
QSettings settings;
settings.setValue("export_ods/simple", QString("%1").arg(simple));
}
+
+void ExportSpreadsheetDialog::doProteinList(bool simple) {
+
+ QSettings settings;
+ settings.setValue("export_ods/proteins", QString("%1").arg(simple));
+}
diff --git a/src/gui/export_spreadsheet_dialog/exportspreadsheetdialog.h b/src/gui/export_spreadsheet_dialog/exportspreadsheetdialog.h
index d8d096923..81de703de 100644
--- a/src/gui/export_spreadsheet_dialog/exportspreadsheetdialog.h
+++ b/src/gui/export_spreadsheet_dialog/exportspreadsheetdialog.h
@@ -46,6 +46,7 @@ public:
public slots:
void doSimpleProteinPeptideList(bool simple);
+ void doProteinList(bool simple);
signals:
private:
diff --git a/src/output/ods/odsexport.cpp b/src/output/ods/odsexport.cpp
index 1989724cc..acf1b9726 100644
--- a/src/output/ods/odsexport.cpp
+++ b/src/output/ods/odsexport.cpp
@@ -29,6 +29,7 @@
#include "odsexport.h"
#include "simplesheet.h"
+#include "proteinsheet.h"
#include <QSettings>
OdsExport::OdsExport(const Project * project):_p_project(project) {
@@ -39,4 +40,7 @@ void OdsExport::write(CalcWriterInterface * p_writer) {
if (settings.value("export_ods/simple", "false").toBool()) {
SimpleSheet(p_writer, _p_project);
}
+ if (settings.value("export_ods/proteins", "true").toBool()) {
+ ProteinSheet(p_writer, _p_project);
+ }
}
diff --git a/src/output/ods/proteinsheet.cpp b/src/output/ods/proteinsheet.cpp
index f75bf7a91..ecc8780f8 100644
--- a/src/output/ods/proteinsheet.cpp
+++ b/src/output/ods/proteinsheet.cpp
@@ -82,7 +82,7 @@ void ProteinSheet::writeIdentificationGroup(IdentificationGroup * p_ident) {
std::sort(protein_match_list.begin(), protein_match_list.end(),
[](const ProteinMatch * a, const ProteinMatch * b)
{
- return a->getGrpProteinSp().get()->getSubGroupNumber() > b->getGrpProteinSp().get()->getSubGroupNumber();
+ return a->getGrpProteinSp().get()->getSubGroupNumber() < b->getGrpProteinSp().get()->getSubGroupNumber();
});
for (auto & protein_match:protein_match_list) {
--
GitLab