Commit 88b46558 authored by Olivier Langella's avatar Olivier Langella
Browse files

clear compar table after quantification

parent a2c22c28
......@@ -110,6 +110,10 @@ void MonitorComparInterfaceOutput::writeQuantifyEnd() {
}
}
}
_compar_table.clear();
_msrun_list.clear();
_qitem_list.clear();
qDebug() << "MonitorComparInterfaceOutput::writeQuantifyEnd end";
}
......
......@@ -131,7 +131,7 @@ void QuantiItemPeptide::writeOdsComparHeaderLine(CalcWriterInterface & writer) c
writer.writeEmptyCell();
writer.writeEmptyCell();
//_p_writer->writeCell("sequence");
writer.writeCell(_p_peptide->getPappsoPeptideSp().get()->getSequence());
writer.writeCell(_p_peptide->getPappsoPeptideSp().get()->toString());
//_p_writer->writeCell("mods");
writer.writeCell(_p_peptide->getMods());
//_p_writer->writeCell("proteins");
......
......@@ -89,7 +89,7 @@ void QuantiItemPeptideNaturalIsotope::writeOdsComparHeaderLine(CalcWriterInterfa
writer.writeCell(_peptide_natural_isotope_average_sp.get()->getIsotopeRank());
writer.writeCell(_peptide_natural_isotope_average_sp.get()->getIntensityRatio());
//_p_writer->writeCell("sequence");
writer.writeCell(_p_peptide->getPappsoPeptideSp().get()->getSequence());
writer.writeCell(_p_peptide->getPappsoPeptideSp().get()->toString());
//_p_writer->writeCell("mods");
writer.writeCell(_p_peptide->getMods());
//_p_writer->writeCell("proteins");
......
......@@ -45,6 +45,7 @@
<xs:element name="detection_moulon" type="detection_moulonType"/>
<xs:element name="quantification_results" type="quantification_resultsType"/>
<xs:element name="quantification_result" type="quantification_resultType"/>
<xs:element name="compar_result" type="compar_resultType"/>
<xs:element name="quantification_traces" type="quantification_tracesType"/>
<xs:element name="all_xics_traces" type="all_xics_tracesType"/>
<xs:element name="peptide_traces" type="peptide_tracesType"/>
......@@ -861,6 +862,8 @@
<xs:sequence>
<xs:element ref="quantification_result"
maxOccurs="unbounded" minOccurs="1"/>
<xs:element ref="compar_result"
maxOccurs="unbounded" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
......@@ -878,14 +881,9 @@
<xs:annotation>
<xs:documentation>
Format of the output results among :
- gnumeric : two spreadsheets will be created in the output file :
one that contains the quantification data for each peptide, and one
that contains for each peptide the list of proteins it belongs to.
- xhtmltable : two files with the '_pep' and '_prot' endings will
be created containing respectively the quantification data and the
list of proteins.
- tsv : (tabulation separated values) as above two files will be
created.
- ods : Open Document Spreadsheet output file.
- tsv : (tabulation separated values) as above files will be
created in a subdirectory.
- masschroqml : masschroqML xml format. This result file will contain the
input XML file completed with the 'results' xml tag which
contains the quantification data.
......@@ -912,6 +910,36 @@
</xs:restriction>
</xs:simpleType>
<xs:complexType name="compar_resultType">
<xs:annotation>
<xs:documentation>
Specify the format and the output file for this quantification compar result.
</xs:documentation>
</xs:annotation>
<xs:attribute
name="output_file" type="xs:string" use="required">
</xs:attribute>
<xs:attribute
name="format" use="required" type="formatComparType">
<xs:annotation>
<xs:documentation>
Format of the output results among :
- ods : Open Document Spreadsheet output file.
- tsv : (tabulation separated values) as above files will be
created in a subdirectory.
</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:complexType>
<xs:simpleType name="formatComparType">
<xs:restriction base="xs:string">
<xs:enumeration value="ods"></xs:enumeration>
<xs:enumeration value="tsv"></xs:enumeration>
</xs:restriction>
</xs:simpleType>
<xs:complexType name="quantification_tracesType">
<xs:annotation>
<xs:documentation>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment