Commit e0ee3df0 authored by Edlira Nano's avatar Edlira Nano
Browse files

changed main for win32 only + readme_windows file

git-svn-id: https://subversion.renater.fr/masschroq/trunk@2088 e4b6dbb4-9209-464b-83f7-6257456c460c
parent b1d190c8
......@@ -14,6 +14,8 @@ PROJECT(masschroq CXX C)
IF (CMAKE_BASE_NAME MATCHES "cl")
SET( WIN32 "true")
ELSE (CMAKE_BASE_NAME MATCHES "cl")
SET( WIN32 "false")
ENDIF(CMAKE_BASE_NAME MATCHES "cl")
......
......@@ -165,7 +165,7 @@ no Back-Cover Texts. A copy of the license is included in the appendix
\href{http://www.gnu.org/licenses/gpl.html}{Gnu General Public Licence
version 3}. It is developed at the
\href{\sitepappso}{PAPPSO} team (the Paris South-West Proteomics Analysis
Platform) by :
Platform) by:
\begin{description}
\item Beno\^it Valot \url{benoit.valot@moulon.inra.fr}
\item Olivier Langella \url{olivier.langella@moulon.inra.fr}
......@@ -408,11 +408,10 @@ To run masschroq on Windows :
\end{itemize}
A console command-line window appears. To run masschroq, you type in it:
\begin{verbatim}
path_to_masschroq.exe\masschroq.exe path_to_input_file\input_file.xml
masschroq path_to_input_file\input_file.masschroqML
\end{verbatim}
where \ttt{path\_to\_masschroq.exe} is your path to the masschroq
executable file \ttt{masschroq.exe} and \ttt{input\_file.exe} is the
xml input file of your analysis.
where \ttt{input\_file.masschroqML} is the
input file of your analysis.
\subsection{SVN repository}
The subversion repository located at
......
......@@ -4,7 +4,6 @@
#define MASSCHROQ_VERSION "1.0"
#define MASSCHROQ_XSD "/usr/local/share/xml/schema/masschroq.xsd"
#define MASSCHROQ_XML_VERSION "1.0"
/* #undef QT_V_4_5 */
/* #undef QT_V_4_6 */
......
......@@ -4,7 +4,6 @@
#cmakedefine MASSCHROQ_VERSION "@MASSCHROQ_VERSION@"
#cmakedefine MASSCHROQ_XSD "@MASSCHROQ_XSD@"
#cmakedefine MASSCHROQ_XML_VERSION "@MASSCHROQ_XML_VERSION@"
#cmakedefine QT_V_4_5 0x040500
#cmakedefine QT_V_4_6 0x040600
......
......@@ -13,6 +13,14 @@
using namespace std;
void
windaube_exit() {
# if (WIN32)
cout << "Press any key then enter to exit" << endl;
getchar();
#endif
}
void
display_help(ostream & out) {
out << "Usage: masschroq [OPTION] [FILE]" << endl;
......@@ -64,11 +72,13 @@ int main(int argc, char **argv) {
if ( (first == "--help") ||
(first == "-h") ) {
display_help(cout);
windaube_exit();
return 0;
}
else if ((first == "--version") ||
(first == "-v")) {
cout << "masschroq version " << MASSCHROQ_VERSION <<endl;
windaube_exit();
return 0;
} else
fileName = first;
......@@ -83,6 +93,7 @@ int main(int argc, char **argv) {
else {
cerr << "Invalid use of option " << option.toStdString() << "." << endl;
cerr << "Try 'masschroq --help' for more information." << endl;
windaube_exit();
return 1;
}
break;
......@@ -95,21 +106,22 @@ int main(int argc, char **argv) {
}
else {
cerr << "Invalid use of option " << option.toStdString() << "." << endl;
cerr << "Try 'masschroq --help' for more information." << endl;
cerr << "Try 'masschroq --help' for more information." << endl;
windaube_exit();
return 1;
}
break;
case 1 :
cout << "Type the masschroqML file name to analyse" << endl;
std::string filename;
std::getline(std::cin, filename);
fileName = filename.c_str();
//return 1;
cerr << "masschroq : missing input filename." << endl;
cerr << "Try 'masschroq --help' for more information." << endl;
windaube_exit();
return 1;
break;
// default :
// cerr << "masschroq : invalid use." << endl;
//cerr << "Try 'masschroq --help' for more information." << endl;
//return 1;
default :
cerr << "masschroq : invalid use." << endl;
cerr << "Try 'masschroq --help' for more information." << endl;
windaube_exit();
return 1;
}
......@@ -149,19 +161,15 @@ 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;
windaube_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;
windaube_exit();
return 1;
}
}
\documentclass[12pt]{article}
\usepackage[english]{babel}
\usepackage[latin1]{inputenc}
\usepackage[T1]{fontenc}
\usepackage[paper=a4paper]{geometry}
\usepackage[hks,pantone]{spotcolor}
\usepackage{color}
\usepackage{hyperref}
\hypersetup{
linktocpage,
colorlinks,
citecolor=black,
filecolor=black,
linkcolor=black,
urlcolor=blue
}
\newcommand{\M}{MassChroQ}
\newcommand{\Mv}{MassChroQ v.1.0}
\newcommand{\mexe}{\texttt{masschroq.exe}}
\newcommand{\sitemasschroq}{http://pappso.inra.fr/bioinfo/masschroq/}
\newcommand{\sitepappso}{http://pappso.inra.fr/}
\begin{document}
\title{\color{blue}\parbox[t]{\textwidth}{\centering MassChroQ
version 1.0 Readme file}}
\date{}
\maketitle
Congratulations! MassChroQ version 1.0 is now installed on your Windows
system.
Your MassChroQ's installation directory contains:
\begin{itemize}
\item the \emph{manual}, explaining MassChroQ features and use.
\item the \emph{masschroq\_examples} directory, containing various
ready-to-use examples. MassChroQ input files are xml
files with the \emph{.masschroqML} extension.
\item the MassChroQ's command-line executable called \emph{masschroq.exe}.
\end{itemize}
You can run MassChroQ in two ways:
\begin{itemize}
\item by double-clicking on your \emph{.masschroqML} file. The first time
you will do this you may have to explicitly tell your Windows system to
open this file with MassChroQ. For this, right-click on your
masschroqML file, choose "Open with" and then choose MassChroQ.
\item for a more advanced use of MassChroQ (with options)
open a command-prompt:
\begin{itemize}
\item click on $start \rightarrow Run$;
\item type \texttt{cmd} on the Run window that appeared, and then press
\texttt{OK}.
\end{itemize}
A console command-line window appears. To run masschroq, you type in it:
\begin{verbatim}
masschroq path_to_input_file\input_file.masschroqML
\end{verbatim}
where \texttt{input\_file.masschroqML} is the
input file of your analysis and \\
\texttt{path\_to\_input\_file} is the
path to the directory where your input file is located
(e.g. \verb!C:\Documents\analysis!). You can also
use the \emph{cd} command to place yourself directly in this
directory by typing: \verb!cd C:\Documents\analysis!
in the command line. You can then launch masschroq directly on your
input file by typing: \verb!masschroq input_file.masschroqML!
\end{itemize}
MassChroQ is an open-source software released under the
\href{http://www.gnu.org/licenses/gpl.html}{Gnu General Public Licence
version 3}. It is developed at the
\href{\sitepappso}{PAPPSO} (Paris South-West Proteomics Analysis
Platform) team by:
\begin{description}
\item Beno\^it Valot \url{benoit.valot@moulon.inra.fr}
\item Olivier Langella \url{olivier.langella@moulon.inra.fr}
\item Edlira Nano \url{edlira.nano@moulon.inra.fr}
\item Michel Zivy \url{michel.zivy@moulon.inra.fr}
\end{description}
Linux versions of MassChroQ (including packages for Debian and Ubuntu
32 and 64 bits) are of course available, so do not hesitate to install Linux
on your system (it's very user-friendly nowadays) because of
MassChroQ :)
On the {\M} homepage at \\
\url{\sitemasschroq}\\
you can find documentation, example files and
the latest news about this project.
On the {\M} development page hosted by SourceSup at\\
\url{http://sourcesup.cru.fr/projects/masschroq/}\\
you will find a subversion repository, a bug tracker and various forums.
The source code is anonymously available via direct access to the
subversion repository from \url{https://subversion.cru.fr/masschroq/}.
Feel free and very welcomed to contribute to the {\M} project by
directly contacting one of its authors.
\end{document}
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