From f96f4ded2030e49a9ee70e56fc2d1e3bdb71ba20 Mon Sep 17 00:00:00 2001
From: Olivier Langella <olivier.langella@u-psud.fr>
Date: Sat, 21 Oct 2017 00:06:57 +0200
Subject: [PATCH] fix syntax
---
src/CMakeLists.txt | 10 +--
src/grouping/groupingpeptidemass.cpp | 3 +
.../edit_tandem_preset_dialog.ui | 72 +++++++++----------
3 files changed, 44 insertions(+), 41 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b751680f9..d4387df34 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -27,12 +27,12 @@ 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_QT5_LIBRARY "${PAPPSOMSPP_DIR}/cbuild/src/libpappsomspp-qt5.so")
-# SET (PAPPSOMSPP_QT4_LIBRARY "${PAPPSOMSPP_DIR}/cbuild/src/libpappsomspp-qt4.so")
+ SET (PAPPSOMSPP_INCLUDE_DIR "${PAPPSOMSPP_DIR}/src")
+ SET (PAPPSOMSPP_QT5_LIBRARY "${PAPPSOMSPP_DIR}/cbuild/src/libpappsomspp-qt5.so")
+ SET (PAPPSOMSPP_QT4_LIBRARY "${PAPPSOMSPP_DIR}/cbuild/src/libpappsomspp-qt4.so")
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake_modules)
diff --git a/src/grouping/groupingpeptidemass.cpp b/src/grouping/groupingpeptidemass.cpp
index b9d690fbb..0e2d0078b 100644
--- a/src/grouping/groupingpeptidemass.cpp
+++ b/src/grouping/groupingpeptidemass.cpp
@@ -24,6 +24,7 @@
#include "groupingpeptidemass.h"
#include "../core/proteinmatch.h"
#include "../core/peptidematch.h"
+#include <QDebug>
GroupingPeptideMass::GroupingPeptideMass()
{
@@ -48,7 +49,9 @@ pappso::GrpPeptideSp & GroupingPeptideMass::setGrpPeptide(pappso::GrpProteinSp p
}
void GroupingPeptideMass::startGrouping() {
+ qDebug() << "GroupingPeptideMass::startGrouping begin";
_p_grp_experiment->startGrouping();
+ qDebug() << "GroupingPeptideMass::startGrouping end";
}
void GroupingPeptideMass::addPostGroupingGrpProteinSpRemoval(pappso::GrpProteinSp sp_protein) {
diff --git a/src/gui/edit_tandem_preset_dialog/edit_tandem_preset_dialog.ui b/src/gui/edit_tandem_preset_dialog/edit_tandem_preset_dialog.ui
index a19efd317..bcc70d87b 100644
--- a/src/gui/edit_tandem_preset_dialog/edit_tandem_preset_dialog.ui
+++ b/src/gui/edit_tandem_preset_dialog/edit_tandem_preset_dialog.ui
@@ -679,8 +679,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>551</width>
- <height>360</height>
+ <width>1012</width>
+ <height>468</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_6">
@@ -1028,8 +1028,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>331</width>
- <height>326</height>
+ <width>1012</width>
+ <height>468</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_9">
@@ -1224,8 +1224,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>517</width>
- <height>360</height>
+ <width>1012</width>
+ <height>468</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_11">
@@ -1709,7 +1709,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>533</width>
+ <width>998</width>
<height>632</height>
</rect>
</property>
@@ -2262,7 +2262,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>589</width>
+ <width>998</width>
<height>496</height>
</rect>
</property>
@@ -2351,7 +2351,7 @@
<item row="1" column="0">
<widget class="QLabel" name="label_65">
<property name="text">
- <string>Highest E-value for recorded proteins</string>
+ <string>Highest E-value to record proteins</string>
</property>
</widget>
</item>
@@ -2392,7 +2392,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label_30">
<property name="text">
- <string>Highest E-value for recorded peptides</string>
+ <string>Highest E-value to record peptides</string>
</property>
</widget>
</item>
@@ -4395,38 +4395,38 @@
<slot>doSelectDir()</slot>
</slots>
<buttongroups>
- <buttongroup name="syi_button_group"/>
- <buttongroup name="rpm_button_group"/>
- <buttongroup name="rupmffr_button_group"/>
- <buttongroup name="buttonGroup_2"/>
- <buttongroup name="suca_button_group"/>
- <buttongroup name="buttonGroup_4"/>
- <buttongroup name="ospec_button_group"/>
- <buttongroup name="sunlw_button_group"/>
- <buttongroup name="pstpb_button_group"/>
- <buttongroup name="mzid_button_group"/>
- <buttongroup name="rcsemi_button_group"/>
- <buttongroup name="spmmeu_button_group"/>
- <buttongroup name="pqa_button_group"/>
- <buttongroup name="buttonGroup_6"/>
- <buttongroup name="sci_button_group"/>
- <buttongroup name="ruc_button_group"/>
- <buttongroup name="szi_button_group"/>
- <buttongroup name="sfmmeu_button_group"/>
<buttongroup name="sai_button_group"/>
+ <buttongroup name="sir_button_group"/>
<buttongroup name="sbi_button_group"/>
+ <buttongroup name="refine_button_group"/>
+ <buttongroup name="sfmmeu_button_group"/>
+ <buttongroup name="pcsemi_button_group"/>
<buttongroup name="buttonGroup"/>
+ <buttongroup name="ruc_button_group"/>
+ <buttongroup name="spmmeu_button_group"/>
<buttongroup name="buttonGroup_7"/>
- <buttongroup name="pqp_button_group"/>
- <buttongroup name="rss_button_group"/>
- <buttongroup name="pcsemi_button_group"/>
- <buttongroup name="sir_button_group"/>
<buttongroup name="sxi_button_group"/>
- <buttongroup name="spmmie_button_group"/>
- <buttongroup name="scp_button_group"/>
+ <buttongroup name="pqp_button_group"/>
+ <buttongroup name="sunlw_button_group"/>
+ <buttongroup name="pstpb_button_group"/>
<buttongroup name="buttonGroup_3"/>
- <buttongroup name="oresu_button_group"/>
- <buttongroup name="refine_button_group"/>
<buttongroup name="buttonGroup_5"/>
+ <buttongroup name="sci_button_group"/>
+ <buttongroup name="rpm_button_group"/>
+ <buttongroup name="ospec_button_group"/>
+ <buttongroup name="suca_button_group"/>
+ <buttongroup name="rupmffr_button_group"/>
+ <buttongroup name="szi_button_group"/>
+ <buttongroup name="buttonGroup_4"/>
+ <buttongroup name="oresu_button_group"/>
+ <buttongroup name="buttonGroup_2"/>
+ <buttongroup name="pqa_button_group"/>
+ <buttongroup name="spmmie_button_group"/>
+ <buttongroup name="buttonGroup_6"/>
+ <buttongroup name="rss_button_group"/>
+ <buttongroup name="mzid_button_group"/>
+ <buttongroup name="scp_button_group"/>
+ <buttongroup name="syi_button_group"/>
+ <buttongroup name="rcsemi_button_group"/>
</buttongroups>
</ui>
--
GitLab