diff --git a/CycloBranch/CycloBranch.desktop b/CycloBranch/CycloBranch.desktop
new file mode 100644
index 0000000..c2b747b
--- /dev/null
+++ b/CycloBranch/CycloBranch.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Comment=A tool for de novo sequencing of nonribosomal peptides from accurate product ion mass spectra.
+Exec=CycloBranch
+Icon=/usr/share/cyclobranch/images/cb.png
+Name=CycloBranch
+NoDisplay=false
+StartupNotify=false
+Terminal=false
+Type=Application
diff --git a/CycloBranch/CycloBranch.pro b/CycloBranch/CycloBranch.pro
new file mode 100644
index 0000000..6791882
--- /dev/null
+++ b/CycloBranch/CycloBranch.pro
@@ -0,0 +1,87 @@
+######################################################################
+# Automatically generated by qmake (3.0) Fri Dec 5 03:02:26 2014
+######################################################################
+
+TEMPLATE = app
+TARGET = CycloBranch
+QT += core gui widgets printsupport svg
+INCLUDEPATH += . core gui parallel
+QMAKE_CXXFLAGS += -std=c++0x -DUNIX -m64
+QMAKE_LIBS += -lboost_regex
+OBJECTS_DIR = build/
+MOC_DIR = moc/
+
+# Input
+RESOURCES = images.qrc
+HEADERS += core/cAllocator.h \
+ core/cBrick.h \
+ core/cBricksDatabase.h \
+ core/cCandidate.h \
+ core/cCandidateSet.h \
+ core/cDeNovoGraph.h \
+ core/cDeNovoGraphNode.h \
+ core/cFragmentIons.h \
+ core/cParameters.h \
+ core/cPeak.h \
+ core/cPeaksList.h \
+ core/cSequence.h \
+ core/cSequenceDatabase.h \
+ core/cSummaryFormula.h \
+ core/cTheoreticalSpectrum.h \
+ core/cTheoreticalSpectrumList.h \
+ core/utilities.h \
+ gui/cAboutWidget.h \
+ gui/cBranchedWidget.h \
+ gui/cBricksDatabaseWidget.h \
+ gui/cCyclicWidget.h \
+ gui/cDrawPeptideWidget.h \
+ gui/cEventFilter.h \
+ gui/cFragmentIonsListWidget.h \
+ gui/cGraphWidget.h \
+ gui/cLassoWidget.h \
+ gui/cLinearWidget.h \
+ gui/cMainThread.h \
+ gui/cMainWindow.h \
+ gui/cModificationsWidget.h \
+ gui/cParametersWidget.h \
+ gui/cSequenceDatabaseWidget.h \
+ gui/cSpectrumDetailWidget.h \
+ gui/cSpectrumSceneWidget.h \
+ parallel/cGraphReaderThread.h \
+ parallel/cSpectrumComparatorThread.h
+SOURCES += core/cBrick.cpp \
+ core/cBricksDatabase.cpp \
+ core/cCandidate.cpp \
+ core/cCandidateSet.cpp \
+ core/cDeNovoGraph.cpp \
+ core/cDeNovoGraphNode.cpp \
+ core/cFragmentIons.cpp \
+ core/cParameters.cpp \
+ core/cPeak.cpp \
+ core/cPeaksList.cpp \
+ core/cSequence.cpp \
+ core/cSequenceDatabase.cpp \
+ core/cSummaryFormula.cpp \
+ core/cTheoreticalSpectrum.cpp \
+ core/cTheoreticalSpectrumList.cpp \
+ core/utilities.cpp \
+ gui/cAboutWidget.cpp \
+ gui/cBranchedWidget.cpp \
+ gui/cBricksDatabaseWidget.cpp \
+ gui/cCyclicWidget.cpp \
+ gui/cDrawPeptideWidget.cpp \
+ gui/cEventFilter.cpp \
+ gui/cFragmentIonsListWidget.cpp \
+ gui/cGraphWidget.cpp \
+ gui/cLassoWidget.cpp \
+ gui/cLinearWidget.cpp \
+ gui/cMainThread.cpp \
+ gui/cMainWindow.cpp \
+ gui/cModificationsWidget.cpp \
+ gui/cParametersWidget.cpp \
+ gui/cSequenceDatabaseWidget.cpp \
+ gui/cSpectrumDetailWidget.cpp \
+ gui/cSpectrumSceneWidget.cpp \
+ parallel/cGraphReaderThread.cpp \
+ parallel/cSpectrumComparatorThread.cpp \
+ main.cpp
diff --git a/CycloBranch/CycloBranch.vcxproj b/CycloBranch/CycloBranch.vcxproj
index 23c88a4..12d8bf3 100644
--- a/CycloBranch/CycloBranch.vcxproj
+++ b/CycloBranch/CycloBranch.vcxproj
@@ -74,8 +74,8 @@
- UNICODE;WIN32;WIN64;QT_DLL;QT_CORE_LIB;QT_GUI_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions)
- .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtWidgets;%(AdditionalIncludeDirectories)
+ UNICODE;WIN32;WIN64;QT_DLL;QT_CORE_LIB;QT_GUI_LIB;QT_WIDGETS_LIB;QT_PRINTSUPPORT_LIB;QT_SVG_LIB;%(PreprocessorDefinitions)
+ .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtPrintSupport;$(QTDIR)\include\QtSvg;%(AdditionalIncludeDirectories)
Disabled
ProgramDatabase
MultiThreadedDebugDLL
@@ -86,13 +86,13 @@
$(OutDir)\$(ProjectName).exe
$(QTDIR)\lib;%(AdditionalLibraryDirectories)
true
- qtmaind.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;%(AdditionalDependencies)
+ qtmaind.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5PrintSupportd.lib;Qt5Svgd.lib;%(AdditionalDependencies)
- UNICODE;WIN32;WIN64;QT_DLL;QT_CORE_LIB;QT_GUI_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions)
- .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtWidgets;%(AdditionalIncludeDirectories)
+ UNICODE;WIN32;WIN64;QT_DLL;QT_CORE_LIB;QT_GUI_LIB;QT_WIDGETS_LIB;QT_PRINTSUPPORT_LIB;QT_SVG_LIB;%(PreprocessorDefinitions)
+ .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtPrintSupport;$(QTDIR)\include\QtSvg;%(AdditionalIncludeDirectories)
Disabled
ProgramDatabase
MultiThreadedDebugDLL
@@ -103,13 +103,13 @@
$(OutDir)\$(ProjectName).exe
$(QTDIR)\lib;%(AdditionalLibraryDirectories)
true
- qtmaind.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;%(AdditionalDependencies)
+ qtmaind.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5PrintSupportd.lib;Qt5Svgd.lib;%(AdditionalDependencies)
- UNICODE;WIN32;WIN64;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions)
- .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtWidgets;%(AdditionalIncludeDirectories)
+ UNICODE;WIN32;WIN64;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_WIDGETS_LIB;QT_PRINTSUPPORT_LIB;QT_SVG_LIB;%(PreprocessorDefinitions)
+ .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtPrintSupport;$(QTDIR)\include\QtSvg;%(AdditionalIncludeDirectories)
MultiThreadedDLL
false
@@ -119,13 +119,13 @@
$(OutDir)\$(ProjectName).exe
$(QTDIR)\lib;%(AdditionalLibraryDirectories)
false
- qtmain.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;%(AdditionalDependencies)
+ qtmain.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5PrintSupport.lib;Qt5Svg.lib;%(AdditionalDependencies)
- UNICODE;WIN32;WIN64;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions)
- .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtWidgets;%(AdditionalIncludeDirectories)
+ UNICODE;WIN32;WIN64;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_WIDGETS_LIB;QT_PRINTSUPPORT_LIB;QT_SVG_LIB;%(PreprocessorDefinitions)
+ .;.\GeneratedFiles;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtSvg;$(QTDIR)\include\QtPrintSupport;C:\boost_1_57_0\;C:\boost_1_57_0\boost;%(AdditionalIncludeDirectories)
ProgramDatabase
MultiThreadedDLL
true
@@ -138,9 +138,9 @@
Windows
$(OutDir)\$(ProjectName).exe
- $(QTDIR)\lib;%(AdditionalLibraryDirectories)
+ $(QTDIR)\lib;C:\boost_1_57_0\lib64-msvc-11.0;%(AdditionalLibraryDirectories)
true
- qtmain.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;%(AdditionalDependencies)
+ qtmain.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Svgd.lib;Qt5PrintSupport.lib;libboost_regex-vc110-mt-1_57.lib;%(AdditionalDependencies)
true
true
UseLinkTimeCodeGeneration
@@ -179,11 +179,15 @@
true
true
-
+
true
true
-
+
+ true
+ true
+
+
true
true
@@ -211,6 +215,10 @@
true
true
+
+ true
+ true
+
true
true
@@ -227,6 +235,20 @@
true
true
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
true
true
@@ -243,11 +265,15 @@
true
true
-
+
+ true
+ true
+
+
true
true
-
+
true
true
@@ -275,6 +301,10 @@
true
true
+
+ true
+ true
+
true
true
@@ -291,25 +321,33 @@
true
true
+
+ true
+ true
+
+
+
-
+
+
+
@@ -324,204 +362,283 @@
-
+
+ $(QTDIR)\bin\moc.exe;%(FullPath)
+ Moc%27ing cSpectrumSceneWidget.h...
+ .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
+ $(QTDIR)\bin\moc.exe;%(FullPath)
+ Moc%27ing cSpectrumSceneWidget.h...
+ .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
+ $(QTDIR)\bin\moc.exe;%(FullPath)
+ Moc%27ing cSpectrumSceneWidget.h...
+ .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
+ $(QTDIR)\bin\moc.exe;%(FullPath)
+ Moc%27ing cSpectrumSceneWidget.h...
+ .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-IC:\boost_1_57_0" "-IC:\boost_1_57_0\boost" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
+
+
+ $(QTDIR)\bin\moc.exe;%(FullPath)
+ Moc%27ing cEventFilter.h...
+ .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
+ $(QTDIR)\bin\moc.exe;%(FullPath)
+ Moc%27ing cEventFilter.h...
+ .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
+ $(QTDIR)\bin\moc.exe;%(FullPath)
+ Moc%27ing cEventFilter.h...
+ .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
+ $(QTDIR)\bin\moc.exe;%(FullPath)
+ Moc%27ing cEventFilter.h...
+ .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-IC:\boost_1_57_0" "-IC:\boost_1_57_0\boost" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(QTDIR)\bin\moc.exe;%(FullPath)
+ Moc%27ing cDrawPeptideWidget.h...
+ .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
+ $(QTDIR)\bin\moc.exe;%(FullPath)
+ Moc%27ing cDrawPeptideWidget.h...
+ .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
+ $(QTDIR)\bin\moc.exe;%(FullPath)
+ Moc%27ing cDrawPeptideWidget.h...
+ .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
+ $(QTDIR)\bin\moc.exe;%(FullPath)
+ Moc%27ing cDrawPeptideWidget.h...
+ .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-IC:\boost_1_57_0" "-IC:\boost_1_57_0\boost" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
+
+
+ $(QTDIR)\bin\moc.exe;%(FullPath)
+ Moc%27ing cModificationsWidget.h...
+ .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
+ $(QTDIR)\bin\moc.exe;%(FullPath)
+ Moc%27ing cModificationsWidget.h...
+ .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
+ $(QTDIR)\bin\moc.exe;%(FullPath)
+ Moc%27ing cModificationsWidget.h...
+ .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
+ $(QTDIR)\bin\moc.exe;%(FullPath)
+ Moc%27ing cModificationsWidget.h...
+ .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-IC:\boost_1_57_0" "-IC:\boost_1_57_0\boost" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
+
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cSequenceDatabaseWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cSequenceDatabaseWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cSequenceDatabaseWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cSequenceDatabaseWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-IC:\boost_1_57_0" "-IC:\boost_1_57_0\boost" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cBricksDatabaseWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cBricksDatabaseWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cBricksDatabaseWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cBricksDatabaseWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-IC:\boost_1_57_0" "-IC:\boost_1_57_0\boost" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cLassoWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cLassoWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cLassoWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cLassoWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-IC:\boost_1_57_0" "-IC:\boost_1_57_0\boost" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cLinearWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cLinearWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cLinearWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cLinearWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-IC:\boost_1_57_0" "-IC:\boost_1_57_0\boost" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cCyclicWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cCyclicWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cCyclicWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cCyclicWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-IC:\boost_1_57_0" "-IC:\boost_1_57_0\boost" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cBranchedWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cBranchedWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cBranchedWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cBranchedWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-IC:\boost_1_57_0" "-IC:\boost_1_57_0\boost" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cFragmentIonsListWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cFragmentIonsListWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cFragmentIonsListWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cFragmentIonsListWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-IC:\boost_1_57_0" "-IC:\boost_1_57_0\boost" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cGraphReaderThread.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cGraphReaderThread.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cGraphReaderThread.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cGraphReaderThread.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-IC:\boost_1_57_0" "-IC:\boost_1_57_0\boost" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
Moc%27ing cSpectrumComparatorThread.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
Moc%27ing cSpectrumComparatorThread.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
Moc%27ing cSpectrumComparatorThread.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
Moc%27ing cSpectrumComparatorThread.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
- $(QTDIR)\bin\moc.exe;%(FullPath)
- $(QTDIR)\bin\moc.exe;%(FullPath)
- $(QTDIR)\bin\moc.exe;%(FullPath)
- $(QTDIR)\bin\moc.exe;%(FullPath)
-
-
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-IC:\boost_1_57_0" "-IC:\boost_1_57_0\boost" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
- Moc%27ing cGraphicalSpectrumWidget.h...
- .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
$(QTDIR)\bin\moc.exe;%(FullPath)
- Moc%27ing cGraphicalSpectrumWidget.h...
- .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
$(QTDIR)\bin\moc.exe;%(FullPath)
- Moc%27ing cGraphicalSpectrumWidget.h...
- .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
$(QTDIR)\bin\moc.exe;%(FullPath)
- Moc%27ing cGraphicalSpectrumWidget.h...
- .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cSpectrumDetailWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cSpectrumDetailWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cSpectrumDetailWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cSpectrumDetailWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-IC:\boost_1_57_0" "-IC:\boost_1_57_0\boost" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
@@ -553,93 +670,116 @@
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cMainWindow.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cMainWindow.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cMainWindow.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cMainWindow.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-IC:\boost_1_57_0" "-IC:\boost_1_57_0\boost" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cMainThread.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cMainThread.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cMainThread.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cMainThread.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-IC:\boost_1_57_0" "-IC:\boost_1_57_0\boost" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cParametersWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cParametersWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cParametersWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cParametersWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-IC:\boost_1_57_0" "-IC:\boost_1_57_0\boost" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cGraphWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cGraphWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cGraphWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cGraphWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-IC:\boost_1_57_0" "-IC:\boost_1_57_0\boost" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cAboutWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cAboutWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cAboutWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing cAboutWidget.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-IC:\boost_1_57_0" "-IC:\boost_1_57_0\boost" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSvg"
+
+
+
+
+ %(FullPath);%(AdditionalInputs)
+ Rcc%27ing %(Identity)...
+ .\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs)
+ "$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp
+ %(FullPath);%(AdditionalInputs)
+ Rcc%27ing %(Identity)...
+ .\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs)
+ "$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp
+ %(FullPath);%(AdditionalInputs)
+ Rcc%27ing %(Identity)...
+ .\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs)
+ "$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp
+ %(FullPath);%(AdditionalInputs)
+ Rcc%27ing %(Identity)...
+ .\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs)
+ "$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp
+
+
+
diff --git a/CycloBranch/CycloBranch.vcxproj.filters b/CycloBranch/CycloBranch.vcxproj.filters
index a06dc21..f42329c 100644
--- a/CycloBranch/CycloBranch.vcxproj.filters
+++ b/CycloBranch/CycloBranch.vcxproj.filters
@@ -42,6 +42,9 @@
{ede1a4b0-ffbc-4a56-8e82-02552392966b}
+
+ {3300b581-e947-48ef-9c11-63b4118630d6}
+
@@ -134,15 +137,6 @@
Generated Files\Release
-
- Generated Files\Debug
-
-
- Generated Files\Release
-
-
- Source Files\gui
-
Source Files\core
@@ -239,6 +233,45 @@
Generated Files\Release
+
+ Generated Files\Debug
+
+
+ Generated Files\Release
+
+
+ Source Files\gui
+
+
+ Source Files\gui
+
+
+ Generated Files\Debug
+
+
+ Generated Files\Release
+
+
+ Generated Files
+
+
+ Generated Files\Debug
+
+
+ Generated Files\Release
+
+
+ Source Files\gui
+
+
+ Source Files\gui
+
+
+ Generated Files\Debug
+
+
+ Generated Files\Release
+
@@ -262,9 +295,6 @@
Header Files\gui
-
- Header Files\gui
-
Header Files\parallel
@@ -292,6 +322,24 @@
Header Files\gui
+
+ Header Files\gui
+
+
+ Header Files\gui
+
+
+ Resources
+
+
+ Header Files\core
+
+
+ Header Files\gui
+
+
+ Header Files\gui
+
@@ -336,8 +384,13 @@
Header Files\core
-
+
Header Files\core
+
+
+ Resources
+
+
\ No newline at end of file
diff --git a/CycloBranch/CycloBranch.vcxproj.user b/CycloBranch/CycloBranch.vcxproj.user
index dfe0f79..b65447a 100644
--- a/CycloBranch/CycloBranch.vcxproj.user
+++ b/CycloBranch/CycloBranch.vcxproj.user
@@ -9,14 +9,14 @@
C:\Qt\5.1.1\msvc2012_64\
- C:\Qt\5.1.1\msvc2012_64
+ C:\Qt\Qt5.2.1\5.2.1\msvc2012_64
PATH=$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(PATH)
WindowsLocalDebugger
- C:\Qt\5.1.1\msvc2012_64
+ C:\Qt\Qt5.2.1\5.2.1\msvc2012_64
PATH=$(QTDIR)\bin%3b%PATH%%3b"$(PATH)
WindowsLocalDebugger
diff --git a/CycloBranch/core/cAllocator.h b/CycloBranch/core/cAllocator.h
new file mode 100644
index 0000000..5fee5b3
--- /dev/null
+++ b/CycloBranch/core/cAllocator.h
@@ -0,0 +1,111 @@
+/**
+ \file cAllocator.h
+ \brief An allocator of objects.
+*/
+
+
+#ifndef _CALLOCATOR_H
+#define _CALLOCATOR_H
+
+#include
+
+using namespace std;
+
+
+/**
+ \brief An allocator of objects.
+*/
+template
+class cAllocator
+{
+
+ vector strips;
+ int itemsperstrip;
+
+ int currentfreestrip;
+ int currentfreeitem;
+
+public:
+
+
+ /**
+ \brief The constructor.
+ */
+ cAllocator();
+
+
+ /**
+ \brief The destructor.
+ */
+ ~cAllocator();
+
+
+ /**
+ \brief Remove all allocated items.
+ */
+ void reset();
+
+
+ /**
+ \brief Get a reference to a new item.
+ \retval reference to a new item
+ */
+ T* getNewItem();
+
+};
+
+
+template
+cAllocator::cAllocator() {
+ strips.clear();
+ itemsperstrip = 500;
+ currentfreestrip = 0;
+ currentfreeitem = 0;
+
+ T* newstrip = new T[itemsperstrip];
+ strips.push_back(newstrip);
+}
+
+
+template
+cAllocator::~cAllocator() {
+ for (int i = 0; i < (int)strips.size(); i++) {
+ delete [] strips[i];
+ }
+}
+
+
+template
+void cAllocator::reset() {
+ for (int i = 0; i < (int)strips.size(); i++) {
+ delete [] strips[i];
+ }
+
+ strips.clear();
+ itemsperstrip = 500;
+ currentfreestrip = 0;
+ currentfreeitem = 0;
+
+ T* newstrip = new T[itemsperstrip];
+ strips.push_back(newstrip);
+}
+
+
+template
+T* cAllocator::getNewItem() {
+ T* freeitem = &strips[currentfreestrip][currentfreeitem];
+
+ currentfreeitem++;
+ if (currentfreeitem == itemsperstrip) {
+ currentfreestrip++;
+ currentfreeitem = 0;
+ T* newstrip = new T[itemsperstrip];
+ strips.push_back(newstrip);
+ }
+
+ return freeitem;
+}
+
+
+#endif
+
diff --git a/CycloBranch/core/cBrick.cpp b/CycloBranch/core/cBrick.cpp
index 4b6c764..3737504 100644
--- a/CycloBranch/core/cBrick.cpp
+++ b/CycloBranch/core/cBrick.cpp
@@ -1,7 +1,7 @@
#include "core/cBrick.h"
-int getNumberOfBricks(string& composition) {
+int getNumberOfBricks(const string& composition) {
if (composition.size() == 0) {
return 0;
}
@@ -64,7 +64,7 @@ string& cBrick::getName() {
}
-void cBrick::setName(string& name) {
+void cBrick::setName(const string& name) {
this->name = name;
}
@@ -103,7 +103,7 @@ string cBrick::getReverseComposition() {
}
-double cBrick::getMass() {
+double cBrick::getMass() const {
return mass;
}
@@ -113,7 +113,7 @@ void cBrick::setMass(double mass) {
}
-void cBrick::setComposition(string& composition, bool normalize) {
+void cBrick::setComposition(const string& composition, bool normalize) {
this->composition = composition;
if (normalize) {
normalizeComposition();
@@ -121,12 +121,12 @@ void cBrick::setComposition(string& composition, bool normalize) {
}
-void cBrick::setSummary(string& summary) {
+void cBrick::setSummary(const string& summary) {
this->summary = summary;
}
-void cBrick::setAcronyms(string& acronyms) {
+void cBrick::setAcronyms(const string& acronyms) {
this->acronyms.clear();
string s = "";
int i = 0;
@@ -148,7 +148,7 @@ void cBrick::setAcronyms(string& acronyms) {
}
-void cBrick::setReferences(string& references) {
+void cBrick::setReferences(const string& references) {
this->references.clear();
string s = "";
int i = 0;
@@ -194,7 +194,7 @@ void cBrick::explodeToIntComposition(vector& bricks) {
int item;
int first = 0;
int last = (int)composition.find('-');
- while (last != string::npos) {
+ while (last != (int)string::npos) {
item = atoi(composition.substr(first, last - first).c_str());
bricks.push_back(item);
first = last+1;
@@ -214,7 +214,7 @@ void cBrick::explodeToStringComposition(vector& bricks) {
string item;
int first = 0;
int last = (int)composition.find('-');
- while (last != string::npos) {
+ while (last != (int)string::npos) {
item = composition.substr(first, last - first);
bricks.push_back(item);
first = last+1;
@@ -259,7 +259,7 @@ string cBrick::getFirstAcronymAsString() {
string cBrick::getAcronymsWithReferencesAsHTMLString() {
if (acronyms.size() != references.size()) {
- return "";
+ return getAcronymsAsString();
}
string s = "";
@@ -339,8 +339,7 @@ string cBrick::getAcronymsWithReferencesAsHTMLString() {
}
}
- catch (std::regex_error& e) {
- e;
+ catch (regex_error& /*e*/) {
// nothing to do
}
diff --git a/CycloBranch/core/cBrick.h b/CycloBranch/core/cBrick.h
index fcbfd9d..5a717be 100644
--- a/CycloBranch/core/cBrick.h
+++ b/CycloBranch/core/cBrick.h
@@ -12,7 +12,6 @@
#include
#include
#include
-#include
#include "core/utilities.h"
using namespace std;
@@ -23,7 +22,7 @@ using namespace std;
\param composition string containing ids of bricks separated by '-'
\retval number number of bricks
*/
-int getNumberOfBricks(string& composition);
+int getNumberOfBricks(const string& composition);
/**
@@ -78,7 +77,7 @@ class cBrick {
\brief Set a full name of the brick.
\param name reference to a string
*/
- void setName(string& name);
+ void setName(const string& name);
/**
@@ -120,7 +119,7 @@ class cBrick {
\brief Get the mass of the brick.
\retval double mass
*/
- double getMass();
+ double getMass() const;
/**
@@ -135,28 +134,28 @@ class cBrick {
\param composition reference to a string with composition (ids of bricks separated by '-')
\param normalize if true then ids of bricks are sorted in ascending order
*/
- void setComposition(string& composition, bool normalize);
+ void setComposition(const string& composition, bool normalize);
/**
\brief Set the summary molecular formula of the brick.
\param summary reference to a string
*/
- void setSummary(string& summary);
+ void setSummary(const string& summary);
/**
\brief Set acronyms of all izomers corresponding to the brick.
\param acronyms reference to a string where the acronyms are separated by '/'
*/
- void setAcronyms(string& acronyms);
+ void setAcronyms(const string& acronyms);
/**
\brief Set references (e.g., to ChemSpider) of all izomers corresponding to the brick.
\param references reference to a string where references to izomers are separated by '/'
*/
- void setReferences(string& references);
+ void setReferences(const string& references);
/**
diff --git a/CycloBranch/core/cBricksDatabase.cpp b/CycloBranch/core/cBricksDatabase.cpp
index 6702b0d..810fde9 100644
--- a/CycloBranch/core/cBricksDatabase.cpp
+++ b/CycloBranch/core/cBricksDatabase.cpp
@@ -4,7 +4,7 @@
#include "gui/cMainThread.h"
-bool compareBrickMasses(cBrick& a, cBrick& b) {
+bool compareBrickMasses(const cBrick& a, const cBrick& b) {
return (a.getMass() < b.getMass());
}
@@ -109,7 +109,7 @@ cBricksDatabase::cBricksDatabase() {
}
-int cBricksDatabase::loadFromPlainTextStream(ifstream &stream, string& errormessage) {
+int cBricksDatabase::loadFromPlainTextStream(ifstream &stream, string& errormessage, bool ignoreerrors) {
string s;
cBrick b;
size_t pos;
@@ -178,10 +178,15 @@ int cBricksDatabase::loadFromPlainTextStream(ifstream &stream, string& errormess
}
// load references
+ #if OS_TYPE == UNX
+ if ((s.size() > 0) && (s.back() == '\r')) {
+ s = s.substr(0, s.size() - 1);
+ }
+ #endif
b.setReferences(s);
// store brick
- if (!b.empty()) {
+ if (ignoreerrors || (!ignoreerrors && !b.empty())) {
// calculate mass from the summary
formula.clear();
@@ -190,11 +195,13 @@ int cBricksDatabase::loadFromPlainTextStream(ifstream &stream, string& errormess
b.setMass(formula.getMass());
}
else {
- error = true;
- break;
+ if (!ignoreerrors) {
+ error = true;
+ break;
+ }
}
- if (b.getMass() == 0) {
+ if (!ignoreerrors && (b.getMass() == 0)) {
error = true;
errormessage = "Invalid brick no. " + to_string(size() + 1) + ".\n\n";
break;
@@ -204,7 +211,7 @@ int cBricksDatabase::loadFromPlainTextStream(ifstream &stream, string& errormess
}
}
- if (error) {
+ if (!ignoreerrors && error) {
return -1;
}
@@ -213,7 +220,7 @@ int cBricksDatabase::loadFromPlainTextStream(ifstream &stream, string& errormess
void cBricksDatabase::storeToPlainTextStream(ofstream &stream) {
- for (int i = 0; i < bricks.size(); i++) {
+ for (int i = 0; i < (int)bricks.size(); i++) {
stream << bricks[i].getName() << "\t";
stream << bricks[i].getAcronymsAsString() << "\t";
stream << bricks[i].getSummary() << "\t";
@@ -322,7 +329,7 @@ string cBricksDatabase::getTagName(string& composition) {
}
-string cBricksDatabase::getAcronymNameOfTPeptide(string& tcomposition, bool useHTMLReferences) {
+string cBricksDatabase::getAcronymNameOfTPeptide(const string& tcomposition, bool useHTMLReferences) {
string comp = tcomposition;
int leftbracket = getNumberOfBricks(comp.substr(0, comp.find('(')));
diff --git a/CycloBranch/core/cBricksDatabase.h b/CycloBranch/core/cBricksDatabase.h
index a9fd148..c2a50de 100644
--- a/CycloBranch/core/cBricksDatabase.h
+++ b/CycloBranch/core/cBricksDatabase.h
@@ -14,7 +14,7 @@
#include
#include
-
+#include "core/utilities.h"
#include "core/cBrick.h"
#include "core/cSummaryFormula.h"
@@ -31,7 +31,7 @@ class cMainThread;
\param b second brick
\retval bool true if the mass of \a a is less than the mass of \a b
*/
-bool compareBrickMasses(cBrick& a, cBrick& b);
+bool compareBrickMasses(const cBrick& a, const cBrick& b);
/**
@@ -90,9 +90,10 @@ class cBricksDatabase {
\brief Load the database of bricks from a plain text stream.
\param stream reference to an input file stream
\param errormessage reference to a string where an error message might be stored
+ \param ignoreerrors if true errors are ignored
\retval int 0 when the database was successfully loaded, -1 when an error occurred (\a errormessage is filled up)
*/
- int loadFromPlainTextStream(ifstream &stream, string& errormessage);
+ int loadFromPlainTextStream(ifstream &stream, string& errormessage, bool ignoreerrors);
/**
@@ -169,7 +170,7 @@ class cBricksDatabase {
\param useHTMLReferences if true then each acronym is converted to a link to its reference (e.g., in ChemSpider)
\retval string name of the peptide
*/
- string getAcronymNameOfTPeptide(string& tcomposition, bool useHTMLReferences);
+ string getAcronymNameOfTPeptide(const string& tcomposition, bool useHTMLReferences);
/**
@@ -224,4 +225,4 @@ class cBricksDatabase {
};
-#endif
\ No newline at end of file
+#endif
diff --git a/CycloBranch/core/cCandidate.cpp b/CycloBranch/core/cCandidate.cpp
index 80b391f..b7cdb27 100644
--- a/CycloBranch/core/cCandidate.cpp
+++ b/CycloBranch/core/cCandidate.cpp
@@ -1,6 +1,7 @@
#include "core/cCandidate.h"
#include "core/cCandidateSet.h"
+#include "core/cDeNovoGraph.h"
void cCandidate::updateInternalComposition() {
@@ -96,7 +97,7 @@ void cCandidate::attachAllBranches(cCandidate& candidate, cCandidateSet& result,
}
-void cCandidate::getPartialRotations(string& composition, vector& rotations) {
+void cCandidate::getPartialRotations(const string& composition, vector& rotations) {
cBrick b;
string s;
vector bricks;
@@ -134,7 +135,7 @@ void cCandidate::getPartialRotations(string& composition, vector& rotati
}
-void cCandidate::getPartialLassoRotations(string& composition, vector& lassorotations, int branchstart, int branchend) {
+void cCandidate::getPartialLassoRotations(const string& composition, vector& lassorotations, int branchstart, int branchend) {
cBrick b;
string s;
bool leftbracketput;
@@ -188,16 +189,20 @@ cCandidate::cCandidate() {
cCandidate::cCandidate(vector& composition, vector& path, int startmodifID, int endmodifID, int middlemodifID, int middlepos) {
+ clear();
setCandidate(composition, path, startmodifID, endmodifID, middlemodifID, middlepos);
}
cCandidate::cCandidate(vector& composition, vector& path, int startmodifID, int endmodifID, int middlemodifID, int branchstart, int branchend) {
+ clear();
setCandidate(composition, path, startmodifID, endmodifID, middlemodifID, branchstart, branchend);
}
void cCandidate::setCandidate(vector& composition, vector& path, int startmodifID, int endmodifID, int middlemodifID, int middlepos) {
+ clear();
+
this->composition = composition;
updateInternalComposition();
@@ -222,6 +227,8 @@ void cCandidate::setCandidate(vector& composition, vector& pat
void cCandidate::setCandidate(vector& composition, vector& path, int startmodifID, int endmodifID, int middlemodifID, int branchstart, int branchend) {
+ clear();
+
this->composition = composition;
updateInternalComposition();
@@ -245,6 +252,13 @@ void cCandidate::clear() {
branchend = -1;
path.clear();
name = "";
+
+ realpeptidename = "";
+ acronympeptidename = "";
+ acronyms.clear();
+ backboneacronyms.clear();
+ branchacronyms.clear();
+ stringpath = "";
}
@@ -284,22 +298,53 @@ void cCandidate::revertComposition() {
}
-void cCandidate::prepareBranchedCandidate(cCandidateSet& result, peptideType peptidetype, bool* terminatecomputation) {
+void cCandidate::prepareBranchedCandidates(cCandidateSet& result, peptideType peptidetype, bool* terminatecomputation) {
cCandidate c;
result.getSet().clear();
- // branching is unknown
- if ((branchstart == -1) && (branchend == -1)) {
- attachAllBranches(*this, result, peptidetype, terminatecomputation);
- }
- // branching is determined by a modification of the T-branch
- else {
- attachSubBranchCandidates(*this, result, peptidetype, terminatecomputation);
+ if (peptidetype == lasso) {
+
+ // just one from startmodifid and middlemodifid may be > 0 (checked in getCandidatesIter)
+ // endmodifid is always 0 because precursor_ion is not used in initializeFragmentIonsForDeNovoGraphOfLassoPeptides
+ // startmodifid is always N-terminal because only b-ions are used in the de novo graph
+
+ if ((startmodifID > 0) && (composition.size() > 0)) {
+ middlemodifID = startmodifID;
+ startmodifID = 0;
+ branchstart = 0;
+
+ cBrick b;
+ vector intvector;
+ b.setComposition(composition[0], false);
+ b.explodeToIntComposition(intvector);
+ branchend = (int)intvector.size() - 1;
+ }
+
+ // branch-cyclic series types D,H
+ if ((branchstart == -1) || (branchstart == 0)) {
+ for (int i = 1; i < numberofinternalbricks - 1; i++) {
+ c = *this;
+ c.branchstart = 0;
+ c.branchend = i;
+ result.getSet().insert(c);
+ }
+ }
+
+ // branch-cyclic series types B,C,F,G
+ if ((branchend == -1) || (branchend == numberofinternalbricks - 1)) {
+ for (int i = 1; i < numberofinternalbricks - 1; i++) {
+ c = *this;
+ c.branchstart = i;
+ c.branchend = numberofinternalbricks - 1;
+ result.getSet().insert(c);
+ }
+ }
+
}
if (peptidetype == branched) {
- // below, middlemodifID is always > 0 because branchstart == 0 (or branchend == 0)
+ // below, middlemodifID is always > 0 because branchstart == 0 (or branchend == numberofinternalbricks - 1)
// startmodifID and middlemodifID collide on the first detected combination of bricks
if (branchstart == 0) {
@@ -339,6 +384,15 @@ void cCandidate::prepareBranchedCandidate(cCandidateSet& result, peptideType pep
}
+ // branching is unknown
+ if ((branchstart == -1) && (branchend == -1)) {
+ attachAllBranches(*this, result, peptidetype, terminatecomputation);
+ }
+ // branching is determined by a modification of the T-branch
+ else {
+ attachSubBranchCandidates(*this, result, peptidetype, terminatecomputation);
+ }
+
}
@@ -710,7 +764,7 @@ double cCandidate::getPrecursorMass(cBricksDatabase& brickdatabasewithcombinatio
mass += brickdatabasewithcombinations[bricks[i] - 1].getMass();
}
- return mass;
+ return (parameters->precursorcharge > 0)?mass:mass-2*Hplus;
}
@@ -948,6 +1002,13 @@ void cCandidate::store(ofstream& os) {
storeString(internalcomposition, os);
os.write((char *)&numberofinternalbricks, sizeof(int));
+
+ storeString(realpeptidename, os);
+ storeString(acronympeptidename, os);
+ storeStringVector(acronyms, os);
+ storeStringVector(backboneacronyms, os);
+ storeStringVector(branchacronyms, os);
+ storeString(stringpath, os);
}
@@ -971,6 +1032,13 @@ void cCandidate::load(ifstream& is) {
loadString(internalcomposition, is);
is.read((char *)&numberofinternalbricks, sizeof(int));
+
+ loadString(realpeptidename, is);
+ loadString(acronympeptidename, is);
+ loadStringVector(acronyms, is);
+ loadStringVector(backboneacronyms, is);
+ loadStringVector(branchacronyms, is);
+ loadString(stringpath, is);
}
@@ -984,6 +1052,166 @@ string& cCandidate::getName() {
}
+void cCandidate::setAcronyms(cBricksDatabase& bricksdatabase) {
+ vector bricks;
+ cBrick b;
+ b.clear();
+ b.setComposition(internalcomposition, false);
+ b.explodeToIntComposition(bricks);
+
+ acronyms.clear();
+ for (int i = 0; i < (int)bricks.size(); i++) {
+ acronyms.push_back(bricksdatabase[bricks[i] - 1].getAcronymsAsString());
+ }
+}
+
+
+void cCandidate::setBackboneAcronyms(cBricksDatabase& bricksdatabase) {
+ vector bricks;
+ cBrick b;
+ b.clear();
+ b.setComposition(internalcomposition, false);
+ b.explodeToIntComposition(bricks);
+
+ backboneacronyms.clear();
+ for (int i = 0; i < (int)bricks.size(); i++) {
+ if ((branchstart >= 0) && (branchend >= 0) && ((i <= branchstart) || (i > branchend))) {
+ backboneacronyms.push_back(bricksdatabase[bricks[i] - 1].getAcronymsAsString());
+ }
+ }
+}
+
+
+void cCandidate::setBranchAcronyms(cBricksDatabase& bricksdatabase) {
+ vector bricks;
+ cBrick b;
+ b.clear();
+ b.setComposition(internalcomposition, false);
+ b.explodeToIntComposition(bricks);
+
+ branchacronyms.clear();
+ for (int i = 0; i < (int)bricks.size(); i++) {
+ if ((branchstart >= 0) && (branchend >= 0) && (i > branchstart) && (i <= branchend)) {
+ branchacronyms.push_back(bricksdatabase[bricks[i] - 1].getAcronymsAsString());
+ }
+ }
+}
+
+
+vector& cCandidate::getAcronyms() {
+ return acronyms;
+}
+
+
+vector& cCandidate::getBackboneAcronyms() {
+ return backboneacronyms;
+}
+
+
+vector& cCandidate::getBranchAcronyms() {
+ return branchacronyms;
+}
+
+
+void cCandidate::setPath(cDeNovoGraph& graph, cParameters* parameters) {
+ cDeNovoGraphNode* currentnode;
+ cDeNovoGraphNode* targetnode;
+ cEdge* currentedge;
+ stringpath = "";
+ for (int i = 0; i < (int)path.size(); i++) {
+ currentnode = &graph[path[i].nodeid];
+ currentedge = &((*currentnode)[path[i].edgeid]);
+ targetnode = &graph[currentedge->targetnode];
+
+ stringpath += to_string(currentnode->getMZRatio());
+ stringpath += " -> ";
+ stringpath += to_string(targetnode->getMZRatio());
+ stringpath += " using brick(s): ";
+ if (currentedge->composition.compare("0") == 0) {
+ stringpath += "none";
+ }
+ else {
+ stringpath += graph.getBrickDatabaseWithCombinations()->getAcronymName(currentedge->composition, true);
+ }
+
+ stringpath += " (mass difference: " + to_string(currentedge->massdifference) + ", ";
+ stringpath += "source intensity: " + to_string(currentnode->getIntensity()) + ", ";
+ stringpath += "target intensity: " + to_string(targetnode->getIntensity()) + ", ";
+ stringpath += "ppm error: " + to_string(currentedge->ppmerror) + ", ";
+ stringpath += "source charge: " + to_string(currentedge->sourcecharge) + ", ";
+ stringpath += "target charge: " + to_string(currentedge->targetcharge);
+ if ((parameters->peptidetype == branched) || (parameters->peptidetype == lasso)) {
+ if (currentedge->middlemodifID > 0) {
+ stringpath += ", branch modification: " + parameters->searchedmodifications[currentedge->middlemodifID].name;
+ }
+ }
+ if (currentedge->endmodifID > 0) {
+ stringpath += ", terminal modification: " + parameters->searchedmodifications[currentedge->endmodifID].name;
+ }
+ //path += currentedge->printSourceAnnotation(fragmentdefinitions);
+ //path += "->";
+ //path += currentedge->printTargetAnnotation(fragmentdefinitions);
+ stringpath += ")
";
+ }
+}
+
+
+string& cCandidate::getPathAsString() {
+ return stringpath;
+}
+
+
+void cCandidate::setRealPeptideName(cBricksDatabase& bricksdatabase, peptideType peptidetype) {
+ switch (peptidetype)
+ {
+ case linear:
+ case cyclic:
+ case linearpolysaccharide:
+ realpeptidename = bricksdatabase.getRealName(internalcomposition);
+ break;
+ case branched:
+ case lasso:
+ realpeptidename = getRealNameTComposition(bricksdatabase);
+ break;
+ case other:
+ default:
+ realpeptidename = "";
+ break;
+ }
+}
+
+
+void cCandidate::setAcronymPeptideNameWithHTMLReferences(cBricksDatabase& bricksdatabase, peptideType peptidetype) {
+ switch (peptidetype)
+ {
+ case linear:
+ case cyclic:
+ case linearpolysaccharide:
+ acronympeptidename = bricksdatabase.getAcronymName(internalcomposition, true);
+ break;
+ case branched:
+ case lasso:
+ acronympeptidename = getAcronymsTComposition(bricksdatabase);
+ break;
+ case other:
+ default:
+ acronympeptidename = "";
+ break;
+ }
+}
+
+
+string& cCandidate::getRealPeptideName() {
+ return realpeptidename;
+}
+
+
+string& cCandidate::getAcronymPeptideNameWithHTMLReferences() {
+ return acronympeptidename;
+}
+
+
bool operator == (cCandidate const& a, cCandidate const& b) {
return ((cCandidate &)a).isEqualTo((cCandidate &)b);
}
+
diff --git a/CycloBranch/core/cCandidate.h b/CycloBranch/core/cCandidate.h
index 110a3f8..145b90b 100644
--- a/CycloBranch/core/cCandidate.h
+++ b/CycloBranch/core/cCandidate.h
@@ -17,9 +17,11 @@
#include "core/cSummaryFormula.h"
class cCandidateSet;
+class cDeNovoGraph;
using namespace std;
+using namespace boost;
/**
@@ -140,6 +142,13 @@ class cCandidate {
string internalcomposition;
int numberofinternalbricks;
+ string realpeptidename;
+ string acronympeptidename;
+ vector acronyms;
+ vector backboneacronyms;
+ vector branchacronyms;
+ string stringpath;
+
void updateInternalComposition();
void getPermutationsIter(cCandidateSet& permutations, vector& currentcandidate, int position, bool* terminatecomputation);
@@ -148,9 +157,9 @@ class cCandidate {
void attachAllBranches(cCandidate& candidate, cCandidateSet& result, peptideType peptidetype, bool* terminatecomputation);
- void getPartialRotations(string& composition, vector& rotations);
+ void getPartialRotations(const string& composition, vector& rotations);
- void getPartialLassoRotations(string& composition, vector& lassorotations, int branchstart, int branchend);
+ void getPartialLassoRotations(const string& composition, vector& lassorotations, int branchstart, int branchend);
public:
@@ -230,12 +239,12 @@ class cCandidate {
/**
- \brief Prepare candidates of a branched or a lasso peptide.
+ \brief Prepare candidates of a branched or a branch-cyclic peptide.
\param result reference to an output set of possible peptide sequence candidates
\param peptidetype a type of an analyzed peptide
\param terminatecomputation pointer to a variable determining that the computation must be stopped
*/
- void prepareBranchedCandidate(cCandidateSet& result, peptideType peptidetype, bool* terminatecomputation);
+ void prepareBranchedCandidates(cCandidateSet& result, peptideType peptidetype, bool* terminatecomputation);
/**
@@ -404,9 +413,9 @@ class cCandidate {
/**
- \brief Get lasso rotations of a lasso peptide sequence.
- \param lassorotations reference to an output vector containing lasso rotations of a sequence
- \param includerevertedrotations if true then reverted lasso rotations are also included
+ \brief Get branch-cyclic rotations of a branch-cyclic peptide sequence.
+ \param lassorotations reference to an output vector containing branch-cyclic rotations of a sequence
+ \param includerevertedrotations if true then reverted branch-cyclic rotations are also included
*/
void getLassoRotations(vector& lassorotations, bool includerevertedrotations);
@@ -447,6 +456,93 @@ class cCandidate {
*/
string& getName();
+
+ /**
+ \brief Set a vector of acronyms corresponding to a peptide sequence candidate.
+ \param bricksdatabase a database of building blocks
+ */
+ void setAcronyms(cBricksDatabase& bricksdatabase);
+
+
+ /**
+ \brief Set a vector of acronyms corresponding to a backbone of a peptide sequence candidate.
+ \param bricksdatabase a database of building blocks
+ */
+ void setBackboneAcronyms(cBricksDatabase& bricksdatabase);
+
+
+ /**
+ \brief Set a vector of acronyms corresponding to a branch of a peptide sequence candidate.
+ \param bricksdatabase a database of building blocks
+ */
+ void setBranchAcronyms(cBricksDatabase& bricksdatabase);
+
+
+ /**
+ \brief Get a vector of acronyms corresponding to a peptide sequence candidate.
+ \retval vector a vector of acronyms
+ */
+ vector& getAcronyms();
+
+
+ /**
+ \brief Get a vector of acronyms corresponding to a backbone of a peptide sequence candidate.
+ \retval vector a vector of acronyms
+ */
+ vector& getBackboneAcronyms();
+
+
+ /**
+ \brief Get a vector of acronyms corresponding to a branch of a peptide sequence candidate.
+ \retval vector a vector of acronyms
+ */
+ vector& getBranchAcronyms();
+
+
+ /**
+ \brief Set a path in the de novo graph corresponding to the candidate.
+ \param graph reference to the de novo graph
+ \param parameters parameters of the application
+ */
+ void setPath(cDeNovoGraph& graph, cParameters* parameters);
+
+
+ /**
+ \brief Get a path in the de novo graph corresponding to the candidate as a string.
+ \retval string reference to a path corresponding to the spectrum
+ */
+ string& getPathAsString();
+
+
+ /**
+ \brief Set a real peptide name.
+ \param bricksdatabase the database of building blocks
+ \param peptidetype the type of peptide
+ */
+ void setRealPeptideName(cBricksDatabase& bricksdatabase, peptideType peptidetype);
+
+
+ /**
+ \brief Set an acronym peptide name.
+ \param bricksdatabase the database of building blocks
+ \param peptidetype the type of peptide
+ */
+ void setAcronymPeptideNameWithHTMLReferences(cBricksDatabase& bricksdatabase, peptideType peptidetype);
+
+
+ /**
+ \brief Get a real peptide name.
+ \retval string reference to the real peptide name
+ */
+ string& getRealPeptideName();
+
+
+ /**
+ \brief Get an acronym peptide name.
+ \retval string reference to the acronym peptide name
+ */
+ string& getAcronymPeptideNameWithHTMLReferences();
+
};
@@ -461,7 +557,7 @@ struct hash_cCandidate {
\retval size_t hashed candidate
*/
size_t operator()(const cCandidate& candidate) const {
- return hash()(((cCandidate&)candidate).getComposition());
+ return std::hash()(((cCandidate&)candidate).getComposition());
}
};
diff --git a/CycloBranch/core/cDeNovoGraph.cpp b/CycloBranch/core/cDeNovoGraph.cpp
index c9c1039..9c9c1e8 100644
--- a/CycloBranch/core/cDeNovoGraph.cpp
+++ b/CycloBranch/core/cDeNovoGraph.cpp
@@ -22,11 +22,12 @@ cDeNovoGraph::cDeNovoGraph() {
}
-bool cDeNovoGraph::findPath(int sourcenodeid, int edgeid, int targetnodeid, string& composition, string brickspath, int maximumbricksincombination, vector& path) {
+bool cDeNovoGraph::findPath(int sourcenodeid, int edgeid, int targetnodeid, string& composition, string brickspath, int maximumbricksincombination, vector& path) {
string localbrickpath;
bool found;
bool badpath;
int count = getNumberOfBricks(brickspath);
+ nodeEdge ne;
if ((path.size() > 1) && (sourcenodeid == targetnodeid)) {
cBrick b;
@@ -42,9 +43,15 @@ bool cDeNovoGraph::findPath(int sourcenodeid, int edgeid, int targetnodeid, stri
if ((i == edgeid) && (path.size() == 0)) {
continue;
}
+
+ // target charge of an edge must be equal to the source charge of a following edge
+ if ((path.size() > 0) && (graph[sourcenodeid][i].sourcecharge != graph[path.back().nodeid][path.back().edgeid].targetcharge)) {
+ continue;
+ }
+
badpath = false;
for (int j = 0; j < (int)path.size(); j++) {
- if (path[j] == sourcenodeid) {
+ if (path[j].nodeid == sourcenodeid) {
badpath = true;
break;
}
@@ -52,14 +59,21 @@ bool cDeNovoGraph::findPath(int sourcenodeid, int edgeid, int targetnodeid, stri
if (badpath) {
continue;
}
+
localbrickpath = brickspath;
if (localbrickpath.size() > 0) {
localbrickpath += '-';
}
localbrickpath += graph[sourcenodeid][i].composition;
- path.push_back(sourcenodeid);
+
+ ne.nodeid = sourcenodeid;
+ ne.edgeid = i;
+ path.push_back(ne);
+
found = findPath(graph[sourcenodeid][i].targetnode, i, targetnodeid, composition, localbrickpath, maximumbricksincombination, path);
+
path.pop_back();
+
if (found) {
//*os << graph[sourcenodeid].getMZRatio() << " ";
return true;
@@ -118,14 +132,14 @@ int cDeNovoGraph::createGraph(bool& terminatecomputation) {
double termmass;
int left, right, middle;
cEdge e, e1, e2;
- double unchargedprecursormass = uncharge(parameters->precursormass, parameters->precursorcharge);
+ double unchargedprecursormass = charge(uncharge(parameters->precursormass, parameters->precursorcharge), (parameters->precursorcharge > 0)?1:-1);
double unchargedmz;
int i;
sortedpeaklist = parameters->peaklist;
// insert the single charged precursor, if neccessary
sortedpeaklist.sortbyMass();
- sortedpeaklist.cropMaximumMZRatio(unchargedprecursormass);
+ sortedpeaklist.cropMaximumMZRatio(unchargedprecursormass, parameters->precursormasserrortolerance);
if ((sortedpeaklist.size() > 0) && (!isInPpmMassErrorTolerance(sortedpeaklist[sortedpeaklist.size() - 1].mzratio, unchargedprecursormass, parameters->precursormasserrortolerance))) {
cPeak p;
p.mzratio = unchargedprecursormass;
@@ -146,12 +160,14 @@ int cDeNovoGraph::createGraph(bool& terminatecomputation) {
sortedpeaklist.removeNeutralLoss(- NH3, parameters->precursorcharge, parameters->fragmentmasserrortolerance);
*os << "Number of nodes when deamidated ions are removed: " << sortedpeaklist.size() << endl;
+ double negativeshift = (parameters->precursorcharge > 0)?0:-2*Hplus;
+
// insert system nodes
switch (parameters->peptidetype)
{
case cyclic:
node.clear();
- node.setMZRatio(parameters->fragmentdefinitions[b_ion].massdifference);
+ node.setMZRatio(parameters->fragmentdefinitions[b_ion].massdifference + negativeshift);
node.setIntensity(0);
node.addIonAnnotation(b_ion);
graph.push_back(node);
@@ -166,13 +182,13 @@ int cDeNovoGraph::createGraph(bool& terminatecomputation) {
graph.push_back(node);
node.clear();
- node.setMZRatio(parameters->fragmentdefinitions[b_ion].massdifference);
+ node.setMZRatio(parameters->fragmentdefinitions[b_ion].massdifference + negativeshift);
node.setIntensity(0);
node.addIonAnnotation(b_ion);
graph.push_back(node);
node.clear();
- node.setMZRatio(parameters->fragmentdefinitions[y_ion].massdifference);
+ node.setMZRatio(parameters->fragmentdefinitions[y_ion].massdifference + negativeshift);
node.setIntensity(0);
node.addIonAnnotation(y_ion);
graph.push_back(node);
@@ -195,13 +211,13 @@ int cDeNovoGraph::createGraph(bool& terminatecomputation) {
e.targetnode = i + 2;
if (parameters->searchedmodifications[i].nterminal) {
- node.setMZRatio(parameters->fragmentdefinitions[b_ion].massdifference + parameters->searchedmodifications[i].massdifference);
+ node.setMZRatio(parameters->fragmentdefinitions[b_ion].massdifference + parameters->searchedmodifications[i].massdifference + negativeshift);
node.setIntensity(0);
node.addIonAnnotation(b_ion);
}
if (parameters->searchedmodifications[i].cterminal) {
- node.setMZRatio(parameters->fragmentdefinitions[y_ion].massdifference + parameters->searchedmodifications[i].massdifference);
+ node.setMZRatio(parameters->fragmentdefinitions[y_ion].massdifference + parameters->searchedmodifications[i].massdifference + negativeshift);
node.setIntensity(0);
node.addIonAnnotation(y_ion);
}
@@ -226,13 +242,13 @@ int cDeNovoGraph::createGraph(bool& terminatecomputation) {
graph.push_back(node);
node.clear();
- node.setMZRatio(parameters->fragmentdefinitions[b_ion].massdifference);
+ node.setMZRatio(parameters->fragmentdefinitions[b_ion].massdifference + negativeshift);
node.setIntensity(0);
node.addIonAnnotation(b_ion);
graph.push_back(node);
//node.clear();
- //node.setMZRatio(parameters->fragmentdefinitions[y_ion].massdifference);
+ //node.setMZRatio(parameters->fragmentdefinitions[y_ion].massdifference + negativeshift);
//node.setIntensity(0);
//node.addIonAnnotation(y_ion);
//graph.push_back(node);
@@ -256,13 +272,13 @@ int cDeNovoGraph::createGraph(bool& terminatecomputation) {
e.targetnode = i + 2;
if (parameters->searchedmodifications[i].nterminal) {
- node.setMZRatio(parameters->fragmentdefinitions[b_ion].massdifference + parameters->searchedmodifications[i].massdifference);
+ node.setMZRatio(parameters->fragmentdefinitions[b_ion].massdifference + parameters->searchedmodifications[i].massdifference + negativeshift);
node.setIntensity(0);
node.addIonAnnotation(b_ion);
}
if (parameters->searchedmodifications[i].cterminal) {
- node.setMZRatio(parameters->fragmentdefinitions[y_ion].massdifference + parameters->searchedmodifications[i].massdifference);
+ node.setMZRatio(parameters->fragmentdefinitions[y_ion].massdifference + parameters->searchedmodifications[i].massdifference + negativeshift);
node.setIntensity(0);
node.addIonAnnotation(y_ion);
}
@@ -284,13 +300,13 @@ int cDeNovoGraph::createGraph(bool& terminatecomputation) {
graph.push_back(node);
node.clear();
- node.setMZRatio(H2O + Hplus);
+ node.setMZRatio(H2O + Hplus + negativeshift);
node.setIntensity(0);
node.addIonAnnotation(ms_nterminal_ion_hplus);
graph.push_back(node);
//node.clear();
- //node.setMZRatio(H2O + Hplus);
+ //node.setMZRatio(H2O + Hplus + negativeshift);
//node.setIntensity(0);
//node.addIonAnnotation(ms_cterminal_ion_hplus);
//graph.push_back(node);
@@ -313,13 +329,13 @@ int cDeNovoGraph::createGraph(bool& terminatecomputation) {
e.targetnode = i + 1;//2;
//if (parameters->searchedmodifications[i].nterminal) {
- node.setMZRatio(H2O + Hplus + parameters->searchedmodifications[i].massdifference);
+ node.setMZRatio(H2O + Hplus + parameters->searchedmodifications[i].massdifference + negativeshift);
node.setIntensity(0);
node.addIonAnnotation(ms_nterminal_ion_hplus);
//}
//if (parameters->searchedmodifications[i].cterminal) {
- // node.setMZRatio(H2O + Hplus +parameters->searchedmodifications[i].massdifference);
+ // node.setMZRatio(H2O + Hplus + parameters->searchedmodifications[i].massdifference + negativeshift);
// node.setIntensity(0);
// node.addIonAnnotation(ms_cterminal_ion_hplus);
//}
@@ -461,7 +477,7 @@ int cDeNovoGraph::createGraph(bool& terminatecomputation) {
continue;
}
- // middle modifications for branched and lasso peptides
+ // middle modifications for branched and branch-cyclic peptides
for (int p = 0; p < (int)parameters->searchedmodifications.size(); p++) {
if ((p > 0) && ((parameters->peptidetype == linear) || (parameters->peptidetype == cyclic) || (parameters->peptidetype == linearpolysaccharide))) {
@@ -488,11 +504,11 @@ int cDeNovoGraph::createGraph(bool& terminatecomputation) {
}
- for (int z1 = 1; z1 <= parameters->precursorcharge; z1++) {
+ for (int z1 = 1; z1 <= abs(parameters->precursorcharge); z1++) {
- for (int z2 = 1; z2 <= parameters->precursorcharge; z2++) {
+ for (int z2 = 1; z2 <= abs(parameters->precursorcharge); z2++) {
- unchargedmz = uncharge(graph[i].getMZRatio(), z1);
+ unchargedmz = charge(uncharge(graph[i].getMZRatio(), (parameters->precursorcharge > 0)?z1:-z1), (parameters->precursorcharge > 0)?1:-1);
if ((!isInPpmMassErrorTolerance(unchargedmz, unchargedprecursormass, parameters->fragmentmasserrortolerance)) && (unchargedmz > unchargedprecursormass)) {
continue;
}
@@ -521,12 +537,12 @@ int cDeNovoGraph::createGraph(bool& terminatecomputation) {
while (left <= right) {
middle = (left + right) / 2;
- if (isInPpmMassErrorTolerance(uncharge(graph[middle].getMZRatio(), z2), mass, parameters->fragmentmasserrortolerance)) {
+ if (isInPpmMassErrorTolerance(charge(uncharge(graph[middle].getMZRatio(), (parameters->precursorcharge > 0)?z2:-z2), (parameters->precursorcharge > 0)?1:-1), mass, parameters->fragmentmasserrortolerance)) {
// found
- while ((middle > lastsystemnode + 1) && isInPpmMassErrorTolerance(uncharge(graph[middle - 1].getMZRatio(), z2), mass, parameters->fragmentmasserrortolerance)) {
+ while ((middle > lastsystemnode + 1) && isInPpmMassErrorTolerance(charge(uncharge(graph[middle - 1].getMZRatio(), (parameters->precursorcharge > 0)?z2:-z2), (parameters->precursorcharge > 0)?1:-1), mass, parameters->fragmentmasserrortolerance)) {
middle--;
}
- while ((middle < (int)graph.size()) && (isInPpmMassErrorTolerance(uncharge(graph[middle].getMZRatio(), z2), mass, parameters->fragmentmasserrortolerance))) {
+ while ((middle < (int)graph.size()) && (isInPpmMassErrorTolerance(charge(uncharge(graph[middle].getMZRatio(), (parameters->precursorcharge > 0)?z2:-z2), (parameters->precursorcharge > 0)?1:-1), mass, parameters->fragmentmasserrortolerance))) {
// target node cannot be a system node
if (middle <= lastsystemnode) {
@@ -541,7 +557,7 @@ int cDeNovoGraph::createGraph(bool& terminatecomputation) {
}
// mass corresponding to the target node must be <= uncharged precursor mass
- if (uncharge(graph[middle].getMZRatio(), z2) > unchargedprecursormass) {
+ if (charge(uncharge(graph[middle].getMZRatio(), (parameters->precursorcharge > 0)?z2:-z2), (parameters->precursorcharge > 0)?1:-1) > unchargedprecursormass) {
middle++;
continue;
}
@@ -558,10 +574,10 @@ int cDeNovoGraph::createGraph(bool& terminatecomputation) {
if (i == (int)graph.size() - 1) {
e.targetnode = i;
e.brickid = j;
- e.ppmerror = ppmError(uncharge(graph[middle].getMZRatio(), z2), mass);
- e.massdifference = abs(unchargedmz - uncharge(graph[middle].getMZRatio(), z2));
- e.sourcecharge = z2;
- e.targetcharge = z1;
+ e.ppmerror = ppmError(charge(uncharge(graph[middle].getMZRatio(), (parameters->precursorcharge > 0)?z2:-z2), (parameters->precursorcharge > 0)?1:-1), mass);
+ e.massdifference = abs(unchargedmz - charge(uncharge(graph[middle].getMZRatio(), (parameters->precursorcharge > 0)?z2:-z2), (parameters->precursorcharge > 0)?1:-1));
+ e.sourcecharge = (parameters->precursorcharge > 0)?z2:-z2;
+ e.targetcharge = (parameters->precursorcharge > 0)?z1:-z1;
e.targetintensity = graph[i].getIntensity();
e.composition = bricksdatabasewithcombinations[j].getComposition();
e.endmodifID = n;
@@ -573,10 +589,10 @@ int cDeNovoGraph::createGraph(bool& terminatecomputation) {
else {
e.targetnode = middle;
e.brickid = j;
- e.ppmerror = ppmError(uncharge(graph[middle].getMZRatio(), z2), mass);
- e.massdifference = abs(uncharge(graph[middle].getMZRatio(), z2) - unchargedmz);
- e.sourcecharge = z1;
- e.targetcharge = z2;
+ e.ppmerror = ppmError(charge(uncharge(graph[middle].getMZRatio(), (parameters->precursorcharge > 0)?z2:-z2), (parameters->precursorcharge > 0)?1:-1), mass);
+ e.massdifference = abs(charge(uncharge(graph[middle].getMZRatio(), (parameters->precursorcharge > 0)?z2:-z2), (parameters->precursorcharge > 0)?1:-1) - unchargedmz);
+ e.sourcecharge = (parameters->precursorcharge > 0)?z1:-z1;
+ e.targetcharge = (parameters->precursorcharge > 0)?z2:-z2;
e.targetintensity = graph[middle].getIntensity();
e.composition = bricksdatabasewithcombinations[j].getComposition();
e.endmodifID = n;
@@ -593,7 +609,7 @@ int cDeNovoGraph::createGraph(bool& terminatecomputation) {
}
break;
}
- if (mass < uncharge(graph[middle].getMZRatio(), z2)) {
+ if (mass < charge(uncharge(graph[middle].getMZRatio(), (parameters->precursorcharge > 0)?z2:-z2), (parameters->precursorcharge > 0)?1:-1)) {
right = middle - 1;
}
else {
@@ -640,7 +656,7 @@ int cDeNovoGraph::createGraph(bool& terminatecomputation) {
int cDeNovoGraph::removeEdgesFormingPathsNotFinishingInPrecursor(bool& terminatecomputation) {
*os << "Removing edges forming blind paths (not finishing in the precursor)... ";
- double unchargedprecursormass = uncharge(parameters->precursormass, parameters->precursorcharge);
+ double neutralprecursormass = uncharge(parameters->precursormass, parameters->precursorcharge);
bool removed = true;
bool isprecursor;
int edgesremoved = 0;
@@ -658,8 +674,8 @@ int cDeNovoGraph::removeEdgesFormingPathsNotFinishingInPrecursor(bool& terminate
// Is the target precursor ?
isprecursor = false;
- for (int k = 1; k <= parameters->precursorcharge; k++) {
- if (isInPpmMassErrorTolerance(graph[graph[i][j].targetnode].getMZRatio(), charge(unchargedprecursormass, k), parameters->precursormasserrortolerance)) {
+ for (int k = 1; k <= abs(parameters->precursorcharge); k++) {
+ if (isInPpmMassErrorTolerance(graph[graph[i][j].targetnode].getMZRatio(), charge(neutralprecursormass, (parameters->precursorcharge > 0)?k:-k), parameters->precursormasserrortolerance)) {
isprecursor = true;
break;
}
@@ -748,8 +764,8 @@ int cDeNovoGraph::connectEdgesFormingPathsNotFinishingInPrecursor(bool& terminat
e.brickid = (int)bricksdatabasewithcombinations.size() + 1;
e.ppmerror = 0;
e.massdifference = abs(graph[precursorposition].getMZRatio() - graph[i].getMZRatio());
- e.sourcecharge = 1;
- e.targetcharge = 1;
+ e.sourcecharge = (parameters->precursorcharge > 0)?1:-1;
+ e.targetcharge = (parameters->precursorcharge > 0)?1:-1;
e.targetintensity = graph[e.targetnode].getIntensity();
e.composition = to_string(e.brickid);
e.endmodifID = 0;
@@ -813,8 +829,8 @@ int cDeNovoGraph::connectEdgesFormingPathsNotStartingFromFirstNode(bool& termina
e.brickid = (int)bricksdatabasewithcombinations.size() + 1;
e.ppmerror = 0;
e.massdifference = abs(graph[i].getMZRatio() - graph[j].getMZRatio());
- e.sourcecharge = 1;
- e.targetcharge = 1;
+ e.sourcecharge = (parameters->precursorcharge > 0)?1:-1;
+ e.targetcharge = (parameters->precursorcharge > 0)?1:-1;
e.targetintensity = graph[i].getIntensity();
e.composition = to_string(e.brickid);
e.endmodifID = 0;
@@ -849,7 +865,7 @@ int cDeNovoGraph::removePathsWhichCanBeSubstitutedByLongerPath(bool& terminateco
*os << "Removing edges forming paths which can be substituted by longer paths... ";
int edgesremoved = 0;
int j;
- vector path;
+ vector path;
for (int i = startnode; i < (int)graph.size(); i++) {
diff --git a/CycloBranch/core/cDeNovoGraph.h b/CycloBranch/core/cDeNovoGraph.h
index 422bf77..c5b49ed 100644
--- a/CycloBranch/core/cDeNovoGraph.h
+++ b/CycloBranch/core/cDeNovoGraph.h
@@ -55,7 +55,7 @@ class cDeNovoGraph {
cGraphReaderThread* graphreaderthread;
- bool findPath(int sourcenodeid, int edgeid, int targetnodeid, string& composition, string brickspath, int maximumbricksincombination, vector& path);
+ bool findPath(int sourcenodeid, int edgeid, int targetnodeid, string& composition, string brickspath, int maximumbricksincombination, vector& path);
// create vectors of edges from temporary unordered_sets
void createVectorsOfEdges();
diff --git a/CycloBranch/core/cDeNovoGraphNode.cpp b/CycloBranch/core/cDeNovoGraphNode.cpp
index 4c3b4d1..453b7e5 100644
--- a/CycloBranch/core/cDeNovoGraphNode.cpp
+++ b/CycloBranch/core/cDeNovoGraphNode.cpp
@@ -18,12 +18,12 @@ bool operator == (cEdge const& a, cEdge const& b) {
}
-bool compareEdgesByPPMError(cEdge& a, cEdge& b) {
+bool compareEdgesByPPMError(const cEdge& a, const cEdge& b) {
return (a.ppmerror < b.ppmerror);
}
-bool compareEdgesByTargetNodeIntensityDesc(cEdge& a, cEdge& b) {
+bool compareEdgesByTargetNodeIntensityDesc(const cEdge& a, const cEdge& b) {
return (a.targetintensity > b.targetintensity);
}
diff --git a/CycloBranch/core/cDeNovoGraphNode.h b/CycloBranch/core/cDeNovoGraphNode.h
index 8ee33bd..4dda405 100644
--- a/CycloBranch/core/cDeNovoGraphNode.h
+++ b/CycloBranch/core/cDeNovoGraphNode.h
@@ -153,7 +153,7 @@ struct hash_cEdge {
\retval size_t hashed edge
*/
size_t operator()(const cEdge& e) const {
- return hash()(e.targetnode) ^ hash()(e.brickid);
+ return std::hash()(e.targetnode) ^ std::hash()(e.brickid);
}
};
@@ -174,7 +174,7 @@ bool operator == (cEdge const& a, cEdge const& b);
\param b second edge
\retval bool true when \a a has smaller ppm error than \a b
*/
-bool compareEdgesByPPMError(cEdge& a, cEdge& b);
+bool compareEdgesByPPMError(const cEdge& a, const cEdge& b);
/**
@@ -183,7 +183,7 @@ bool compareEdgesByPPMError(cEdge& a, cEdge& b);
\param b second edge
\retval bool true when the target node of \a a has bigger intensity than the target node of \a b
*/
-bool compareEdgesByTargetNodeIntensityDesc(cEdge& a, cEdge& b);
+bool compareEdgesByTargetNodeIntensityDesc(const cEdge& a, const cEdge& b);
/**
@@ -318,4 +318,4 @@ class cDeNovoGraphNode {
};
-#endif
\ No newline at end of file
+#endif
diff --git a/CycloBranch/core/cFragmentIons.cpp b/CycloBranch/core/cFragmentIons.cpp
index 9531dbc..c10b320 100644
--- a/CycloBranch/core/cFragmentIons.cpp
+++ b/CycloBranch/core/cFragmentIons.cpp
@@ -1,4 +1,5 @@
#include "core/cFragmentIons.h"
+#include "core/cSummaryFormula.h"
cPeriodicTableMap::cPeriodicTableMap() {
@@ -47,66 +48,13 @@ int cPeriodicTableMap::count(string& element) {
}
-peptideType getPeptideTypeFromString(string s) {
- if (s.compare("linear") == 0) {
- return linear;
- }
- if (s.compare("cyclic") == 0) {
- return cyclic;
- }
- if (s.compare("branched") == 0) {
- return branched;
- }
- if (s.compare("lasso") == 0) {
- return lasso;
- }
- if (s.compare("linearpolysaccharide") == 0) {
- return linearpolysaccharide;
- }
- if (s.compare("other") == 0) {
- return other;
- }
-
- return other;
+double charge(double neutralmass, int charge) {
+ return (neutralmass + (double)charge*Hplus)/(double)abs(charge);
}
-string getStringFromPeptideType(peptideType peptidetype) {
- switch (peptidetype)
- {
- case linear:
- return "linear";
- break;
- case cyclic:
- return "cyclic";
- break;
- case branched:
- return "branched";
- break;
- case lasso:
- return "lasso";
- break;
- case linearpolysaccharide:
- return "linearpolysaccharide";
- break;
- case other:
- return "other";
- break;
- default:
- break;
- }
-
- return "other";
-}
-
-
-double charge(double mass, int charge) {
- return (mass + ((double)(charge - 1))*Hplus)/(double)charge;
-}
-
-
-double uncharge(double mass, int charge) {
- return mass*(double)charge - ((double)(charge - 1))*Hplus;
+double uncharge(double mzratio, int charge) {
+ return mzratio*(double)abs(charge) - (double)charge*Hplus;
}
@@ -135,12 +83,13 @@ void fragmentDescription::load(ifstream& is) {
cFragmentIons::cFragmentIons() {
- recalculateFragments(false, false);
+ string s = "";
+ recalculateFragments(false, false, s);
}
-cFragmentIons::cFragmentIons(bool cyclicnterminus, bool cycliccterminus) {
- recalculateFragments(cyclicnterminus, cycliccterminus);
+cFragmentIons::cFragmentIons(bool cyclicnterminus, bool cycliccterminus, string& precursoradduct) {
+ recalculateFragments(cyclicnterminus, cycliccterminus, precursoradduct);
}
@@ -149,208 +98,299 @@ fragmentDescription &cFragmentIons::operator[](fragmentIonType iontype) {
}
-void cFragmentIons::recalculateFragments(bool cyclicnterminus, bool cycliccterminus) {
+void cFragmentIons::recalculateFragments(bool cyclicnterminus, bool cycliccterminus, string& precursoradduct) {
fragmentions.clear();
double nterminusshift = cyclicnterminus?-H2O:0;
double cterminusshift = cycliccterminus?-H2O:0;
-
- // initialize B-ion
- fragmentions[b_ion].nterminal = true;
- fragmentions[b_ion].cterminal = false;
- fragmentions[b_ion].name = "B";
- fragmentions[b_ion].massdifference = B_ION + nterminusshift;
- fragmentions[b_ion].parent = b_ion;
+ double adductshift = 0;
- // initialize B-H2O ion
- fragmentions[b_ion_water_loss].nterminal = true;
- fragmentions[b_ion_water_loss].cterminal = false;
- fragmentions[b_ion_water_loss].name = "B*";
- fragmentions[b_ion_water_loss].massdifference = B_ION - H2O + nterminusshift;
- fragmentions[b_ion_water_loss].parent = b_ion;
-
- // initialize B-NH3 ion
- fragmentions[b_ion_ammonia_loss].nterminal = true;
- fragmentions[b_ion_ammonia_loss].cterminal = false;
- fragmentions[b_ion_ammonia_loss].name = "Bx";
- fragmentions[b_ion_ammonia_loss].massdifference = B_ION - NH3 + nterminusshift;
- fragmentions[b_ion_ammonia_loss].parent = b_ion;
-
- // initialize B-H2O-NH3 ion
- fragmentions[b_ion_water_and_ammonia_loss].nterminal = true;
- fragmentions[b_ion_water_and_ammonia_loss].cterminal = false;
- fragmentions[b_ion_water_and_ammonia_loss].name = "B*x";
- fragmentions[b_ion_water_and_ammonia_loss].massdifference = B_ION - H2O - NH3 + nterminusshift;
- fragmentions[b_ion_water_and_ammonia_loss].parent = b_ion;
+ if (precursoradduct.compare("") != 0) {
+ cSummaryFormula formula;
+ formula.setFormula(precursoradduct);
+ adductshift = formula.getMass() - H;
+ }
// initialize A-ion
fragmentions[a_ion].nterminal = true;
fragmentions[a_ion].cterminal = false;
fragmentions[a_ion].name = "A";
- fragmentions[a_ion].massdifference = A_ION + nterminusshift;
+ fragmentions[a_ion].massdifference = A_ION + nterminusshift + adductshift;
fragmentions[a_ion].parent = b_ion; // ok
// initialize A-H2O ion
- fragmentions[a_ion_water_loss].nterminal = true;
- fragmentions[a_ion_water_loss].cterminal = false;
- fragmentions[a_ion_water_loss].name = "A*";
- fragmentions[a_ion_water_loss].massdifference = A_ION - H2O + nterminusshift;
- fragmentions[a_ion_water_loss].parent = a_ion;
+ fragmentions[a_ion_dehydrated].nterminal = true;
+ fragmentions[a_ion_dehydrated].cterminal = false;
+ fragmentions[a_ion_dehydrated].name = "A*";
+ fragmentions[a_ion_dehydrated].massdifference = A_ION - H2O + nterminusshift + adductshift;
+ fragmentions[a_ion_dehydrated].parent = a_ion;
// initialize A-NH3 ion
- fragmentions[a_ion_ammonia_loss].nterminal = true;
- fragmentions[a_ion_ammonia_loss].cterminal = false;
- fragmentions[a_ion_ammonia_loss].name = "Ax";
- fragmentions[a_ion_ammonia_loss].massdifference = A_ION - NH3 + nterminusshift;
- fragmentions[a_ion_ammonia_loss].parent = a_ion;
+ fragmentions[a_ion_deamidated].nterminal = true;
+ fragmentions[a_ion_deamidated].cterminal = false;
+ fragmentions[a_ion_deamidated].name = "Ax";
+ fragmentions[a_ion_deamidated].massdifference = A_ION - NH3 + nterminusshift + adductshift;
+ fragmentions[a_ion_deamidated].parent = a_ion;
// initialize A-H2O-NH3 ion
- fragmentions[a_ion_water_and_ammonia_loss].nterminal = true;
- fragmentions[a_ion_water_and_ammonia_loss].cterminal = false;
- fragmentions[a_ion_water_and_ammonia_loss].name = "A*x";
- fragmentions[a_ion_water_and_ammonia_loss].massdifference = A_ION - H2O - NH3 + nterminusshift;
- fragmentions[a_ion_water_and_ammonia_loss].parent = a_ion;
+ fragmentions[a_ion_dehydrated_and_deamidated].nterminal = true;
+ fragmentions[a_ion_dehydrated_and_deamidated].cterminal = false;
+ fragmentions[a_ion_dehydrated_and_deamidated].name = "A*x";
+ fragmentions[a_ion_dehydrated_and_deamidated].massdifference = A_ION - H2O - NH3 + nterminusshift + adductshift;
+ fragmentions[a_ion_dehydrated_and_deamidated].parent = a_ion;
+
+ // initialize B-ion
+ fragmentions[b_ion].nterminal = true;
+ fragmentions[b_ion].cterminal = false;
+ fragmentions[b_ion].name = "B";
+ fragmentions[b_ion].massdifference = B_ION + nterminusshift + adductshift;
+ fragmentions[b_ion].parent = b_ion;
+
+ // initialize B-H2O ion
+ fragmentions[b_ion_dehydrated].nterminal = true;
+ fragmentions[b_ion_dehydrated].cterminal = false;
+ fragmentions[b_ion_dehydrated].name = "B*";
+ fragmentions[b_ion_dehydrated].massdifference = B_ION - H2O + nterminusshift + adductshift;
+ fragmentions[b_ion_dehydrated].parent = b_ion;
+
+ // initialize B-NH3 ion
+ fragmentions[b_ion_deamidated].nterminal = true;
+ fragmentions[b_ion_deamidated].cterminal = false;
+ fragmentions[b_ion_deamidated].name = "Bx";
+ fragmentions[b_ion_deamidated].massdifference = B_ION - NH3 + nterminusshift + adductshift;
+ fragmentions[b_ion_deamidated].parent = b_ion;
+
+ // initialize B-H2O-NH3 ion
+ fragmentions[b_ion_dehydrated_and_deamidated].nterminal = true;
+ fragmentions[b_ion_dehydrated_and_deamidated].cterminal = false;
+ fragmentions[b_ion_dehydrated_and_deamidated].name = "B*x";
+ fragmentions[b_ion_dehydrated_and_deamidated].massdifference = B_ION - H2O - NH3 + nterminusshift + adductshift;
+ fragmentions[b_ion_dehydrated_and_deamidated].parent = b_ion;
+
+ // initialize C-ion
+ fragmentions[c_ion].nterminal = true;
+ fragmentions[c_ion].cterminal = false;
+ fragmentions[c_ion].name = "C";
+ fragmentions[c_ion].massdifference = C_ION + nterminusshift + adductshift;
+ fragmentions[c_ion].parent = c_ion;
+
+ // initialize C-H2O ion
+ fragmentions[c_ion_dehydrated].nterminal = true;
+ fragmentions[c_ion_dehydrated].cterminal = false;
+ fragmentions[c_ion_dehydrated].name = "C*";
+ fragmentions[c_ion_dehydrated].massdifference = C_ION - H2O + nterminusshift + adductshift;
+ fragmentions[c_ion_dehydrated].parent = c_ion;
+
+ // initialize C-NH3 ion
+ fragmentions[c_ion_deamidated].nterminal = true;
+ fragmentions[c_ion_deamidated].cterminal = false;
+ fragmentions[c_ion_deamidated].name = "Cx";
+ fragmentions[c_ion_deamidated].massdifference = C_ION - NH3 + nterminusshift + adductshift;
+ fragmentions[c_ion_deamidated].parent = c_ion;
+
+ // initialize C-H2O-NH3 ion
+ fragmentions[c_ion_dehydrated_and_deamidated].nterminal = true;
+ fragmentions[c_ion_dehydrated_and_deamidated].cterminal = false;
+ fragmentions[c_ion_dehydrated_and_deamidated].name = "C*x";
+ fragmentions[c_ion_dehydrated_and_deamidated].massdifference = C_ION - H2O - NH3 + nterminusshift + adductshift;
+ fragmentions[c_ion_dehydrated_and_deamidated].parent = c_ion;
+
+ // initialize X ion
+ fragmentions[x_ion].nterminal = false;
+ fragmentions[x_ion].cterminal = true;
+ fragmentions[x_ion].name = "X";
+ fragmentions[x_ion].massdifference = X_ION + cterminusshift + adductshift;
+ fragmentions[x_ion].parent = x_ion;
+
+ // initialize X-H2O ion
+ fragmentions[x_ion_dehydrated].nterminal = false;
+ fragmentions[x_ion_dehydrated].cterminal = true;
+ fragmentions[x_ion_dehydrated].name = "X*";
+ fragmentions[x_ion_dehydrated].massdifference = X_ION - H2O + cterminusshift + adductshift;
+ fragmentions[x_ion_dehydrated].parent = x_ion;
+
+ // initialize X-NH3 ion
+ fragmentions[x_ion_deamidated].nterminal = false;
+ fragmentions[x_ion_deamidated].cterminal = true;
+ fragmentions[x_ion_deamidated].name = "Xx";
+ fragmentions[x_ion_deamidated].massdifference = X_ION - NH3 + cterminusshift + adductshift;
+ fragmentions[x_ion_deamidated].parent = x_ion;
+
+ // initialize X-H2O-NH3 ion
+ fragmentions[x_ion_dehydrated_and_deamidated].nterminal = false;
+ fragmentions[x_ion_dehydrated_and_deamidated].cterminal = true;
+ fragmentions[x_ion_dehydrated_and_deamidated].name = "X*x";
+ fragmentions[x_ion_dehydrated_and_deamidated].massdifference = X_ION - H2O - NH3 + cterminusshift + adductshift;
+ fragmentions[x_ion_dehydrated_and_deamidated].parent = x_ion;
// initialize Y ion
fragmentions[y_ion].nterminal = false;
fragmentions[y_ion].cterminal = true;
fragmentions[y_ion].name = "Y";
- fragmentions[y_ion].massdifference = Y_ION + cterminusshift;
+ fragmentions[y_ion].massdifference = Y_ION + cterminusshift + adductshift;
fragmentions[y_ion].parent = y_ion;
// initialize Y-H2O ion
- fragmentions[y_ion_water_loss].nterminal = false;
- fragmentions[y_ion_water_loss].cterminal = true;
- fragmentions[y_ion_water_loss].name = "Y*";
- fragmentions[y_ion_water_loss].massdifference = Y_ION - H2O + cterminusshift;
- fragmentions[y_ion_water_loss].parent = y_ion;
+ fragmentions[y_ion_dehydrated].nterminal = false;
+ fragmentions[y_ion_dehydrated].cterminal = true;
+ fragmentions[y_ion_dehydrated].name = "Y*";
+ fragmentions[y_ion_dehydrated].massdifference = Y_ION - H2O + cterminusshift + adductshift;
+ fragmentions[y_ion_dehydrated].parent = y_ion;
// initialize Y-NH3 ion
- fragmentions[y_ion_ammonia_loss].nterminal = false;
- fragmentions[y_ion_ammonia_loss].cterminal = true;
- fragmentions[y_ion_ammonia_loss].name = "Yx";
- fragmentions[y_ion_ammonia_loss].massdifference = Y_ION - NH3 + cterminusshift;
- fragmentions[y_ion_ammonia_loss].parent = y_ion;
+ fragmentions[y_ion_deamidated].nterminal = false;
+ fragmentions[y_ion_deamidated].cterminal = true;
+ fragmentions[y_ion_deamidated].name = "Yx";
+ fragmentions[y_ion_deamidated].massdifference = Y_ION - NH3 + cterminusshift + adductshift;
+ fragmentions[y_ion_deamidated].parent = y_ion;
// initialize Y-H2O-NH3 ion
- fragmentions[y_ion_water_and_ammonia_loss].nterminal = false;
- fragmentions[y_ion_water_and_ammonia_loss].cterminal = true;
- fragmentions[y_ion_water_and_ammonia_loss].name = "Y*x";
- fragmentions[y_ion_water_and_ammonia_loss].massdifference = Y_ION - H2O - NH3 + cterminusshift;
- fragmentions[y_ion_water_and_ammonia_loss].parent = y_ion;
+ fragmentions[y_ion_dehydrated_and_deamidated].nterminal = false;
+ fragmentions[y_ion_dehydrated_and_deamidated].cterminal = true;
+ fragmentions[y_ion_dehydrated_and_deamidated].name = "Y*x";
+ fragmentions[y_ion_dehydrated_and_deamidated].massdifference = Y_ION - H2O - NH3 + cterminusshift + adductshift;
+ fragmentions[y_ion_dehydrated_and_deamidated].parent = y_ion;
+
+ // initialize Z ion
+ fragmentions[z_ion].nterminal = false;
+ fragmentions[z_ion].cterminal = true;
+ fragmentions[z_ion].name = "Z";
+ fragmentions[z_ion].massdifference = Z_ION + cterminusshift + adductshift;
+ fragmentions[z_ion].parent = z_ion;
+
+ // initialize Z-H2O ion
+ fragmentions[z_ion_dehydrated].nterminal = false;
+ fragmentions[z_ion_dehydrated].cterminal = true;
+ fragmentions[z_ion_dehydrated].name = "Z*";
+ fragmentions[z_ion_dehydrated].massdifference = Z_ION - H2O + cterminusshift + adductshift;
+ fragmentions[z_ion_dehydrated].parent = z_ion;
+
+ // initialize Z-NH3 ion
+ fragmentions[z_ion_deamidated].nterminal = false;
+ fragmentions[z_ion_deamidated].cterminal = true;
+ fragmentions[z_ion_deamidated].name = "Zx";
+ fragmentions[z_ion_deamidated].massdifference = Z_ION - NH3 + cterminusshift + adductshift;
+ fragmentions[z_ion_deamidated].parent = z_ion;
+
+ // initialize Z-H2O-NH3 ion
+ fragmentions[z_ion_dehydrated_and_deamidated].nterminal = false;
+ fragmentions[z_ion_dehydrated_and_deamidated].cterminal = true;
+ fragmentions[z_ion_dehydrated_and_deamidated].name = "Z*x";
+ fragmentions[z_ion_dehydrated_and_deamidated].massdifference = Z_ION - H2O - NH3 + cterminusshift + adductshift;
+ fragmentions[z_ion_dehydrated_and_deamidated].parent = z_ion;
// initialize precursor ion
fragmentions[precursor_ion].nterminal = false;
fragmentions[precursor_ion].cterminal = false;
fragmentions[precursor_ion].name = "[M+zH]+";
- fragmentions[precursor_ion].massdifference = PRECURSOR_ION + nterminusshift + cterminusshift;
+ fragmentions[precursor_ion].massdifference = PRECURSOR_ION + nterminusshift + cterminusshift + adductshift;
fragmentions[precursor_ion].parent = precursor_ion;
// initialize precursor ion - H2O
- fragmentions[precursor_ion_water_loss].nterminal = false;
- fragmentions[precursor_ion_water_loss].cterminal = false;
- fragmentions[precursor_ion_water_loss].name = "[M+zH]+ *";
- fragmentions[precursor_ion_water_loss].massdifference = PRECURSOR_ION - H2O + nterminusshift + cterminusshift;
- fragmentions[precursor_ion_water_loss].parent = precursor_ion;
+ fragmentions[precursor_ion_dehydrated].nterminal = false;
+ fragmentions[precursor_ion_dehydrated].cterminal = false;
+ fragmentions[precursor_ion_dehydrated].name = "[M+zH]+ *";
+ fragmentions[precursor_ion_dehydrated].massdifference = PRECURSOR_ION - H2O + nterminusshift + cterminusshift + adductshift;
+ fragmentions[precursor_ion_dehydrated].parent = precursor_ion;
// initialize precursor ion - NH3
- fragmentions[precursor_ion_ammonia_loss].nterminal = false;
- fragmentions[precursor_ion_ammonia_loss].cterminal = false;
- fragmentions[precursor_ion_ammonia_loss].name = "[M+zH]+ x";
- fragmentions[precursor_ion_ammonia_loss].massdifference = PRECURSOR_ION - NH3 + nterminusshift + cterminusshift;
- fragmentions[precursor_ion_ammonia_loss].parent = precursor_ion;
+ fragmentions[precursor_ion_deamidated].nterminal = false;
+ fragmentions[precursor_ion_deamidated].cterminal = false;
+ fragmentions[precursor_ion_deamidated].name = "[M+zH]+ x";
+ fragmentions[precursor_ion_deamidated].massdifference = PRECURSOR_ION - NH3 + nterminusshift + cterminusshift + adductshift;
+ fragmentions[precursor_ion_deamidated].parent = precursor_ion;
// initialize precursor ion - H2O - NH3
- fragmentions[precursor_ion_water_and_ammonia_loss].nterminal = false;
- fragmentions[precursor_ion_water_and_ammonia_loss].cterminal = false;
- fragmentions[precursor_ion_water_and_ammonia_loss].name = "[M+zH]+ *x";
- fragmentions[precursor_ion_water_and_ammonia_loss].massdifference = PRECURSOR_ION - H2O - NH3 + nterminusshift + cterminusshift;
- fragmentions[precursor_ion_water_and_ammonia_loss].parent = precursor_ion;
+ fragmentions[precursor_ion_dehydrated_and_deamidated].nterminal = false;
+ fragmentions[precursor_ion_dehydrated_and_deamidated].cterminal = false;
+ fragmentions[precursor_ion_dehydrated_and_deamidated].name = "[M+zH]+ *x";
+ fragmentions[precursor_ion_dehydrated_and_deamidated].massdifference = PRECURSOR_ION - H2O - NH3 + nterminusshift + cterminusshift + adductshift;
+ fragmentions[precursor_ion_dehydrated_and_deamidated].parent = precursor_ion;
// initialize precursor ion - CO
fragmentions[precursor_ion_co_loss].nterminal = false;
fragmentions[precursor_ion_co_loss].cterminal = false;
fragmentions[precursor_ion_co_loss].name = "[M+zH]+ -CO";
- fragmentions[precursor_ion_co_loss].massdifference = PRECURSOR_ION - CO + nterminusshift + cterminusshift;
+ fragmentions[precursor_ion_co_loss].massdifference = PRECURSOR_ION - CO + nterminusshift + cterminusshift + adductshift;
fragmentions[precursor_ion_co_loss].parent = precursor_ion;
// initialize precursor ion - CO - H2O
- fragmentions[precursor_ion_co_loss_water_loss].nterminal = false;
- fragmentions[precursor_ion_co_loss_water_loss].cterminal = false;
- fragmentions[precursor_ion_co_loss_water_loss].name = "[M+zH]+ *-CO";
- fragmentions[precursor_ion_co_loss_water_loss].massdifference = PRECURSOR_ION - CO - H2O + nterminusshift + cterminusshift;
- fragmentions[precursor_ion_co_loss_water_loss].parent = precursor_ion_co_loss;
+ fragmentions[precursor_ion_co_loss_and_dehydrated].nterminal = false;
+ fragmentions[precursor_ion_co_loss_and_dehydrated].cterminal = false;
+ fragmentions[precursor_ion_co_loss_and_dehydrated].name = "[M+zH]+ *-CO";
+ fragmentions[precursor_ion_co_loss_and_dehydrated].massdifference = PRECURSOR_ION - CO - H2O + nterminusshift + cterminusshift + adductshift;
+ fragmentions[precursor_ion_co_loss_and_dehydrated].parent = precursor_ion_co_loss;
// initialize precursor ion - CO - NH3
- fragmentions[precursor_ion_co_loss_ammonia_loss].nterminal = false;
- fragmentions[precursor_ion_co_loss_ammonia_loss].cterminal = false;
- fragmentions[precursor_ion_co_loss_ammonia_loss].name = "[M+zH]+ x-CO";
- fragmentions[precursor_ion_co_loss_ammonia_loss].massdifference = PRECURSOR_ION - CO - NH3 + nterminusshift + cterminusshift;
- fragmentions[precursor_ion_co_loss_ammonia_loss].parent = precursor_ion_co_loss;
+ fragmentions[precursor_ion_co_loss_and_deamidated].nterminal = false;
+ fragmentions[precursor_ion_co_loss_and_deamidated].cterminal = false;
+ fragmentions[precursor_ion_co_loss_and_deamidated].name = "[M+zH]+ x-CO";
+ fragmentions[precursor_ion_co_loss_and_deamidated].massdifference = PRECURSOR_ION - CO - NH3 + nterminusshift + cterminusshift + adductshift;
+ fragmentions[precursor_ion_co_loss_and_deamidated].parent = precursor_ion_co_loss;
// initialize precursor ion - CO - H2O - NH3
- fragmentions[precursor_ion_co_loss_water_and_ammonia_loss].nterminal = false;
- fragmentions[precursor_ion_co_loss_water_and_ammonia_loss].cterminal = false;
- fragmentions[precursor_ion_co_loss_water_and_ammonia_loss].name = "[M+zH]+ *x-CO";
- fragmentions[precursor_ion_co_loss_water_and_ammonia_loss].massdifference = PRECURSOR_ION - CO - H2O - NH3 + nterminusshift + cterminusshift;
- fragmentions[precursor_ion_co_loss_water_and_ammonia_loss].parent = precursor_ion_co_loss;
+ fragmentions[precursor_ion_co_loss_and_dehydrated_and_deamidated].nterminal = false;
+ fragmentions[precursor_ion_co_loss_and_dehydrated_and_deamidated].cterminal = false;
+ fragmentions[precursor_ion_co_loss_and_dehydrated_and_deamidated].name = "[M+zH]+ *x-CO";
+ fragmentions[precursor_ion_co_loss_and_dehydrated_and_deamidated].massdifference = PRECURSOR_ION - CO - H2O - NH3 + nterminusshift + cterminusshift + adductshift;
+ fragmentions[precursor_ion_co_loss_and_dehydrated_and_deamidated].parent = precursor_ion_co_loss;
// initialize cyclic precursor ion
fragmentions[cyclic_precursor_ion].nterminal = false;
fragmentions[cyclic_precursor_ion].cterminal = false;
fragmentions[cyclic_precursor_ion].name = "[M+zH]+";
- fragmentions[cyclic_precursor_ion].massdifference = PRECURSOR_ION_CYCLIC;
+ fragmentions[cyclic_precursor_ion].massdifference = PRECURSOR_ION_CYCLIC + adductshift;
fragmentions[cyclic_precursor_ion].parent = cyclic_precursor_ion;
// initialize cyclic precursor ion - H2O
- fragmentions[cyclic_precursor_ion_water_loss].nterminal = false;
- fragmentions[cyclic_precursor_ion_water_loss].cterminal = false;
- fragmentions[cyclic_precursor_ion_water_loss].name = "[M+zH]+ *";
- fragmentions[cyclic_precursor_ion_water_loss].massdifference = PRECURSOR_ION_CYCLIC - H2O;
- fragmentions[cyclic_precursor_ion_water_loss].parent = cyclic_precursor_ion;
+ fragmentions[cyclic_precursor_ion_dehydrated].nterminal = false;
+ fragmentions[cyclic_precursor_ion_dehydrated].cterminal = false;
+ fragmentions[cyclic_precursor_ion_dehydrated].name = "[M+zH]+ *";
+ fragmentions[cyclic_precursor_ion_dehydrated].massdifference = PRECURSOR_ION_CYCLIC - H2O + adductshift;
+ fragmentions[cyclic_precursor_ion_dehydrated].parent = cyclic_precursor_ion;
// initialize cyclic precursor ion - NH3
- fragmentions[cyclic_precursor_ion_ammonia_loss].nterminal = false;
- fragmentions[cyclic_precursor_ion_ammonia_loss].cterminal = false;
- fragmentions[cyclic_precursor_ion_ammonia_loss].name = "[M+zH]+ x";
- fragmentions[cyclic_precursor_ion_ammonia_loss].massdifference = PRECURSOR_ION_CYCLIC - NH3;
- fragmentions[cyclic_precursor_ion_ammonia_loss].parent = cyclic_precursor_ion;
+ fragmentions[cyclic_precursor_ion_deamidated].nterminal = false;
+ fragmentions[cyclic_precursor_ion_deamidated].cterminal = false;
+ fragmentions[cyclic_precursor_ion_deamidated].name = "[M+zH]+ x";
+ fragmentions[cyclic_precursor_ion_deamidated].massdifference = PRECURSOR_ION_CYCLIC - NH3 + adductshift;
+ fragmentions[cyclic_precursor_ion_deamidated].parent = cyclic_precursor_ion;
// initialize cyclic precursor ion - H2O - NH3
- fragmentions[cyclic_precursor_ion_water_and_ammonia_loss].nterminal = false;
- fragmentions[cyclic_precursor_ion_water_and_ammonia_loss].cterminal = false;
- fragmentions[cyclic_precursor_ion_water_and_ammonia_loss].name = "[M+zH]+ *x";
- fragmentions[cyclic_precursor_ion_water_and_ammonia_loss].massdifference = PRECURSOR_ION_CYCLIC - H2O - NH3;
- fragmentions[cyclic_precursor_ion_water_and_ammonia_loss].parent = cyclic_precursor_ion;
+ fragmentions[cyclic_precursor_ion_dehydrated_and_deamidated].nterminal = false;
+ fragmentions[cyclic_precursor_ion_dehydrated_and_deamidated].cterminal = false;
+ fragmentions[cyclic_precursor_ion_dehydrated_and_deamidated].name = "[M+zH]+ *x";
+ fragmentions[cyclic_precursor_ion_dehydrated_and_deamidated].massdifference = PRECURSOR_ION_CYCLIC - H2O - NH3 + adductshift;
+ fragmentions[cyclic_precursor_ion_dehydrated_and_deamidated].parent = cyclic_precursor_ion;
// initialize cyclic precursor ion - CO
fragmentions[cyclic_precursor_ion_co_loss].nterminal = false;
fragmentions[cyclic_precursor_ion_co_loss].cterminal = false;
fragmentions[cyclic_precursor_ion_co_loss].name = "[M+zH]+ -CO";
- fragmentions[cyclic_precursor_ion_co_loss].massdifference = PRECURSOR_ION_CYCLIC - CO;
+ fragmentions[cyclic_precursor_ion_co_loss].massdifference = PRECURSOR_ION_CYCLIC - CO + adductshift;
fragmentions[cyclic_precursor_ion_co_loss].parent = cyclic_precursor_ion;
// initialize cyclic precursor ion - CO - H2O
- fragmentions[cyclic_precursor_ion_co_loss_water_loss].nterminal = false;
- fragmentions[cyclic_precursor_ion_co_loss_water_loss].cterminal = false;
- fragmentions[cyclic_precursor_ion_co_loss_water_loss].name = "[M+zH]+ *-CO";
- fragmentions[cyclic_precursor_ion_co_loss_water_loss].massdifference = PRECURSOR_ION_CYCLIC - CO - H2O;
- fragmentions[cyclic_precursor_ion_co_loss_water_loss].parent = cyclic_precursor_ion_co_loss;
+ fragmentions[cyclic_precursor_ion_co_loss_and_dehydrated].nterminal = false;
+ fragmentions[cyclic_precursor_ion_co_loss_and_dehydrated].cterminal = false;
+ fragmentions[cyclic_precursor_ion_co_loss_and_dehydrated].name = "[M+zH]+ *-CO";
+ fragmentions[cyclic_precursor_ion_co_loss_and_dehydrated].massdifference = PRECURSOR_ION_CYCLIC - CO - H2O + adductshift;
+ fragmentions[cyclic_precursor_ion_co_loss_and_dehydrated].parent = cyclic_precursor_ion_co_loss;
// initialize cyclic precursor ion - CO - NH3
- fragmentions[cyclic_precursor_ion_co_loss_ammonia_loss].nterminal = false;
- fragmentions[cyclic_precursor_ion_co_loss_ammonia_loss].cterminal = false;
- fragmentions[cyclic_precursor_ion_co_loss_ammonia_loss].name = "[M+zH]+ x-CO";
- fragmentions[cyclic_precursor_ion_co_loss_ammonia_loss].massdifference = PRECURSOR_ION_CYCLIC - CO - NH3;
- fragmentions[cyclic_precursor_ion_co_loss_ammonia_loss].parent = cyclic_precursor_ion_co_loss;
+ fragmentions[cyclic_precursor_ion_co_loss_and_deamidated].nterminal = false;
+ fragmentions[cyclic_precursor_ion_co_loss_and_deamidated].cterminal = false;
+ fragmentions[cyclic_precursor_ion_co_loss_and_deamidated].name = "[M+zH]+ x-CO";
+ fragmentions[cyclic_precursor_ion_co_loss_and_deamidated].massdifference = PRECURSOR_ION_CYCLIC - CO - NH3 + adductshift;
+ fragmentions[cyclic_precursor_ion_co_loss_and_deamidated].parent = cyclic_precursor_ion_co_loss;
// initialize cyclic precursor ion - CO - H2O - NH3
- fragmentions[cyclic_precursor_ion_co_loss_water_and_ammonia_loss].nterminal = false;
- fragmentions[cyclic_precursor_ion_co_loss_water_and_ammonia_loss].cterminal = false;
- fragmentions[cyclic_precursor_ion_co_loss_water_and_ammonia_loss].name = "[M+zH]+ *x-CO";
- fragmentions[cyclic_precursor_ion_co_loss_water_and_ammonia_loss].massdifference = PRECURSOR_ION_CYCLIC - CO - H2O - NH3;
- fragmentions[cyclic_precursor_ion_co_loss_water_and_ammonia_loss].parent = cyclic_precursor_ion_co_loss;
+ fragmentions[cyclic_precursor_ion_co_loss_and_dehydrated_and_deamidated].nterminal = false;
+ fragmentions[cyclic_precursor_ion_co_loss_and_dehydrated_and_deamidated].cterminal = false;
+ fragmentions[cyclic_precursor_ion_co_loss_and_dehydrated_and_deamidated].name = "[M+zH]+ *x-CO";
+ fragmentions[cyclic_precursor_ion_co_loss_and_dehydrated_and_deamidated].massdifference = PRECURSOR_ION_CYCLIC - CO - H2O - NH3 + adductshift;
+ fragmentions[cyclic_precursor_ion_co_loss_and_dehydrated_and_deamidated].parent = cyclic_precursor_ion_co_loss;
// initialize MS N-terminal ion H+
fragmentions[ms_nterminal_ion_hplus].nterminal = true;
@@ -554,7 +594,7 @@ void cFragmentIons::store(ofstream& os) {
os.write((char *)&size, sizeof(int));
for (map::iterator it = fragmentions.begin(); it != fragmentions.end(); ++it) {
os.write((char *)&it->first, sizeof(fragmentIonType));
- os.write((char *)&it->second, sizeof(fragmentDescription));
+ it->second.store(os);
}
}
@@ -568,7 +608,7 @@ void cFragmentIons::load(ifstream& is) {
fragmentions.clear();
for (int i = 0; i < size; i++) {
is.read((char *)&iontype, sizeof(fragmentIonType));
- is.read((char *)&description, sizeof(fragmentDescription));
+ description.load(is);
fragmentions[iontype] = description;
}
}
@@ -605,3 +645,130 @@ void initializeFragmentIonsForDeNovoGraphOfLinearPolysaccharide(vector& modifications, string& errormessage, bool ignoreerrors) {
+ string s;
+ fragmentDescription modification;
+ size_t pos;
+ double mass;
+
+ bool error = false;
+ errormessage = "";
+ cSummaryFormula formula;
+
+ modifications.clear();
+ while (stream.good()) {
+ getline(stream,s);
+
+ // skip a comment
+ if ((s.length() > 0) && (s[0] == '#')) {
+ continue;
+ }
+
+ // replaces commas with dots
+ pos = s.find(',');
+ while (pos != string::npos) {
+ s.replace(pos, 1, ".");
+ pos = s.find(',');
+ }
+
+ modification.clear();
+
+ // load the name
+ pos = s.find('\t');
+ if (pos != string::npos) {
+ modification.name = s.substr(0, pos);
+ s = s.substr(pos + 1);
+ }
+ else {
+ break;
+ }
+
+ // load summary
+ pos = s.find('\t');
+ if (pos != string::npos) {
+ modification.summary = s.substr(0, pos);
+ s = s.substr(pos + 1);
+ }
+ else {
+ break;
+ }
+
+ // load the mass (unused !)
+ pos = s.find('\t');
+ if (pos != string::npos) {
+ sscanf_s(s.substr(0, pos).c_str(), "%lf", &mass);
+ s = s.substr(pos + 1);
+ }
+ else {
+ break;
+ }
+
+
+ // load N-terminal flag
+ pos = s.find('\t');
+ if (pos != string::npos) {
+ modification.nterminal = (s.substr(0, pos).compare("0") == 0)?false:true;
+ s = s.substr(pos + 1);
+ }
+ else {
+ break;
+ }
+
+
+ // load C-terminal flag
+ #if OS_TYPE == UNX
+ if ((s.size() > 0) && (s.back() == '\r')) {
+ s = s.substr(0, s.size() - 1);
+ }
+ #endif
+ modification.cterminal = (s.compare("0") == 0)?false:true;
+
+
+ // calculate mass from the summary
+ formula.clear();
+ formula.setFormula(modification.summary);
+ if (formula.isValid(errormessage)) {
+ modification.massdifference = formula.getMass();
+ }
+ else {
+ if (!ignoreerrors) {
+ error = true;
+ break;
+ }
+ }
+
+ modifications.push_back(modification);
+
+ }
+
+ if (!ignoreerrors && error) {
+ return -1;
+ }
+
+ return 0;
+}
+
+
+void storeModificationsToPlainTextStream(ofstream &stream, vector& modifications) {
+ for (int i = 0; i < (int)modifications.size(); i++) {
+ stream << removeWhiteSpacesExceptSpaces(modifications[i].name) << "\t";
+ stream << removeWhiteSpacesExceptSpaces(modifications[i].summary) << "\t";
+ stream << std::fixed << std::setprecision(10) << modifications[i].massdifference << "\t";
+
+ if (modifications[i].nterminal) {
+ stream << 1 << "\t";
+ }
+ else {
+ stream << 0 << "\t";
+ }
+
+ if (modifications[i].cterminal) {
+ stream << 1 << endl;
+ }
+ else {
+ stream << 0 << endl;
+ }
+ }
+}
+
diff --git a/CycloBranch/core/cFragmentIons.h b/CycloBranch/core/cFragmentIons.h
index 66cda9b..aab7545 100644
--- a/CycloBranch/core/cFragmentIons.h
+++ b/CycloBranch/core/cFragmentIons.h
@@ -9,8 +9,8 @@
#include
#include
+#include
#include
-#include
#include