Commit 1c800f8f authored by Edlira Nano's avatar Edlira Nano
Browse files

changed getMods in isotopes + setup inno changed + added .ico

git-svn-id: https://subversion.renater.fr/masschroq/trunk@2082 e4b6dbb4-9209-464b-83f7-6257456c460c
parent 91e07cf6
...@@ -76,7 +76,7 @@ class Peptide { ...@@ -76,7 +76,7 @@ class Peptide {
return (_sequence); return (_sequence);
} }
const QString & getMods() const; virtual const QString & getMods() const;
void addProtein(const Protein * p_protein); void addProtein(const Protein * p_protein);
......
...@@ -38,6 +38,11 @@ PeptideIsotope::isObservedIn(const msRunHashGroup & group) const { ...@@ -38,6 +38,11 @@ PeptideIsotope::isObservedIn(const msRunHashGroup & group) const {
return (_p_peptide_original->isObservedIn(group)); return (_p_peptide_original->isObservedIn(group));
} }
const QString &
PeptideIsotope::getMods() const {
return (_p_peptide_original->getMods());
}
std::vector<PeptideObservedIn *> * std::vector<PeptideObservedIn *> *
PeptideIsotope::getObservedInGroup(const msRunHashGroup & group) const { PeptideIsotope::getObservedInGroup(const msRunHashGroup & group) const {
return ( _p_peptide_original->getObservedInGroup(group) ); return ( _p_peptide_original->getObservedInGroup(group) );
......
...@@ -51,6 +51,8 @@ class PeptideIsotope : public Peptide { ...@@ -51,6 +51,8 @@ class PeptideIsotope : public Peptide {
virtual bool isObservedIn(const msRunHashGroup & group) const; virtual bool isObservedIn(const msRunHashGroup & group) const;
virtual const QString & getMods() const;
virtual std::vector<PeptideObservedIn *> * virtual std::vector<PeptideObservedIn *> *
getObservedInGroup(const msRunHashGroup & group) const; getObservedInGroup(const msRunHashGroup & group) const;
......
...@@ -147,11 +147,19 @@ int main(int argc, char **argv) { ...@@ -147,11 +147,19 @@ int main(int argc, char **argv) {
<< Utilities::getMinutesFromDuration(dur) << " minutes, " << Utilities::getMinutesFromDuration(dur) << " minutes, "
<< Utilities::getSecondsFromDuration(dur) << " seconds." << Utilities::getSecondsFromDuration(dur) << " seconds."
<< endl; << endl;
int exit;
cout << "Press any key to exit" << endl;
cin >> exit;
return 0;
// delete logger; // delete logger;
} catch (mcqError error) { } catch (mcqError error) {
cerr << "Oops! an error occurred in MassChroQ. Dont Panic :" << endl; cerr << "Oops! an error occurred in MassChroQ. Dont Panic :" << endl;
cerr << error.qwhat().toStdString() << endl; cerr << error.qwhat().toStdString() << endl;
int exit;
cout << "Type any character to exit" << endl;
cin >> exit;
return 1;
} }
} }
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#define MyAppName "MassChroQ" #define MyAppName "MassChroQ"
#define MyAppVersion "1.0" #define MyAppVersion "1.0"
#define MyAppPublisher "PAPSO, INRA" #define MyAppPublisher "PAPPSO"
#define MyAppURL "http://pappso.inra.fr/bioinfo/masschroq/" #define MyAppURL "http://pappso.inra.fr/bioinfo/masschroq/"
#define MyAppExeName "masschroq.exe" #define MyAppExeName "masschroq.exe"
...@@ -34,11 +34,10 @@ SolidCompression=yes ...@@ -34,11 +34,10 @@ SolidCompression=yes
Root: HKCR; Subkey: ".masschroqML"; ValueType: string; ValueName: ""; ValueData: "masschroqMLFile "; Flags: uninsdeletevalue Root: HKCR; Subkey: ".masschroqML"; ValueType: string; ValueName: ""; ValueData: "masschroqMLFile "; Flags: uninsdeletevalue
Root: HKCR; Subkey: "masschroqMLFile"; ValueType: string; ValueName: ""; ValueData: "masschroqML File"; Flags: uninsdeletekey Root: HKCR; Subkey: "masschroqMLFile"; ValueType: string; ValueName: ""; ValueData: "masschroqML File"; Flags: uninsdeletekey
Root: HKCR; Subkey: "masschroqMLFile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\masschroq.exe,0" Root: HKCR; Subkey: "masschroqMLFile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\masschroq.exe,0"
Root: HKCR; Subkey: "masschroqMLFile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\masschroq.exe"" ""%1""" Root: HKCR; Subkey: "masschroqMLFile\shell\open\command /k"; ValueType: string; ValueName: ""; ValueData: ""{app}\{#MyAppExeName}" "%1""
[Languages] [Languages]
Name: "english"; MessagesFile: "compiler:Default.isl" Name: "english"; MessagesFile: "compiler:Default.isl"
Name: "basque"; MessagesFile: "compiler:Languages\Basque.isl"
Name: "brazilianportuguese"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl" Name: "brazilianportuguese"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
Name: "catalan"; MessagesFile: "compiler:Languages\Catalan.isl" Name: "catalan"; MessagesFile: "compiler:Languages\Catalan.isl"
Name: "czech"; MessagesFile: "compiler:Languages\Czech.isl" Name: "czech"; MessagesFile: "compiler:Languages\Czech.isl"
...@@ -81,8 +80,6 @@ Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}" ...@@ -81,8 +80,6 @@ Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: quicklaunchicon Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: quicklaunchicon
[Run]
Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, "&", "&&")}}"; Flags: nowait postinstall skipifsilent
[Code] [Code]
const const
......
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