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

git-svn-id: https://subversion.renater.fr/masschroq/trunk@2082 e4b6dbb4-9209-464b-83f7-6257456c460c

masschroq/src/lib/peptides/peptide.h

@@ -76,7 +76,7 @@ class Peptide {
     return (_sequence);
   }
 
-  const QString & getMods() const;
+  virtual const QString & getMods() const;
   
   void addProtein(const Protein * p_protein);
   

masschroq/src/lib/peptides/peptide_isotope.cpp

@@ -38,6 +38,11 @@ PeptideIsotope::isObservedIn(const msRunHashGroup & group) const {
   return (_p_peptide_original->isObservedIn(group));
 }
 
+const QString &  
+PeptideIsotope::getMods() const {
+  return (_p_peptide_original->getMods());
+}
+
 std::vector<PeptideObservedIn *> *
 PeptideIsotope::getObservedInGroup(const msRunHashGroup & group) const {
   return ( _p_peptide_original->getObservedInGroup(group) );

masschroq/src/lib/peptides/peptide_isotope.h

@@ -51,6 +51,8 @@ class PeptideIsotope : public Peptide {
   
   virtual bool isObservedIn(const msRunHashGroup & group) const;
   
+  virtual const QString & getMods() const;
+  
   virtual std::vector<PeptideObservedIn *> *
     getObservedInGroup(const msRunHashGroup & group) const;
   

masschroq/src/main.cpp

@@ -147,11 +147,19 @@ int main(int argc, char **argv) {
 	 << Utilities::getMinutesFromDuration(dur) << " minutes, "
 	 << Utilities::getSecondsFromDuration(dur) << " seconds."
 	 << endl;
-      
+    
+    int exit;
+    cout << "Press any key to exit" << endl;
+    cin >> exit;
+    return 0;
+
     //    delete logger;
   } catch (mcqError error) {
     cerr << "Oops! an error occurred in MassChroQ. Dont Panic :" << endl;
     cerr << error.qwhat().toStdString() << endl;
+    int exit;
+    cout << "Type any character to exit" << endl;
+    cin >> exit;
+    return 1;
   }
-	
 }

masschroq/win32/masschroq_setup2.iss

@@ -3,7 +3,7 @@
 
 #define MyAppName "MassChroQ"
 #define MyAppVersion "1.0"
-#define MyAppPublisher "PAPSO, INRA"
+#define MyAppPublisher "PAPPSO"
 #define MyAppURL "http://pappso.inra.fr/bioinfo/masschroq/"
 #define MyAppExeName "masschroq.exe"
 
@@ -34,11 +34,10 @@ SolidCompression=yes
 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\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]
 Name: "english"; MessagesFile: "compiler:Default.isl"
-Name: "basque"; MessagesFile: "compiler:Languages\Basque.isl"
 Name: "brazilianportuguese"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
 Name: "catalan"; MessagesFile: "compiler:Languages\Catalan.isl"
 Name: "czech"; MessagesFile: "compiler:Languages\Czech.isl"
@@ -81,8 +80,6 @@ Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
 Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
 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]
 const