Release mathmech 1.0.1

This commit is contained in:
arcan1s
2013-08-29 04:46:58 +04:00
parent 69fd9fd15e
commit d049cd091c
38 changed files with 623 additions and 516 deletions
+32
View File
@@ -0,0 +1,32 @@
# Author: Evgeniy "arcanis" Alexeev <esalexeev@gmail.com>
# Maintainer: Evgeniy "arcanis" Alexeev <esalexeev@gmail.com>
pkgname=mathmech
pkgver=1.0.1
pkgrel=1
pkgdesc="Software package for analysis of molecular dynamics trajectories"
arch=(any)
url="https://github.com/arcan1s/moldyn/mathmech"
license=('GPL')
depends=('qt4' 'qwt')
makedepends=('unzip' 'cmake' 'automoc4')
source=(https://github.com/arcan1s/moldyn/releases/download/mm-1.0.1/${pkgname}-${pkgver}.zip)
md5sums=('5fab4bc7707d580ff41d384b1875b32c')
build ()
{
unzip -o -q ${srcdir}/${pkgname}-${pkgver}.zip -d ${srcdir}/${pkgname}
if [ -d ${srcdir}/${pkgname}/build ]; then
rm -rf build
fi
mkdir ${srcdir}/${pkgname}/build && cd ${srcdir}/${pkgname}/build
cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ../
make
}
package()
{
cd ${srcdir}/${pkgname}/build
make DESTDIR=${pkgdir} install
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

+9
View File
@@ -0,0 +1,9 @@
[Desktop Entry]
Name=Mathematical Molecular Mechanics
Comment=GUI for mathmech program pack
Exec=mathmech
Icon=mathmech-logo
Terminal=false
Encoding=UTF-8
Type=Application
Categories=Qt;Science;Chemistry;Physics;Education;
Binary file not shown.
+218 -216
View File
@@ -383,562 +383,564 @@ p, li { white-space: pre-wrap; }
<translation>Ready</translation> <translation>Ready</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="236"/> <location filename="../../src/mainwindow.cpp" line="246"/>
<location filename="../../src/mainwindow.cpp" line="290"/> <location filename="../../src/mainwindow.cpp" line="300"/>
<location filename="../../src/mainwindow.cpp" line="333"/> <location filename="../../src/mainwindow.cpp" line="343"/>
<location filename="../../src/mainwindow.cpp" line="376"/> <location filename="../../src/mainwindow.cpp" line="386"/>
<location filename="../../src/mainwindow.cpp" line="419"/> <location filename="../../src/mainwindow.cpp" line="429"/>
<source>Select work directory</source> <source>Select work directory</source>
<translation>Select work directory</translation> <translation>Select work directory</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="246"/> <location filename="../../src/mainwindow.cpp" line="256"/>
<location filename="../../src/mainwindow.cpp" line="343"/> <location filename="../../src/mainwindow.cpp" line="353"/>
<location filename="../../src/mainwindow.cpp" line="429"/> <location filename="../../src/mainwindow.cpp" line="439"/>
<source>Select trajectory file</source> <source>Select trajectory file</source>
<translation>Select trajectory file</translation> <translation>Select trajectory file</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="248"/> <location filename="../../src/mainwindow.cpp" line="258"/>
<source>All files (*.*)</source> <source>All files (*.*)</source>
<translation>All files (*.*)</translation> <translation>All files (*.*)</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="257"/> <location filename="../../src/mainwindow.cpp" line="267"/>
<source>Select atom types file</source> <source>Select atom types file</source>
<translation>Select atom types file</translation> <translation>Select atom types file</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="259"/> <location filename="../../src/mainwindow.cpp" line="269"/>
<source>Atom types files (*.types);;All files (*.*)</source> <source>Atom types files (*.types);;All files (*.*)</source>
<translation>Atom types files (*.types);;All files (*.*)</translation> <translation>Atom types files (*.types);;All files (*.*)</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="268"/> <location filename="../../src/mainwindow.cpp" line="278"/>
<source>Save files as</source> <source>Save files as</source>
<translation>Save files as</translation> <translation>Save files as</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="270"/> <location filename="../../src/mainwindow.cpp" line="280"/>
<source>Mask of trajectory files</source> <source>Mask of trajectory files</source>
<translation>Mask of trajectory files</translation> <translation>Mask of trajectory files</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="279"/> <location filename="../../src/mainwindow.cpp" line="289"/>
<location filename="../../src/mainwindow.cpp" line="322"/> <location filename="../../src/mainwindow.cpp" line="332"/>
<location filename="../../src/mainwindow.cpp" line="365"/> <location filename="../../src/mainwindow.cpp" line="375"/>
<location filename="../../src/mainwindow.cpp" line="408"/> <location filename="../../src/mainwindow.cpp" line="418"/>
<location filename="../../src/mainwindow.cpp" line="462"/> <location filename="../../src/mainwindow.cpp" line="472"/>
<source>Save log file as...</source> <source>Save log file as...</source>
<translation>Save log file as...</translation> <translation>Save log file as...</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="281"/> <location filename="../../src/mainwindow.cpp" line="291"/>
<location filename="../../src/mainwindow.cpp" line="324"/> <location filename="../../src/mainwindow.cpp" line="334"/>
<location filename="../../src/mainwindow.cpp" line="367"/> <location filename="../../src/mainwindow.cpp" line="377"/>
<location filename="../../src/mainwindow.cpp" line="410"/> <location filename="../../src/mainwindow.cpp" line="420"/>
<location filename="../../src/mainwindow.cpp" line="464"/> <location filename="../../src/mainwindow.cpp" line="474"/>
<source>Log files (*.log)</source> <source>Log files (*.log)</source>
<translation>Log files (*.log)</translation> <translation>Log files (*.log)</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="300"/> <location filename="../../src/mainwindow.cpp" line="310"/>
<location filename="../../src/mainwindow.cpp" line="386"/> <location filename="../../src/mainwindow.cpp" line="396"/>
<source>Select trajectory files</source> <source>Select trajectory files</source>
<translation>Select trajectory files</translation> <translation>Select trajectory files</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="302"/> <location filename="../../src/mainwindow.cpp" line="312"/>
<location filename="../../src/mainwindow.cpp" line="345"/> <location filename="../../src/mainwindow.cpp" line="355"/>
<location filename="../../src/mainwindow.cpp" line="388"/> <location filename="../../src/mainwindow.cpp" line="398"/>
<location filename="../../src/mainwindow.cpp" line="431"/> <location filename="../../src/mainwindow.cpp" line="441"/>
<source>Trajectory files (*.*[0-9])</source> <source>Trajectory files (*.*[0-9])</source>
<translation>Trajectory files (*.*[0-9])</translation> <translation>Trajectory files (*.*[0-9])</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="311"/> <location filename="../../src/mainwindow.cpp" line="321"/>
<location filename="../../src/mainwindow.cpp" line="397"/> <location filename="../../src/mainwindow.cpp" line="407"/>
<source>Save output file as...</source> <source>Save output file as...</source>
<translation>Save output file as...</translation> <translation>Save output file as...</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="313"/> <location filename="../../src/mainwindow.cpp" line="323"/>
<location filename="../../src/mainwindow.cpp" line="399"/> <location filename="../../src/mainwindow.cpp" line="409"/>
<source>Output files (*.dat)</source> <source>Output files (*.dat)</source>
<translation>Output files (*.dat)</translation> <translation>Output files (*.dat)</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="354"/> <location filename="../../src/mainwindow.cpp" line="364"/>
<location filename="../../src/mainwindow.cpp" line="451"/> <location filename="../../src/mainwindow.cpp" line="461"/>
<source>Save PDB file as...</source> <source>Save PDB file as...</source>
<translation>Save PDB file as...</translation> <translation>Save PDB file as...</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="356"/> <location filename="../../src/mainwindow.cpp" line="366"/>
<location filename="../../src/mainwindow.cpp" line="453"/> <location filename="../../src/mainwindow.cpp" line="463"/>
<source>PDB files (*.pdb)</source> <source>PDB files (*.pdb)</source>
<translation>PDB files (*.pdb)</translation> <translation>PDB files (*.pdb)</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="440"/> <location filename="../../src/mainwindow.cpp" line="450"/>
<source>Select agglomerate file</source> <source>Select agglomerate file</source>
<translation>Select agglomerate file</translation> <translation>Select agglomerate file</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="442"/> <location filename="../../src/mainwindow.cpp" line="452"/>
<source>Agglomerate files (*.agl);;All files (*.*)</source> <source>Agglomerate files (*.agl);;All files (*.*)</source>
<translation>Agglomerate files (*.agl);;All files (*.*)</translation> <translation>Agglomerate files (*.agl);;All files (*.*)</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="611"/> <location filename="../../src/mainwindow.cpp" line="621"/>
<location filename="../../src/mainwindow.cpp" line="612"/> <location filename="../../src/mainwindow.cpp" line="622"/>
<source>Processing &apos;trj&apos;...</source> <source>Processing &apos;trj&apos;...</source>
<translation>Processing &apos;trj&apos;...</translation> <translation>Processing &apos;trj&apos;...</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="622"/> <location filename="../../src/mainwindow.cpp" line="632"/>
<location filename="../../src/mainwindow.cpp" line="703"/> <location filename="../../src/mainwindow.cpp" line="717"/>
<location filename="../../src/mainwindow.cpp" line="751"/> <location filename="../../src/mainwindow.cpp" line="765"/>
<location filename="../../src/mainwindow.cpp" line="821"/> <location filename="../../src/mainwindow.cpp" line="835"/>
<location filename="../../src/mainwindow.cpp" line="889"/> <location filename="../../src/mainwindow.cpp" line="903"/>
<source>Done</source> <source>Done</source>
<translation>Done</translation> <translation>Done</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="675"/> <location filename="../../src/mainwindow.cpp" line="689"/>
<location filename="../../src/mainwindow.cpp" line="676"/> <location filename="../../src/mainwindow.cpp" line="690"/>
<source>Processing &apos;statgen&apos;...</source> <source>Processing &apos;statgen&apos;...</source>
<translation>Processing &apos;statgen&apos;...</translation> <translation>Processing &apos;statgen&apos;...</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="741"/> <location filename="../../src/mainwindow.cpp" line="755"/>
<location filename="../../src/mainwindow.cpp" line="742"/> <location filename="../../src/mainwindow.cpp" line="756"/>
<source>Processing &apos;envir&apos;...</source> <source>Processing &apos;envir&apos;...</source>
<translation>Processing &apos;envir&apos;...</translation> <translation>Processing &apos;envir&apos;...</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="807"/> <location filename="../../src/mainwindow.cpp" line="821"/>
<location filename="../../src/mainwindow.cpp" line="808"/> <location filename="../../src/mainwindow.cpp" line="822"/>
<source>Processing &apos;radf&apos;...</source> <source>Processing &apos;radf&apos;...</source>
<translation>Processing &apos;radf&apos;...</translation> <translation>Processing &apos;radf&apos;...</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="864"/> <location filename="../../src/mainwindow.cpp" line="878"/>
<location filename="../../src/mainwindow.cpp" line="865"/> <location filename="../../src/mainwindow.cpp" line="879"/>
<source>Processing &apos;agl&apos;...</source> <source>Processing &apos;agl&apos;...</source>
<translation>Processing &apos;agl&apos;...</translation> <translation>Processing &apos;agl&apos;...</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="869"/> <location filename="../../src/mainwindow.cpp" line="883"/>
<location filename="../../src/mainwindow.cpp" line="870"/> <location filename="../../src/mainwindow.cpp" line="884"/>
<source>Processing &apos;trj2pdb&apos;...</source> <source>Processing &apos;trj2pdb&apos;...</source>
<translation>Processing &apos;trj2pdb&apos;...</translation> <translation>Processing &apos;trj2pdb&apos;...</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2187"/> <location filename="../../build/src/ui_mainwindow.h" line="2192"/>
<source>Mathematical Molecular Mechanics</source> <source>Mathematical Molecular Mechanics</source>
<translation>Mathematical Molecular Mechanics</translation> <translation>Mathematical Molecular Mechanics</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2188"/> <location filename="../../build/src/ui_mainwindow.h" line="2193"/>
<source>&amp;Quit</source> <source>&amp;Quit</source>
<translation>&amp;Quit</translation> <translation>&amp;Quit</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2190"/> <location filename="../../build/src/ui_mainwindow.h" line="2195"/>
<source>Quit</source> <source>Quit</source>
<translation>Quit</translation> <translation>Quit</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2192"/> <location filename="../../build/src/ui_mainwindow.h" line="2197"/>
<source>Ctrl+Q</source> <source>Ctrl+Q</source>
<translation>Ctrl+Q</translation> <translation>Ctrl+Q</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2193"/>
<source>&amp;Help</source> <source>&amp;Help</source>
<translation>&amp;Help</translation> <translation type="obsolete">&amp;Help</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2194"/>
<source>F1</source> <source>F1</source>
<translation>F1</translation> <translation type="obsolete">F1</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2195"/> <location filename="../../build/src/ui_mainwindow.h" line="2198"/>
<source>About</source> <source>About</source>
<translation>About</translation> <translation>About</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2196"/> <location filename="../../build/src/ui_mainwindow.h" line="2199"/>
<source>Atom &amp;types file</source> <source>Atom &amp;types file</source>
<translation>Atom &amp;types file</translation> <translation>Atom &amp;types file</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2197"/> <location filename="../../build/src/ui_mainwindow.h" line="2200"/>
<source>&amp;Agglomerate file</source> <source>&amp;Agglomerate file</source>
<translation>&amp;Agglomerate file</translation> <translation>&amp;Agglomerate file</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2198"/> <location filename="../../build/src/ui_mainwindow.h" line="2201"/>
<source>&amp;Settings</source> <source>&amp;Settings</source>
<translation>&amp;Settings</translation> <translation>&amp;Settings</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2199"/> <location filename="../../build/src/ui_mainwindow.h" line="2202"/>
<source>Ctrl+P</source>
<translation>Ctrl+P</translation>
</message>
<message>
<location filename="../../build/src/ui_mainwindow.h" line="2203"/>
<source>agl_all</source> <source>agl_all</source>
<translation>agl_all</translation> <translation>agl_all</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2200"/>
<source>statgen_all</source> <source>statgen_all</source>
<translation>statgen_all</translation> <translation type="obsolete">statgen_all</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2201"/> <location filename="../../build/src/ui_mainwindow.h" line="2204"/>
<location filename="../../build/src/ui_mainwindow.h" line="2222"/> <location filename="../../build/src/ui_mainwindow.h" line="2225"/>
<location filename="../../build/src/ui_mainwindow.h" line="2255"/> <location filename="../../build/src/ui_mainwindow.h" line="2258"/>
<location filename="../../build/src/ui_mainwindow.h" line="2272"/> <location filename="../../build/src/ui_mainwindow.h" line="2275"/>
<location filename="../../build/src/ui_mainwindow.h" line="2316"/> <location filename="../../build/src/ui_mainwindow.h" line="2319"/>
<source>Work directory</source> <source>Work directory</source>
<translation>Work directory</translation> <translation>Work directory</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2202"/> <location filename="../../build/src/ui_mainwindow.h" line="2205"/>
<location filename="../../build/src/ui_mainwindow.h" line="2204"/> <location filename="../../build/src/ui_mainwindow.h" line="2207"/>
<location filename="../../build/src/ui_mainwindow.h" line="2213"/> <location filename="../../build/src/ui_mainwindow.h" line="2216"/>
<location filename="../../build/src/ui_mainwindow.h" line="2215"/>
<location filename="../../build/src/ui_mainwindow.h" line="2218"/> <location filename="../../build/src/ui_mainwindow.h" line="2218"/>
<location filename="../../build/src/ui_mainwindow.h" line="2223"/> <location filename="../../build/src/ui_mainwindow.h" line="2221"/>
<location filename="../../build/src/ui_mainwindow.h" line="2225"/> <location filename="../../build/src/ui_mainwindow.h" line="2226"/>
<location filename="../../build/src/ui_mainwindow.h" line="2246"/> <location filename="../../build/src/ui_mainwindow.h" line="2228"/>
<location filename="../../build/src/ui_mainwindow.h" line="2249"/> <location filename="../../build/src/ui_mainwindow.h" line="2249"/>
<location filename="../../build/src/ui_mainwindow.h" line="2256"/> <location filename="../../build/src/ui_mainwindow.h" line="2252"/>
<location filename="../../build/src/ui_mainwindow.h" line="2258"/> <location filename="../../build/src/ui_mainwindow.h" line="2259"/>
<location filename="../../build/src/ui_mainwindow.h" line="2264"/> <location filename="../../build/src/ui_mainwindow.h" line="2261"/>
<location filename="../../build/src/ui_mainwindow.h" line="2268"/> <location filename="../../build/src/ui_mainwindow.h" line="2267"/>
<location filename="../../build/src/ui_mainwindow.h" line="2273"/> <location filename="../../build/src/ui_mainwindow.h" line="2271"/>
<location filename="../../build/src/ui_mainwindow.h" line="2275"/> <location filename="../../build/src/ui_mainwindow.h" line="2276"/>
<location filename="../../build/src/ui_mainwindow.h" line="2284"/> <location filename="../../build/src/ui_mainwindow.h" line="2278"/>
<location filename="../../build/src/ui_mainwindow.h" line="2306"/> <location filename="../../build/src/ui_mainwindow.h" line="2287"/>
<location filename="../../build/src/ui_mainwindow.h" line="2317"/> <location filename="../../build/src/ui_mainwindow.h" line="2309"/>
<location filename="../../build/src/ui_mainwindow.h" line="2319"/> <location filename="../../build/src/ui_mainwindow.h" line="2320"/>
<location filename="../../build/src/ui_mainwindow.h" line="2321"/> <location filename="../../build/src/ui_mainwindow.h" line="2322"/>
<location filename="../../build/src/ui_mainwindow.h" line="2327"/> <location filename="../../build/src/ui_mainwindow.h" line="2324"/>
<location filename="../../build/src/ui_mainwindow.h" line="2329"/> <location filename="../../build/src/ui_mainwindow.h" line="2330"/>
<location filename="../../build/src/ui_mainwindow.h" line="2332"/>
<source>Browse</source> <source>Browse</source>
<translation>Browse</translation> <translation>Browse</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2203"/> <location filename="../../build/src/ui_mainwindow.h" line="2206"/>
<location filename="../../build/src/ui_mainwindow.h" line="2257"/> <location filename="../../build/src/ui_mainwindow.h" line="2260"/>
<location filename="../../build/src/ui_mainwindow.h" line="2318"/> <location filename="../../build/src/ui_mainwindow.h" line="2321"/>
<source>Input file</source> <source>Input file</source>
<translation>Input file</translation> <translation>Input file</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2205"/> <location filename="../../build/src/ui_mainwindow.h" line="2208"/>
<source>Type of trajectory</source> <source>Type of trajectory</source>
<translation>Type of trajectory</translation> <translation>Type of trajectory</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2208"/> <location filename="../../build/src/ui_mainwindow.h" line="2211"/>
<source>GROMACS text</source> <source>GROMACS text</source>
<translation>GROMACS text</translation> <translation>GROMACS text</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2209"/> <location filename="../../build/src/ui_mainwindow.h" line="2212"/>
<source>PUMA</source> <source>PUMA</source>
<translation>PUMA</translation> <translation>PUMA</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2211"/> <location filename="../../build/src/ui_mainwindow.h" line="2214"/>
<source>Number of steps</source> <source>Number of steps</source>
<translation>Number of steps</translation> <translation>Number of steps</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2212"/> <location filename="../../build/src/ui_mainwindow.h" line="2215"/>
<source>Atom type file</source> <source>Atom type file</source>
<translation>Atom type file</translation> <translation>Atom type file</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2214"/> <location filename="../../build/src/ui_mainwindow.h" line="2217"/>
<source>Mask of output files</source> <source>Mask of output files</source>
<translation>Mask of output files</translation> <translation>Mask of output files</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2216"/> <location filename="../../build/src/ui_mainwindow.h" line="2219"/>
<source>Total atom types</source> <source>Total atom types</source>
<translation>Total atom types</translation> <translation>Total atom types</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2217"/> <location filename="../../build/src/ui_mainwindow.h" line="2220"/>
<location filename="../../build/src/ui_mainwindow.h" line="2248"/> <location filename="../../build/src/ui_mainwindow.h" line="2251"/>
<location filename="../../build/src/ui_mainwindow.h" line="2267"/> <location filename="../../build/src/ui_mainwindow.h" line="2270"/>
<location filename="../../build/src/ui_mainwindow.h" line="2305"/> <location filename="../../build/src/ui_mainwindow.h" line="2308"/>
<location filename="../../build/src/ui_mainwindow.h" line="2328"/> <location filename="../../build/src/ui_mainwindow.h" line="2331"/>
<source>Log</source> <source>Log</source>
<translation>Log</translation> <translation>Log</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2219"/> <location filename="../../build/src/ui_mainwindow.h" line="2222"/>
<location filename="../../build/src/ui_mainwindow.h" line="2252"/> <location filename="../../build/src/ui_mainwindow.h" line="2255"/>
<location filename="../../build/src/ui_mainwindow.h" line="2269"/> <location filename="../../build/src/ui_mainwindow.h" line="2272"/>
<location filename="../../build/src/ui_mainwindow.h" line="2307"/> <location filename="../../build/src/ui_mainwindow.h" line="2310"/>
<location filename="../../build/src/ui_mainwindow.h" line="2330"/> <location filename="../../build/src/ui_mainwindow.h" line="2333"/>
<source>Clear</source> <source>Clear</source>
<translation>Clear</translation> <translation>Clear</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2220"/> <location filename="../../build/src/ui_mainwindow.h" line="2223"/>
<location filename="../../build/src/ui_mainwindow.h" line="2253"/> <location filename="../../build/src/ui_mainwindow.h" line="2256"/>
<location filename="../../build/src/ui_mainwindow.h" line="2270"/> <location filename="../../build/src/ui_mainwindow.h" line="2273"/>
<location filename="../../build/src/ui_mainwindow.h" line="2309"/> <location filename="../../build/src/ui_mainwindow.h" line="2312"/>
<location filename="../../build/src/ui_mainwindow.h" line="2331"/> <location filename="../../build/src/ui_mainwindow.h" line="2334"/>
<source>Start</source> <source>Start</source>
<translation>Start</translation> <translation>Start</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2221"/> <location filename="../../build/src/ui_mainwindow.h" line="2224"/>
<source>Generate trajectory</source> <source>Generate trajectory</source>
<translation>Generate trajectory</translation> <translation>Generate trajectory</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2224"/> <location filename="../../build/src/ui_mainwindow.h" line="2227"/>
<location filename="../../build/src/ui_mainwindow.h" line="2274"/> <location filename="../../build/src/ui_mainwindow.h" line="2277"/>
<source>Mask of input files</source> <source>Mask of input files</source>
<translation>Mask of input files</translation> <translation>Mask of input files</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2226"/> <location filename="../../build/src/ui_mainwindow.h" line="2229"/>
<location filename="../../build/src/ui_mainwindow.h" line="2276"/> <location filename="../../build/src/ui_mainwindow.h" line="2279"/>
<source>Steps</source> <source>Steps</source>
<translation>Steps</translation> <translation>Steps</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2227"/> <location filename="../../build/src/ui_mainwindow.h" line="2230"/>
<location filename="../../build/src/ui_mainwindow.h" line="2277"/> <location filename="../../build/src/ui_mainwindow.h" line="2280"/>
<source>first</source> <source>first</source>
<translation>first</translation> <translation>first</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2228"/> <location filename="../../build/src/ui_mainwindow.h" line="2231"/>
<location filename="../../build/src/ui_mainwindow.h" line="2278"/> <location filename="../../build/src/ui_mainwindow.h" line="2281"/>
<source>last</source> <source>last</source>
<translation>last</translation> <translation>last</translation>
</message> </message>
<message>
<location filename="../../build/src/ui_mainwindow.h" line="2229"/>
<location filename="../../build/src/ui_mainwindow.h" line="2259"/>
<location filename="../../build/src/ui_mainwindow.h" line="2279"/>
<location filename="../../build/src/ui_mainwindow.h" line="2322"/>
<source>Cell, A</source>
<translation>Cell, A</translation>
</message>
<message>
<location filename="../../build/src/ui_mainwindow.h" line="2230"/>
<location filename="../../build/src/ui_mainwindow.h" line="2260"/>
<location filename="../../build/src/ui_mainwindow.h" line="2280"/>
<location filename="../../build/src/ui_mainwindow.h" line="2323"/>
<source>X</source>
<translation>X</translation>
</message>
<message>
<location filename="../../build/src/ui_mainwindow.h" line="2231"/>
<location filename="../../build/src/ui_mainwindow.h" line="2261"/>
<location filename="../../build/src/ui_mainwindow.h" line="2281"/>
<location filename="../../build/src/ui_mainwindow.h" line="2324"/>
<source>Y</source>
<translation>Y</translation>
</message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2232"/> <location filename="../../build/src/ui_mainwindow.h" line="2232"/>
<location filename="../../build/src/ui_mainwindow.h" line="2262"/> <location filename="../../build/src/ui_mainwindow.h" line="2262"/>
<location filename="../../build/src/ui_mainwindow.h" line="2282"/> <location filename="../../build/src/ui_mainwindow.h" line="2282"/>
<location filename="../../build/src/ui_mainwindow.h" line="2325"/> <location filename="../../build/src/ui_mainwindow.h" line="2325"/>
<source>Cell, A</source>
<translation>Cell, A</translation>
</message>
<message>
<location filename="../../build/src/ui_mainwindow.h" line="2233"/>
<location filename="../../build/src/ui_mainwindow.h" line="2263"/>
<location filename="../../build/src/ui_mainwindow.h" line="2283"/>
<location filename="../../build/src/ui_mainwindow.h" line="2326"/>
<source>X</source>
<translation>X</translation>
</message>
<message>
<location filename="../../build/src/ui_mainwindow.h" line="2234"/>
<location filename="../../build/src/ui_mainwindow.h" line="2264"/>
<location filename="../../build/src/ui_mainwindow.h" line="2284"/>
<location filename="../../build/src/ui_mainwindow.h" line="2327"/>
<source>Y</source>
<translation>Y</translation>
</message>
<message>
<location filename="../../build/src/ui_mainwindow.h" line="2235"/>
<location filename="../../build/src/ui_mainwindow.h" line="2265"/>
<location filename="../../build/src/ui_mainwindow.h" line="2285"/>
<location filename="../../build/src/ui_mainwindow.h" line="2328"/>
<source>Z</source> <source>Z</source>
<translation>Z</translation> <translation>Z</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2233"/> <location filename="../../build/src/ui_mainwindow.h" line="2236"/>
<source>atom 0</source> <source>atom 0</source>
<translation>atom 0</translation> <translation>atom 0</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2234"/> <location filename="../../build/src/ui_mainwindow.h" line="2237"/>
<location filename="../../build/src/ui_mainwindow.h" line="2290"/>
<location filename="../../build/src/ui_mainwindow.h" line="2293"/> <location filename="../../build/src/ui_mainwindow.h" line="2293"/>
<location filename="../../build/src/ui_mainwindow.h" line="2296"/>
<source>atom 1</source> <source>atom 1</source>
<translation>atom 1</translation> <translation>atom 1</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2235"/> <location filename="../../build/src/ui_mainwindow.h" line="2238"/>
<location filename="../../build/src/ui_mainwindow.h" line="2291"/>
<location filename="../../build/src/ui_mainwindow.h" line="2294"/> <location filename="../../build/src/ui_mainwindow.h" line="2294"/>
<location filename="../../build/src/ui_mainwindow.h" line="2297"/>
<source>atom 2</source> <source>atom 2</source>
<translation>atom 2</translation> <translation>atom 2</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2236"/> <location filename="../../build/src/ui_mainwindow.h" line="2239"/>
<location filename="../../build/src/ui_mainwindow.h" line="2292"/>
<location filename="../../build/src/ui_mainwindow.h" line="2295"/> <location filename="../../build/src/ui_mainwindow.h" line="2295"/>
<location filename="../../build/src/ui_mainwindow.h" line="2298"/>
<source>atom 3</source> <source>atom 3</source>
<translation>atom 3</translation> <translation>atom 3</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2237"/> <location filename="../../build/src/ui_mainwindow.h" line="2240"/>
<source>Interaction</source> <source>Interaction</source>
<translation>Interaction</translation> <translation>Interaction</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2240"/> <location filename="../../build/src/ui_mainwindow.h" line="2243"/>
<source>0-0</source> <source>0-0</source>
<translation>0-0</translation> <translation>0-0</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2242"/> <location filename="../../build/src/ui_mainwindow.h" line="2245"/>
<source>Save</source> <source>Save</source>
<translation>Save</translation> <translation>Save</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2243"/> <location filename="../../build/src/ui_mainwindow.h" line="2246"/>
<source>Add</source> <source>Add</source>
<translation>Add</translation> <translation>Add</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2244"/> <location filename="../../build/src/ui_mainwindow.h" line="2247"/>
<source>Remove</source> <source>Remove</source>
<translation>Remove</translation> <translation>Remove</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2245"/> <location filename="../../build/src/ui_mainwindow.h" line="2248"/>
<location filename="../../build/src/ui_mainwindow.h" line="2263"/> <location filename="../../build/src/ui_mainwindow.h" line="2266"/>
<location filename="../../build/src/ui_mainwindow.h" line="2283"/> <location filename="../../build/src/ui_mainwindow.h" line="2286"/>
<location filename="../../build/src/ui_mainwindow.h" line="2326"/> <location filename="../../build/src/ui_mainwindow.h" line="2329"/>
<source>Output file</source> <source>Output file</source>
<translation>Output file</translation> <translation>Output file</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2247"/> <location filename="../../build/src/ui_mainwindow.h" line="2250"/>
<source>Depth of search</source> <source>Depth of search</source>
<translation>Depth of search</translation> <translation>Depth of search</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2250"/> <location filename="../../build/src/ui_mainwindow.h" line="2253"/>
<source>Analysis</source> <source>Analysis</source>
<translation>Analysis</translation> <translation>Analysis</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2251"/> <location filename="../../build/src/ui_mainwindow.h" line="2254"/>
<location filename="../../build/src/ui_mainwindow.h" line="2308"/> <location filename="../../build/src/ui_mainwindow.h" line="2311"/>
<source>Graph</source> <source>Graph</source>
<translation>Graph</translation> <translation>Graph</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2254"/> <location filename="../../build/src/ui_mainwindow.h" line="2257"/>
<source>Agglomeration</source> <source>Agglomeration</source>
<translation>Agglomeration</translation> <translation>Agglomeration</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2265"/> <location filename="../../build/src/ui_mainwindow.h" line="2268"/>
<source>Molecule</source> <source>Molecule</source>
<translation>Molecule</translation> <translation>Molecule</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2266"/> <location filename="../../build/src/ui_mainwindow.h" line="2269"/>
<source>Radius</source> <source>Radius</source>
<translation>Radius</translation> <translation>Radius</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2271"/> <location filename="../../build/src/ui_mainwindow.h" line="2274"/>
<source>Environment</source> <source>Environment</source>
<translation>Environment</translation> <translation>Environment</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2287"/> <location filename="../../build/src/ui_mainwindow.h" line="2290"/>
<source>One atom function</source> <source>One atom function</source>
<translation>One atom function</translation> <translation>One atom function</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2288"/> <location filename="../../build/src/ui_mainwindow.h" line="2291"/>
<source>Three atom function</source> <source>Three atom function</source>
<translation>Three atom function</translation> <translation>Three atom function</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2296"/> <location filename="../../build/src/ui_mainwindow.h" line="2299"/>
<source>R, A</source> <source>R, A</source>
<translation>R, A</translation> <translation>R, A</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2297"/> <location filename="../../build/src/ui_mainwindow.h" line="2300"/>
<location filename="../../build/src/ui_mainwindow.h" line="2301"/> <location filename="../../build/src/ui_mainwindow.h" line="2304"/>
<source>min</source> <source>min</source>
<translation>min</translation> <translation>min</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2298"/> <location filename="../../build/src/ui_mainwindow.h" line="2301"/>
<location filename="../../build/src/ui_mainwindow.h" line="2302"/> <location filename="../../build/src/ui_mainwindow.h" line="2305"/>
<source>max</source> <source>max</source>
<translation>max</translation> <translation>max</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2299"/> <location filename="../../build/src/ui_mainwindow.h" line="2302"/>
<location filename="../../build/src/ui_mainwindow.h" line="2303"/> <location filename="../../build/src/ui_mainwindow.h" line="2306"/>
<source>step</source> <source>step</source>
<translation>step</translation> <translation>step</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2300"/> <location filename="../../build/src/ui_mainwindow.h" line="2303"/>
<source>Angle, deg</source> <source>Angle, deg</source>
<translation>Angle, deg</translation> <translation>Angle, deg</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2304"/> <location filename="../../build/src/ui_mainwindow.h" line="2307"/>
<source>Matrix</source> <source>Matrix</source>
<translation>Matrix</translation> <translation>Matrix</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2310"/> <location filename="../../build/src/ui_mainwindow.h" line="2313"/>
<source>RADF</source> <source>RADF</source>
<translation>RADF</translation> <translation>RADF</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2313"/> <location filename="../../build/src/ui_mainwindow.h" line="2316"/>
<source>From agglomerate</source> <source>From agglomerate</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2314"/> <location filename="../../build/src/ui_mainwindow.h" line="2317"/>
<source>From trajectory snapshot</source> <source>From trajectory snapshot</source>
<translation>From trajectory snapshot</translation> <translation>From trajectory snapshot</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2320"/> <location filename="../../build/src/ui_mainwindow.h" line="2323"/>
<source>File with agglomerate</source> <source>File with agglomerate</source>
<translation>File with agglomerate</translation> <translation>File with agglomerate</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2332"/> <location filename="../../build/src/ui_mainwindow.h" line="2335"/>
<source>Generate PDB</source> <source>Generate PDB</source>
<translation>Generate PDB</translation> <translation>Generate PDB</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2333"/> <location filename="../../build/src/ui_mainwindow.h" line="2336"/>
<source>Menu</source> <source>Menu</source>
<translation>Menu</translation> <translation>Menu</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2334"/> <location filename="../../build/src/ui_mainwindow.h" line="2337"/>
<source>File &amp;creator</source> <source>File &amp;creator</source>
<translation>File &amp;creator</translation> <translation>File &amp;creator</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2335"/> <location filename="../../build/src/ui_mainwindow.h" line="2338"/>
<source>&amp;Tools</source> <source>&amp;Tools</source>
<translation>&amp;Tools</translation> <translation>&amp;Tools</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2336"/> <location filename="../../build/src/ui_mainwindow.h" line="2339"/>
<source>Help</source> <source>Help</source>
<translation>Help</translation> <translation>Help</translation>
</message> </message>
@@ -966,72 +968,72 @@ p, li { white-space: pre-wrap; }
<translation>All files (*)</translation> <translation>All files (*)</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_settingswindow.h" line="316"/> <location filename="../../build/src/ui_settingswindow.h" line="315"/>
<source>Settings</source> <source>Settings</source>
<translation>Settings</translation> <translation>Settings</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_settingswindow.h" line="317"/> <location filename="../../build/src/ui_settingswindow.h" line="316"/>
<source>mm_trj</source> <source>mm_trj</source>
<translation>mm_trj</translation> <translation>mm_trj</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_settingswindow.h" line="318"/> <location filename="../../build/src/ui_settingswindow.h" line="317"/>
<location filename="../../build/src/ui_settingswindow.h" line="320"/> <location filename="../../build/src/ui_settingswindow.h" line="319"/>
<location filename="../../build/src/ui_settingswindow.h" line="322"/> <location filename="../../build/src/ui_settingswindow.h" line="321"/>
<location filename="../../build/src/ui_settingswindow.h" line="324"/> <location filename="../../build/src/ui_settingswindow.h" line="323"/>
<location filename="../../build/src/ui_settingswindow.h" line="326"/> <location filename="../../build/src/ui_settingswindow.h" line="325"/>
<location filename="../../build/src/ui_settingswindow.h" line="328"/> <location filename="../../build/src/ui_settingswindow.h" line="327"/>
<source>Browse</source> <source>Browse</source>
<translation>Browse</translation> <translation>Browse</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_settingswindow.h" line="319"/> <location filename="../../build/src/ui_settingswindow.h" line="318"/>
<source>mm_statgen</source> <source>mm_statgen</source>
<translation>mm_statgen</translation> <translation>mm_statgen</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_settingswindow.h" line="321"/> <location filename="../../build/src/ui_settingswindow.h" line="320"/>
<source>mm_envir</source> <source>mm_envir</source>
<translation>mm_envir</translation> <translation>mm_envir</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_settingswindow.h" line="323"/> <location filename="../../build/src/ui_settingswindow.h" line="322"/>
<source>mm_radf</source> <source>mm_radf</source>
<translation>mm_radf</translation> <translation>mm_radf</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_settingswindow.h" line="325"/> <location filename="../../build/src/ui_settingswindow.h" line="324"/>
<source>mm_trj2pdb</source> <source>mm_trj2pdb</source>
<translation>mm_trj2pdb</translation> <translation>mm_trj2pdb</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_settingswindow.h" line="327"/> <location filename="../../build/src/ui_settingswindow.h" line="326"/>
<source>mm_agl</source> <source>mm_agl</source>
<translation>mm_agl</translation> <translation>mm_agl</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_settingswindow.h" line="331"/> <location filename="../../build/src/ui_settingswindow.h" line="330"/>
<source>English</source> <source>English</source>
<translation>English</translation> <translation>English</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_settingswindow.h" line="332"/> <location filename="../../build/src/ui_settingswindow.h" line="331"/>
<source>Russian</source> <source>Russian</source>
<translation>Russian</translation> <translation>Russian</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_settingswindow.h" line="334"/> <location filename="../../build/src/ui_settingswindow.h" line="333"/>
<source>You need to restart application</source> <source>You need to restart application</source>
<translation>You need to restart application</translation> <translation>You need to restart application</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_settingswindow.h" line="335"/> <location filename="../../build/src/ui_settingswindow.h" line="334"/>
<source>Save</source> <source>Save</source>
<translation>Save</translation> <translation>Save</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_settingswindow.h" line="336"/> <location filename="../../build/src/ui_settingswindow.h" line="335"/>
<source>Close</source> <source>Close</source>
<translation>Close</translation> <translation>Close</translation>
</message> </message>
Binary file not shown.
+218 -216
View File
@@ -383,564 +383,566 @@ p, li { white-space: pre-wrap; }
<translation>Готов</translation> <translation>Готов</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="236"/> <location filename="../../src/mainwindow.cpp" line="246"/>
<location filename="../../src/mainwindow.cpp" line="290"/> <location filename="../../src/mainwindow.cpp" line="300"/>
<location filename="../../src/mainwindow.cpp" line="333"/> <location filename="../../src/mainwindow.cpp" line="343"/>
<location filename="../../src/mainwindow.cpp" line="376"/> <location filename="../../src/mainwindow.cpp" line="386"/>
<location filename="../../src/mainwindow.cpp" line="419"/> <location filename="../../src/mainwindow.cpp" line="429"/>
<source>Select work directory</source> <source>Select work directory</source>
<translation>Выбор рабочей директории</translation> <translation>Выбор рабочей директории</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="246"/> <location filename="../../src/mainwindow.cpp" line="256"/>
<location filename="../../src/mainwindow.cpp" line="343"/> <location filename="../../src/mainwindow.cpp" line="353"/>
<location filename="../../src/mainwindow.cpp" line="429"/> <location filename="../../src/mainwindow.cpp" line="439"/>
<source>Select trajectory file</source> <source>Select trajectory file</source>
<translation>Выбор файла траектории</translation> <translation>Выбор файла траектории</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="248"/> <location filename="../../src/mainwindow.cpp" line="258"/>
<source>All files (*.*)</source> <source>All files (*.*)</source>
<translation>Все файлы (*.*)</translation> <translation>Все файлы (*.*)</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="257"/> <location filename="../../src/mainwindow.cpp" line="267"/>
<source>Select atom types file</source> <source>Select atom types file</source>
<translation>Выбор файла типов атомов</translation> <translation>Выбор файла типов атомов</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="259"/> <location filename="../../src/mainwindow.cpp" line="269"/>
<source>Atom types files (*.types);;All files (*.*)</source> <source>Atom types files (*.types);;All files (*.*)</source>
<translation>Файл типов атомов (*.types);;Все файлы (*.*)</translation> <translation>Файл типов атомов (*.types);;Все файлы (*.*)</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="268"/> <location filename="../../src/mainwindow.cpp" line="278"/>
<source>Save files as</source> <source>Save files as</source>
<translation>Сохранить файл как...</translation> <translation>Сохранить файл как...</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="270"/> <location filename="../../src/mainwindow.cpp" line="280"/>
<source>Mask of trajectory files</source> <source>Mask of trajectory files</source>
<translation>Маска файлов траектории</translation> <translation>Маска файлов траектории</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="279"/> <location filename="../../src/mainwindow.cpp" line="289"/>
<location filename="../../src/mainwindow.cpp" line="322"/> <location filename="../../src/mainwindow.cpp" line="332"/>
<location filename="../../src/mainwindow.cpp" line="365"/> <location filename="../../src/mainwindow.cpp" line="375"/>
<location filename="../../src/mainwindow.cpp" line="408"/> <location filename="../../src/mainwindow.cpp" line="418"/>
<location filename="../../src/mainwindow.cpp" line="462"/> <location filename="../../src/mainwindow.cpp" line="472"/>
<source>Save log file as...</source> <source>Save log file as...</source>
<translation>Сохранить лог как...</translation> <translation>Сохранить лог как...</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="281"/> <location filename="../../src/mainwindow.cpp" line="291"/>
<location filename="../../src/mainwindow.cpp" line="324"/> <location filename="../../src/mainwindow.cpp" line="334"/>
<location filename="../../src/mainwindow.cpp" line="367"/> <location filename="../../src/mainwindow.cpp" line="377"/>
<location filename="../../src/mainwindow.cpp" line="410"/> <location filename="../../src/mainwindow.cpp" line="420"/>
<location filename="../../src/mainwindow.cpp" line="464"/> <location filename="../../src/mainwindow.cpp" line="474"/>
<source>Log files (*.log)</source> <source>Log files (*.log)</source>
<translation>Лог (*.log)</translation> <translation>Лог (*.log)</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="300"/> <location filename="../../src/mainwindow.cpp" line="310"/>
<location filename="../../src/mainwindow.cpp" line="386"/> <location filename="../../src/mainwindow.cpp" line="396"/>
<source>Select trajectory files</source> <source>Select trajectory files</source>
<translation>Выбор файла траектории</translation> <translation>Выбор файла траектории</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="302"/> <location filename="../../src/mainwindow.cpp" line="312"/>
<location filename="../../src/mainwindow.cpp" line="345"/> <location filename="../../src/mainwindow.cpp" line="355"/>
<location filename="../../src/mainwindow.cpp" line="388"/> <location filename="../../src/mainwindow.cpp" line="398"/>
<location filename="../../src/mainwindow.cpp" line="431"/> <location filename="../../src/mainwindow.cpp" line="441"/>
<source>Trajectory files (*.*[0-9])</source> <source>Trajectory files (*.*[0-9])</source>
<translation>Файлы траектории (*.*[0-9])</translation> <translation>Файлы траектории (*.*[0-9])</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="311"/> <location filename="../../src/mainwindow.cpp" line="321"/>
<location filename="../../src/mainwindow.cpp" line="397"/> <location filename="../../src/mainwindow.cpp" line="407"/>
<source>Save output file as...</source> <source>Save output file as...</source>
<translation>Сохранить файл как...</translation> <translation>Сохранить файл как...</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="313"/> <location filename="../../src/mainwindow.cpp" line="323"/>
<location filename="../../src/mainwindow.cpp" line="399"/> <location filename="../../src/mainwindow.cpp" line="409"/>
<source>Output files (*.dat)</source> <source>Output files (*.dat)</source>
<translation>Выходной файл (*.dat)</translation> <translation>Выходной файл (*.dat)</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="354"/> <location filename="../../src/mainwindow.cpp" line="364"/>
<location filename="../../src/mainwindow.cpp" line="451"/> <location filename="../../src/mainwindow.cpp" line="461"/>
<source>Save PDB file as...</source> <source>Save PDB file as...</source>
<translation>Сохранить PDB как...</translation> <translation>Сохранить PDB как...</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="356"/> <location filename="../../src/mainwindow.cpp" line="366"/>
<location filename="../../src/mainwindow.cpp" line="453"/> <location filename="../../src/mainwindow.cpp" line="463"/>
<source>PDB files (*.pdb)</source> <source>PDB files (*.pdb)</source>
<translation>PDB файл (*.pdb)</translation> <translation>PDB файл (*.pdb)</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="440"/> <location filename="../../src/mainwindow.cpp" line="450"/>
<source>Select agglomerate file</source> <source>Select agglomerate file</source>
<translation>Выбор файла с агломератом</translation> <translation>Выбор файла с агломератом</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="442"/> <location filename="../../src/mainwindow.cpp" line="452"/>
<source>Agglomerate files (*.agl);;All files (*.*)</source> <source>Agglomerate files (*.agl);;All files (*.*)</source>
<translation>Файл с агломератом (*.agl);Все файлы (*.*)</translation> <translation>Файл с агломератом (*.agl);Все файлы (*.*)</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="611"/> <location filename="../../src/mainwindow.cpp" line="621"/>
<location filename="../../src/mainwindow.cpp" line="612"/> <location filename="../../src/mainwindow.cpp" line="622"/>
<source>Processing &apos;trj&apos;...</source> <source>Processing &apos;trj&apos;...</source>
<translation>Выполняется &apos;trj&apos;...</translation> <translation>Выполняется &apos;trj&apos;...</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="622"/> <location filename="../../src/mainwindow.cpp" line="632"/>
<location filename="../../src/mainwindow.cpp" line="703"/> <location filename="../../src/mainwindow.cpp" line="717"/>
<location filename="../../src/mainwindow.cpp" line="751"/> <location filename="../../src/mainwindow.cpp" line="765"/>
<location filename="../../src/mainwindow.cpp" line="821"/> <location filename="../../src/mainwindow.cpp" line="835"/>
<location filename="../../src/mainwindow.cpp" line="889"/> <location filename="../../src/mainwindow.cpp" line="903"/>
<source>Done</source> <source>Done</source>
<translation>Готово</translation> <translation>Готово</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="675"/> <location filename="../../src/mainwindow.cpp" line="689"/>
<location filename="../../src/mainwindow.cpp" line="676"/> <location filename="../../src/mainwindow.cpp" line="690"/>
<source>Processing &apos;statgen&apos;...</source> <source>Processing &apos;statgen&apos;...</source>
<translation>Выполняется &apos;statgen&apos;...</translation> <translation>Выполняется &apos;statgen&apos;...</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="741"/> <location filename="../../src/mainwindow.cpp" line="755"/>
<location filename="../../src/mainwindow.cpp" line="742"/> <location filename="../../src/mainwindow.cpp" line="756"/>
<source>Processing &apos;envir&apos;...</source> <source>Processing &apos;envir&apos;...</source>
<translation>Выполняется &apos;envir&apos;...</translation> <translation>Выполняется &apos;envir&apos;...</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="807"/> <location filename="../../src/mainwindow.cpp" line="821"/>
<location filename="../../src/mainwindow.cpp" line="808"/> <location filename="../../src/mainwindow.cpp" line="822"/>
<source>Processing &apos;radf&apos;...</source> <source>Processing &apos;radf&apos;...</source>
<translation>Выполняется &apos;radf&apos;...</translation> <translation>Выполняется &apos;radf&apos;...</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="864"/> <location filename="../../src/mainwindow.cpp" line="878"/>
<location filename="../../src/mainwindow.cpp" line="865"/> <location filename="../../src/mainwindow.cpp" line="879"/>
<source>Processing &apos;agl&apos;...</source> <source>Processing &apos;agl&apos;...</source>
<translation>Выполняется &apos;agl&apos;...</translation> <translation>Выполняется &apos;agl&apos;...</translation>
</message> </message>
<message> <message>
<location filename="../../src/mainwindow.cpp" line="869"/> <location filename="../../src/mainwindow.cpp" line="883"/>
<location filename="../../src/mainwindow.cpp" line="870"/> <location filename="../../src/mainwindow.cpp" line="884"/>
<source>Processing &apos;trj2pdb&apos;...</source> <source>Processing &apos;trj2pdb&apos;...</source>
<translation>Выполняется &apos;trj2pdb&apos;...</translation> <translation>Выполняется &apos;trj2pdb&apos;...</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2187"/> <location filename="../../build/src/ui_mainwindow.h" line="2192"/>
<source>Mathematical Molecular Mechanics</source> <source>Mathematical Molecular Mechanics</source>
<translation>Mathematical Molecular Mechanics</translation> <translation>Mathematical Molecular Mechanics</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2221"/> <location filename="../../build/src/ui_mainwindow.h" line="2224"/>
<source>Generate trajectory</source> <source>Generate trajectory</source>
<translation>Создать траекторию</translation> <translation>Создать траекторию</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2201"/> <location filename="../../build/src/ui_mainwindow.h" line="2204"/>
<location filename="../../build/src/ui_mainwindow.h" line="2222"/> <location filename="../../build/src/ui_mainwindow.h" line="2225"/>
<location filename="../../build/src/ui_mainwindow.h" line="2255"/> <location filename="../../build/src/ui_mainwindow.h" line="2258"/>
<location filename="../../build/src/ui_mainwindow.h" line="2272"/> <location filename="../../build/src/ui_mainwindow.h" line="2275"/>
<location filename="../../build/src/ui_mainwindow.h" line="2316"/> <location filename="../../build/src/ui_mainwindow.h" line="2319"/>
<source>Work directory</source> <source>Work directory</source>
<translation>Рабочая директория</translation> <translation>Рабочая директория</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2202"/> <location filename="../../build/src/ui_mainwindow.h" line="2205"/>
<location filename="../../build/src/ui_mainwindow.h" line="2204"/> <location filename="../../build/src/ui_mainwindow.h" line="2207"/>
<location filename="../../build/src/ui_mainwindow.h" line="2213"/> <location filename="../../build/src/ui_mainwindow.h" line="2216"/>
<location filename="../../build/src/ui_mainwindow.h" line="2215"/>
<location filename="../../build/src/ui_mainwindow.h" line="2218"/> <location filename="../../build/src/ui_mainwindow.h" line="2218"/>
<location filename="../../build/src/ui_mainwindow.h" line="2223"/> <location filename="../../build/src/ui_mainwindow.h" line="2221"/>
<location filename="../../build/src/ui_mainwindow.h" line="2225"/> <location filename="../../build/src/ui_mainwindow.h" line="2226"/>
<location filename="../../build/src/ui_mainwindow.h" line="2246"/> <location filename="../../build/src/ui_mainwindow.h" line="2228"/>
<location filename="../../build/src/ui_mainwindow.h" line="2249"/> <location filename="../../build/src/ui_mainwindow.h" line="2249"/>
<location filename="../../build/src/ui_mainwindow.h" line="2256"/> <location filename="../../build/src/ui_mainwindow.h" line="2252"/>
<location filename="../../build/src/ui_mainwindow.h" line="2258"/> <location filename="../../build/src/ui_mainwindow.h" line="2259"/>
<location filename="../../build/src/ui_mainwindow.h" line="2264"/> <location filename="../../build/src/ui_mainwindow.h" line="2261"/>
<location filename="../../build/src/ui_mainwindow.h" line="2268"/> <location filename="../../build/src/ui_mainwindow.h" line="2267"/>
<location filename="../../build/src/ui_mainwindow.h" line="2273"/> <location filename="../../build/src/ui_mainwindow.h" line="2271"/>
<location filename="../../build/src/ui_mainwindow.h" line="2275"/> <location filename="../../build/src/ui_mainwindow.h" line="2276"/>
<location filename="../../build/src/ui_mainwindow.h" line="2284"/> <location filename="../../build/src/ui_mainwindow.h" line="2278"/>
<location filename="../../build/src/ui_mainwindow.h" line="2306"/> <location filename="../../build/src/ui_mainwindow.h" line="2287"/>
<location filename="../../build/src/ui_mainwindow.h" line="2317"/> <location filename="../../build/src/ui_mainwindow.h" line="2309"/>
<location filename="../../build/src/ui_mainwindow.h" line="2319"/> <location filename="../../build/src/ui_mainwindow.h" line="2320"/>
<location filename="../../build/src/ui_mainwindow.h" line="2321"/> <location filename="../../build/src/ui_mainwindow.h" line="2322"/>
<location filename="../../build/src/ui_mainwindow.h" line="2327"/> <location filename="../../build/src/ui_mainwindow.h" line="2324"/>
<location filename="../../build/src/ui_mainwindow.h" line="2329"/> <location filename="../../build/src/ui_mainwindow.h" line="2330"/>
<location filename="../../build/src/ui_mainwindow.h" line="2332"/>
<source>Browse</source> <source>Browse</source>
<translation>Обзор</translation> <translation>Обзор</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2203"/> <location filename="../../build/src/ui_mainwindow.h" line="2206"/>
<location filename="../../build/src/ui_mainwindow.h" line="2257"/> <location filename="../../build/src/ui_mainwindow.h" line="2260"/>
<location filename="../../build/src/ui_mainwindow.h" line="2318"/> <location filename="../../build/src/ui_mainwindow.h" line="2321"/>
<source>Input file</source> <source>Input file</source>
<translation>Входной файл</translation> <translation>Входной файл</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2205"/> <location filename="../../build/src/ui_mainwindow.h" line="2208"/>
<source>Type of trajectory</source> <source>Type of trajectory</source>
<translation>Тип траектории</translation> <translation>Тип траектории</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2208"/> <location filename="../../build/src/ui_mainwindow.h" line="2211"/>
<source>GROMACS text</source> <source>GROMACS text</source>
<translation>GROMACS</translation> <translation>GROMACS</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2209"/> <location filename="../../build/src/ui_mainwindow.h" line="2212"/>
<source>PUMA</source> <source>PUMA</source>
<translation>PUMA</translation> <translation>PUMA</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2211"/> <location filename="../../build/src/ui_mainwindow.h" line="2214"/>
<source>Number of steps</source> <source>Number of steps</source>
<translation>Число шагов</translation> <translation>Число шагов</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2212"/> <location filename="../../build/src/ui_mainwindow.h" line="2215"/>
<source>Atom type file</source> <source>Atom type file</source>
<translation>Файл типов атомов</translation> <translation>Файл типов атомов</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2214"/> <location filename="../../build/src/ui_mainwindow.h" line="2217"/>
<source>Mask of output files</source> <source>Mask of output files</source>
<translation>Маска файлов</translation> <translation>Маска файлов</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2216"/> <location filename="../../build/src/ui_mainwindow.h" line="2219"/>
<source>Total atom types</source> <source>Total atom types</source>
<translation>Всего типов атомов</translation> <translation>Всего типов атомов</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2217"/> <location filename="../../build/src/ui_mainwindow.h" line="2220"/>
<location filename="../../build/src/ui_mainwindow.h" line="2248"/> <location filename="../../build/src/ui_mainwindow.h" line="2251"/>
<location filename="../../build/src/ui_mainwindow.h" line="2267"/> <location filename="../../build/src/ui_mainwindow.h" line="2270"/>
<location filename="../../build/src/ui_mainwindow.h" line="2305"/> <location filename="../../build/src/ui_mainwindow.h" line="2308"/>
<location filename="../../build/src/ui_mainwindow.h" line="2328"/> <location filename="../../build/src/ui_mainwindow.h" line="2331"/>
<source>Log</source> <source>Log</source>
<translation>Лог</translation> <translation>Лог</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2219"/> <location filename="../../build/src/ui_mainwindow.h" line="2222"/>
<location filename="../../build/src/ui_mainwindow.h" line="2252"/> <location filename="../../build/src/ui_mainwindow.h" line="2255"/>
<location filename="../../build/src/ui_mainwindow.h" line="2269"/> <location filename="../../build/src/ui_mainwindow.h" line="2272"/>
<location filename="../../build/src/ui_mainwindow.h" line="2307"/> <location filename="../../build/src/ui_mainwindow.h" line="2310"/>
<location filename="../../build/src/ui_mainwindow.h" line="2330"/> <location filename="../../build/src/ui_mainwindow.h" line="2333"/>
<source>Clear</source> <source>Clear</source>
<translation>Очистить</translation> <translation>Очистить</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2220"/> <location filename="../../build/src/ui_mainwindow.h" line="2223"/>
<location filename="../../build/src/ui_mainwindow.h" line="2253"/> <location filename="../../build/src/ui_mainwindow.h" line="2256"/>
<location filename="../../build/src/ui_mainwindow.h" line="2270"/> <location filename="../../build/src/ui_mainwindow.h" line="2273"/>
<location filename="../../build/src/ui_mainwindow.h" line="2309"/> <location filename="../../build/src/ui_mainwindow.h" line="2312"/>
<location filename="../../build/src/ui_mainwindow.h" line="2331"/> <location filename="../../build/src/ui_mainwindow.h" line="2334"/>
<source>Start</source> <source>Start</source>
<translation>Старт</translation> <translation>Старт</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2254"/> <location filename="../../build/src/ui_mainwindow.h" line="2257"/>
<source>Agglomeration</source> <source>Agglomeration</source>
<translation>Агломерация</translation> <translation>Агломерация</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2224"/> <location filename="../../build/src/ui_mainwindow.h" line="2227"/>
<location filename="../../build/src/ui_mainwindow.h" line="2274"/> <location filename="../../build/src/ui_mainwindow.h" line="2277"/>
<source>Mask of input files</source> <source>Mask of input files</source>
<translation>Маска файлов</translation> <translation>Маска файлов</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2226"/> <location filename="../../build/src/ui_mainwindow.h" line="2202"/>
<location filename="../../build/src/ui_mainwindow.h" line="2276"/> <source>Ctrl+P</source>
<translation>Ctrl+P</translation>
</message>
<message>
<location filename="../../build/src/ui_mainwindow.h" line="2229"/>
<location filename="../../build/src/ui_mainwindow.h" line="2279"/>
<source>Steps</source> <source>Steps</source>
<translation>Шаги</translation> <translation>Шаги</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2227"/> <location filename="../../build/src/ui_mainwindow.h" line="2230"/>
<location filename="../../build/src/ui_mainwindow.h" line="2277"/> <location filename="../../build/src/ui_mainwindow.h" line="2280"/>
<source>first</source> <source>first</source>
<translation>первый</translation> <translation>первый</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2228"/> <location filename="../../build/src/ui_mainwindow.h" line="2231"/>
<location filename="../../build/src/ui_mainwindow.h" line="2278"/> <location filename="../../build/src/ui_mainwindow.h" line="2281"/>
<source>last</source> <source>last</source>
<translation>последний</translation> <translation>последний</translation>
</message> </message>
<message>
<location filename="../../build/src/ui_mainwindow.h" line="2229"/>
<location filename="../../build/src/ui_mainwindow.h" line="2259"/>
<location filename="../../build/src/ui_mainwindow.h" line="2279"/>
<location filename="../../build/src/ui_mainwindow.h" line="2322"/>
<source>Cell, A</source>
<translation>Ячейка, А</translation>
</message>
<message>
<location filename="../../build/src/ui_mainwindow.h" line="2230"/>
<location filename="../../build/src/ui_mainwindow.h" line="2260"/>
<location filename="../../build/src/ui_mainwindow.h" line="2280"/>
<location filename="../../build/src/ui_mainwindow.h" line="2323"/>
<source>X</source>
<translation>X</translation>
</message>
<message>
<location filename="../../build/src/ui_mainwindow.h" line="2231"/>
<location filename="../../build/src/ui_mainwindow.h" line="2261"/>
<location filename="../../build/src/ui_mainwindow.h" line="2281"/>
<location filename="../../build/src/ui_mainwindow.h" line="2324"/>
<source>Y</source>
<translation>Y</translation>
</message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2232"/> <location filename="../../build/src/ui_mainwindow.h" line="2232"/>
<location filename="../../build/src/ui_mainwindow.h" line="2262"/> <location filename="../../build/src/ui_mainwindow.h" line="2262"/>
<location filename="../../build/src/ui_mainwindow.h" line="2282"/> <location filename="../../build/src/ui_mainwindow.h" line="2282"/>
<location filename="../../build/src/ui_mainwindow.h" line="2325"/> <location filename="../../build/src/ui_mainwindow.h" line="2325"/>
<source>Cell, A</source>
<translation>Ячейка, А</translation>
</message>
<message>
<location filename="../../build/src/ui_mainwindow.h" line="2233"/>
<location filename="../../build/src/ui_mainwindow.h" line="2263"/>
<location filename="../../build/src/ui_mainwindow.h" line="2283"/>
<location filename="../../build/src/ui_mainwindow.h" line="2326"/>
<source>X</source>
<translation>X</translation>
</message>
<message>
<location filename="../../build/src/ui_mainwindow.h" line="2234"/>
<location filename="../../build/src/ui_mainwindow.h" line="2264"/>
<location filename="../../build/src/ui_mainwindow.h" line="2284"/>
<location filename="../../build/src/ui_mainwindow.h" line="2327"/>
<source>Y</source>
<translation>Y</translation>
</message>
<message>
<location filename="../../build/src/ui_mainwindow.h" line="2235"/>
<location filename="../../build/src/ui_mainwindow.h" line="2265"/>
<location filename="../../build/src/ui_mainwindow.h" line="2285"/>
<location filename="../../build/src/ui_mainwindow.h" line="2328"/>
<source>Z</source> <source>Z</source>
<translation>Z</translation> <translation>Z</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2233"/> <location filename="../../build/src/ui_mainwindow.h" line="2236"/>
<source>atom 0</source> <source>atom 0</source>
<translation>атом 0</translation> <translation>атом 0</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2234"/> <location filename="../../build/src/ui_mainwindow.h" line="2237"/>
<location filename="../../build/src/ui_mainwindow.h" line="2290"/>
<location filename="../../build/src/ui_mainwindow.h" line="2293"/> <location filename="../../build/src/ui_mainwindow.h" line="2293"/>
<location filename="../../build/src/ui_mainwindow.h" line="2296"/>
<source>atom 1</source> <source>atom 1</source>
<translation>атом 1</translation> <translation>атом 1</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2235"/> <location filename="../../build/src/ui_mainwindow.h" line="2238"/>
<location filename="../../build/src/ui_mainwindow.h" line="2291"/>
<location filename="../../build/src/ui_mainwindow.h" line="2294"/> <location filename="../../build/src/ui_mainwindow.h" line="2294"/>
<location filename="../../build/src/ui_mainwindow.h" line="2297"/>
<source>atom 2</source> <source>atom 2</source>
<translation>атом 2</translation> <translation>атом 2</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2236"/> <location filename="../../build/src/ui_mainwindow.h" line="2239"/>
<location filename="../../build/src/ui_mainwindow.h" line="2292"/>
<location filename="../../build/src/ui_mainwindow.h" line="2295"/> <location filename="../../build/src/ui_mainwindow.h" line="2295"/>
<location filename="../../build/src/ui_mainwindow.h" line="2298"/>
<source>atom 3</source> <source>atom 3</source>
<translation>атом 3</translation> <translation>атом 3</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2237"/> <location filename="../../build/src/ui_mainwindow.h" line="2240"/>
<source>Interaction</source> <source>Interaction</source>
<translation>Взаимодействие</translation> <translation>Взаимодействие</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2240"/> <location filename="../../build/src/ui_mainwindow.h" line="2243"/>
<source>0-0</source> <source>0-0</source>
<translation>0-0</translation> <translation>0-0</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2242"/> <location filename="../../build/src/ui_mainwindow.h" line="2245"/>
<source>Save</source> <source>Save</source>
<translation>Сохранить</translation> <translation>Сохранить</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2243"/> <location filename="../../build/src/ui_mainwindow.h" line="2246"/>
<source>Add</source> <source>Add</source>
<translation>Добавить</translation> <translation>Добавить</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2244"/> <location filename="../../build/src/ui_mainwindow.h" line="2247"/>
<source>Remove</source> <source>Remove</source>
<translation>Удалить</translation> <translation>Удалить</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2245"/> <location filename="../../build/src/ui_mainwindow.h" line="2248"/>
<location filename="../../build/src/ui_mainwindow.h" line="2263"/> <location filename="../../build/src/ui_mainwindow.h" line="2266"/>
<location filename="../../build/src/ui_mainwindow.h" line="2283"/> <location filename="../../build/src/ui_mainwindow.h" line="2286"/>
<location filename="../../build/src/ui_mainwindow.h" line="2326"/> <location filename="../../build/src/ui_mainwindow.h" line="2329"/>
<source>Output file</source> <source>Output file</source>
<translation>Выходной файл</translation> <translation>Выходной файл</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2247"/> <location filename="../../build/src/ui_mainwindow.h" line="2250"/>
<source>Depth of search</source> <source>Depth of search</source>
<translation>Глубина поиска</translation> <translation>Глубина поиска</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2250"/> <location filename="../../build/src/ui_mainwindow.h" line="2253"/>
<source>Analysis</source> <source>Analysis</source>
<translation>Анализ</translation> <translation>Анализ</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2251"/> <location filename="../../build/src/ui_mainwindow.h" line="2254"/>
<location filename="../../build/src/ui_mainwindow.h" line="2308"/> <location filename="../../build/src/ui_mainwindow.h" line="2311"/>
<source>Graph</source> <source>Graph</source>
<translation>График</translation> <translation>График</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2271"/> <location filename="../../build/src/ui_mainwindow.h" line="2274"/>
<source>Environment</source> <source>Environment</source>
<translation>Окружение</translation> <translation>Окружение</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2265"/> <location filename="../../build/src/ui_mainwindow.h" line="2268"/>
<source>Molecule</source> <source>Molecule</source>
<translation>Молекула</translation> <translation>Молекула</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2266"/> <location filename="../../build/src/ui_mainwindow.h" line="2269"/>
<source>Radius</source> <source>Radius</source>
<translation>Радиус</translation> <translation>Радиус</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2310"/> <location filename="../../build/src/ui_mainwindow.h" line="2313"/>
<source>RADF</source> <source>RADF</source>
<translation>ФРУР</translation> <translation>ФРУР</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2287"/> <location filename="../../build/src/ui_mainwindow.h" line="2290"/>
<source>One atom function</source> <source>One atom function</source>
<translation>Одноатомная функция</translation> <translation>Одноатомная функция</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2288"/> <location filename="../../build/src/ui_mainwindow.h" line="2291"/>
<source>Three atom function</source> <source>Three atom function</source>
<translation>Трехатомная функция</translation> <translation>Трехатомная функция</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2296"/> <location filename="../../build/src/ui_mainwindow.h" line="2299"/>
<source>R, A</source> <source>R, A</source>
<translation>R, A</translation> <translation>R, A</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2297"/> <location filename="../../build/src/ui_mainwindow.h" line="2300"/>
<location filename="../../build/src/ui_mainwindow.h" line="2301"/> <location filename="../../build/src/ui_mainwindow.h" line="2304"/>
<source>min</source> <source>min</source>
<translation>min</translation> <translation>min</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2298"/> <location filename="../../build/src/ui_mainwindow.h" line="2301"/>
<location filename="../../build/src/ui_mainwindow.h" line="2302"/> <location filename="../../build/src/ui_mainwindow.h" line="2305"/>
<source>max</source> <source>max</source>
<translation>max</translation> <translation>max</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2299"/> <location filename="../../build/src/ui_mainwindow.h" line="2302"/>
<location filename="../../build/src/ui_mainwindow.h" line="2303"/> <location filename="../../build/src/ui_mainwindow.h" line="2306"/>
<source>step</source> <source>step</source>
<translation>шаг</translation> <translation>шаг</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2300"/> <location filename="../../build/src/ui_mainwindow.h" line="2303"/>
<source>Angle, deg</source> <source>Angle, deg</source>
<translation>Угол, град</translation> <translation>Угол, град</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2304"/> <location filename="../../build/src/ui_mainwindow.h" line="2307"/>
<source>Matrix</source> <source>Matrix</source>
<translation>Матрица</translation> <translation>Матрица</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2332"/> <location filename="../../build/src/ui_mainwindow.h" line="2335"/>
<source>Generate PDB</source> <source>Generate PDB</source>
<translation>Создать PDB</translation> <translation>Создать PDB</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2313"/> <location filename="../../build/src/ui_mainwindow.h" line="2316"/>
<source>From agglomerate</source> <source>From agglomerate</source>
<translation>Из агломерата</translation> <translation>Из агломерата</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2314"/> <location filename="../../build/src/ui_mainwindow.h" line="2317"/>
<source>From trajectory snapshot</source> <source>From trajectory snapshot</source>
<translation>Из снимка траектории</translation> <translation>Из снимка траектории</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2320"/> <location filename="../../build/src/ui_mainwindow.h" line="2323"/>
<source>File with agglomerate</source> <source>File with agglomerate</source>
<translation>Файл с агломератом</translation> <translation>Файл с агломератом</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2333"/> <location filename="../../build/src/ui_mainwindow.h" line="2336"/>
<source>Menu</source> <source>Menu</source>
<translation>Меню</translation> <translation>Меню</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2334"/> <location filename="../../build/src/ui_mainwindow.h" line="2337"/>
<source>File &amp;creator</source> <source>File &amp;creator</source>
<translation>&amp;Создание файлов</translation> <translation>&amp;Создание файлов</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2335"/> <location filename="../../build/src/ui_mainwindow.h" line="2338"/>
<source>&amp;Tools</source> <source>&amp;Tools</source>
<translation>&amp;Утилиты</translation> <translation>&amp;Утилиты</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2336"/> <location filename="../../build/src/ui_mainwindow.h" line="2339"/>
<source>Help</source> <source>Help</source>
<translation>Помощь</translation> <translation>Помощь</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2188"/> <location filename="../../build/src/ui_mainwindow.h" line="2193"/>
<source>&amp;Quit</source> <source>&amp;Quit</source>
<translation>&amp;Выход</translation> <translation>&amp;Выход</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2190"/> <location filename="../../build/src/ui_mainwindow.h" line="2195"/>
<source>Quit</source> <source>Quit</source>
<translation>Выход</translation> <translation>Выход</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2192"/> <location filename="../../build/src/ui_mainwindow.h" line="2197"/>
<source>Ctrl+Q</source> <source>Ctrl+Q</source>
<translation>Ctrl+Q</translation> <translation>Ctrl+Q</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2193"/>
<source>&amp;Help</source> <source>&amp;Help</source>
<translation>&amp;Помощь</translation> <translation type="obsolete">&amp;Помощь</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2194"/>
<source>F1</source> <source>F1</source>
<translation>F1</translation> <translation type="obsolete">F1</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2195"/> <location filename="../../build/src/ui_mainwindow.h" line="2198"/>
<source>About</source> <source>About</source>
<translation>О программе</translation> <translation>О программе</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2196"/> <location filename="../../build/src/ui_mainwindow.h" line="2199"/>
<source>Atom &amp;types file</source> <source>Atom &amp;types file</source>
<translation>Файл типов &amp;атомов</translation> <translation>Файл типов &amp;атомов</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2197"/> <location filename="../../build/src/ui_mainwindow.h" line="2200"/>
<source>&amp;Agglomerate file</source> <source>&amp;Agglomerate file</source>
<translation>Файл с &amp;агломератом</translation> <translation>Файл с &amp;агломератом</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2198"/> <location filename="../../build/src/ui_mainwindow.h" line="2201"/>
<source>&amp;Settings</source> <source>&amp;Settings</source>
<translation>&amp;Настройки</translation> <translation>&amp;Настройки</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2199"/> <location filename="../../build/src/ui_mainwindow.h" line="2203"/>
<source>agl_all</source> <source>agl_all</source>
<translation>agl_all</translation> <translation>agl_all</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_mainwindow.h" line="2200"/>
<source>statgen_all</source> <source>statgen_all</source>
<translation>statgen_all</translation> <translation type="obsolete">statgen_all</translation>
</message> </message>
</context> </context>
<context> <context>
@@ -966,72 +968,72 @@ p, li { white-space: pre-wrap; }
<translation>Все файлы (*)</translation> <translation>Все файлы (*)</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_settingswindow.h" line="316"/> <location filename="../../build/src/ui_settingswindow.h" line="315"/>
<source>Settings</source> <source>Settings</source>
<translation>Настройки</translation> <translation>Настройки</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_settingswindow.h" line="317"/> <location filename="../../build/src/ui_settingswindow.h" line="316"/>
<source>mm_trj</source> <source>mm_trj</source>
<translation>mm_trj</translation> <translation>mm_trj</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_settingswindow.h" line="318"/> <location filename="../../build/src/ui_settingswindow.h" line="317"/>
<location filename="../../build/src/ui_settingswindow.h" line="320"/> <location filename="../../build/src/ui_settingswindow.h" line="319"/>
<location filename="../../build/src/ui_settingswindow.h" line="322"/> <location filename="../../build/src/ui_settingswindow.h" line="321"/>
<location filename="../../build/src/ui_settingswindow.h" line="324"/> <location filename="../../build/src/ui_settingswindow.h" line="323"/>
<location filename="../../build/src/ui_settingswindow.h" line="326"/> <location filename="../../build/src/ui_settingswindow.h" line="325"/>
<location filename="../../build/src/ui_settingswindow.h" line="328"/> <location filename="../../build/src/ui_settingswindow.h" line="327"/>
<source>Browse</source> <source>Browse</source>
<translation>Обзор</translation> <translation>Обзор</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_settingswindow.h" line="319"/> <location filename="../../build/src/ui_settingswindow.h" line="318"/>
<source>mm_statgen</source> <source>mm_statgen</source>
<translation>mm_statgen</translation> <translation>mm_statgen</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_settingswindow.h" line="321"/> <location filename="../../build/src/ui_settingswindow.h" line="320"/>
<source>mm_envir</source> <source>mm_envir</source>
<translation>mm_envir</translation> <translation>mm_envir</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_settingswindow.h" line="323"/> <location filename="../../build/src/ui_settingswindow.h" line="322"/>
<source>mm_radf</source> <source>mm_radf</source>
<translation>mm_radf</translation> <translation>mm_radf</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_settingswindow.h" line="325"/> <location filename="../../build/src/ui_settingswindow.h" line="324"/>
<source>mm_trj2pdb</source> <source>mm_trj2pdb</source>
<translation>mm_trj2pdb</translation> <translation>mm_trj2pdb</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_settingswindow.h" line="327"/> <location filename="../../build/src/ui_settingswindow.h" line="326"/>
<source>mm_agl</source> <source>mm_agl</source>
<translation>mm_agl</translation> <translation>mm_agl</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_settingswindow.h" line="331"/> <location filename="../../build/src/ui_settingswindow.h" line="330"/>
<source>English</source> <source>English</source>
<translation>English</translation> <translation>English</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_settingswindow.h" line="332"/> <location filename="../../build/src/ui_settingswindow.h" line="331"/>
<source>Russian</source> <source>Russian</source>
<translation>Russian</translation> <translation>Russian</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_settingswindow.h" line="334"/> <location filename="../../build/src/ui_settingswindow.h" line="333"/>
<source>You need to restart application</source> <source>You need to restart application</source>
<translation>You need to restart application</translation> <translation>You need to restart application</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_settingswindow.h" line="335"/> <location filename="../../build/src/ui_settingswindow.h" line="334"/>
<source>Save</source> <source>Save</source>
<translation>Сохранить</translation> <translation>Сохранить</translation>
</message> </message>
<message> <message>
<location filename="../../build/src/ui_settingswindow.h" line="336"/> <location filename="../../build/src/ui_settingswindow.h" line="335"/>
<source>Close</source> <source>Close</source>
<translation>Закрыть</translation> <translation>Закрыть</translation>
</message> </message>
+6 -2
View File
@@ -46,7 +46,7 @@ foreach (LANGUAGE ${LANGUAGES})
OUTPUT ${QM} OUTPUT ${QM}
COMMAND ${QT_LRELEASE_EXECUTABLE} ${TS} COMMAND ${QT_LRELEASE_EXECUTABLE} ${TS}
MAIN_DEPENDENCY ${TS}) MAIN_DEPENDENCY ${TS})
endforeach() endforeach ()
add_custom_target ( add_custom_target (
translations translations
COMMAND ${QT_LUPDATE_EXECUTABLE} ${HEADERS} ${SOURCES} ${UI_HEADERS} -ts ${TRANSLATIONS}) COMMAND ${QT_LUPDATE_EXECUTABLE} ${HEADERS} ${SOURCES} ${UI_HEADERS} -ts ${TRANSLATIONS})
@@ -65,4 +65,8 @@ add_executable (${PROJECT} WIN32 ${UI_HEADERS} ${HEADERS} ${SOURCES} ${MOC_SOURC
target_link_libraries (${PROJECT} ${LIBRARIES} ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY}) target_link_libraries (${PROJECT} ${LIBRARIES} ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY})
# install properties # install properties
INSTALL (TARGETS ${PROJECT} DESTINATION bin) install (TARGETS ${PROJECT} DESTINATION bin)
install (FILES ../mathmech.desktop
DESTINATION share/applications/)
install (FILES ../mathmech-logo.png
DESTINATION share/pixmaps/)
+15 -1
View File
@@ -123,9 +123,19 @@ void MainWindow::on_statgen_checkBox_atoms3_stateChanged(int arg1)
void MainWindow::on_statgen_checkBox_anal_stateChanged(int arg1) void MainWindow::on_statgen_checkBox_anal_stateChanged(int arg1)
{ {
if (arg1 == 0) if (arg1 == 0)
{
ui->statgen_doubleSpinBox_anal->setDisabled(true); ui->statgen_doubleSpinBox_anal->setDisabled(true);
ui->statgen_spinBox_anal->setDisabled(true);
ui->statgen_checkBox_graph->setCheckState(Qt::Checked);
ui->statgen_checkBox_graph->setEnabled(true);
}
else if (arg1 == 2) else if (arg1 == 2)
{
ui->statgen_doubleSpinBox_anal->setEnabled(true); ui->statgen_doubleSpinBox_anal->setEnabled(true);
ui->statgen_spinBox_anal->setEnabled(true);
ui->statgen_checkBox_graph->setCheckState(Qt::Unchecked);
ui->statgen_checkBox_graph->setDisabled(true);
}
} }
void MainWindow::on_envir_checkBox_log_stateChanged(int arg1) void MainWindow::on_envir_checkBox_log_stateChanged(int arg1)
@@ -664,8 +674,12 @@ void MainWindow::start_events_statgen()
else else
depth = QString("#"); depth = QString("#");
float int_step; float int_step;
int imax;
if (ui->statgen_checkBox_anal->checkState() == 2) if (ui->statgen_checkBox_anal->checkState() == 2)
{
int_step = ui->statgen_doubleSpinBox_anal->value(); int_step = ui->statgen_doubleSpinBox_anal->value();
imax = ui->statgen_spinBox_anal->value();
}
QString log; QString log;
if (ui->statgen_checkBox_log->checkState() == 2) if (ui->statgen_checkBox_log->checkState() == 2)
log = ui->statgen_lineEdit_log->text(); log = ui->statgen_lineEdit_log->text();
@@ -699,7 +713,7 @@ void MainWindow::start_events_statgen()
output, output,
depth, depth,
log, log,
int_step); int_step, imax);
ui->statusBar->showMessage(QApplication::translate("MainWindow", "Done")); ui->statusBar->showMessage(QApplication::translate("MainWindow", "Done"));
if ((ui->statgen_checkBox_graph->checkState() == 2) && (check == true)) if ((ui->statgen_checkBox_graph->checkState() == 2) && (check == true))
+23 -13
View File
@@ -1245,6 +1245,25 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QSpinBox" name="statgen_spinBox_anal">
<property name="enabled">
<bool>false</bool>
</property>
<property name="minimumSize">
<size>
<width>80</width>
<height>23</height>
</size>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="value">
<number>10</number>
</property>
</widget>
</item>
<item> <item>
<spacer name="horizontalSpacer_16"> <spacer name="horizontalSpacer_16">
<property name="orientation"> <property name="orientation">
@@ -3467,14 +3486,6 @@
<string>Ctrl+Q</string> <string>Ctrl+Q</string>
</property> </property>
</action> </action>
<action name="actionHelp">
<property name="text">
<string>&amp;Help</string>
</property>
<property name="shortcut">
<string>F1</string>
</property>
</action>
<action name="actionAbout"> <action name="actionAbout">
<property name="text"> <property name="text">
<string>About</string> <string>About</string>
@@ -3494,17 +3505,15 @@
<property name="text"> <property name="text">
<string>&amp;Settings</string> <string>&amp;Settings</string>
</property> </property>
<property name="shortcut">
<string>Ctrl+P</string>
</property>
</action> </action>
<action name="actionAgl_all"> <action name="actionAgl_all">
<property name="text"> <property name="text">
<string>agl_all</string> <string>agl_all</string>
</property> </property>
</action> </action>
<action name="actionStatgen_all">
<property name="text">
<string>statgen_all</string>
</property>
</action>
</widget> </widget>
<layoutdefault spacing="6" margin="11"/> <layoutdefault spacing="6" margin="11"/>
<tabstops> <tabstops>
@@ -3556,6 +3565,7 @@
<tabstop>statgen_pushButton_log</tabstop> <tabstop>statgen_pushButton_log</tabstop>
<tabstop>statgen_checkBox_anal</tabstop> <tabstop>statgen_checkBox_anal</tabstop>
<tabstop>statgen_doubleSpinBox_anal</tabstop> <tabstop>statgen_doubleSpinBox_anal</tabstop>
<tabstop>statgen_spinBox_anal</tabstop>
<tabstop>statgen_checkBox_graph</tabstop> <tabstop>statgen_checkBox_graph</tabstop>
<tabstop>statgen_pushButton_clear</tabstop> <tabstop>statgen_pushButton_clear</tabstop>
<tabstop>statgen_pushButton_start</tabstop> <tabstop>statgen_pushButton_start</tabstop>
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject> <!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 2.8.0, 2013-08-28T17:33:30. --> <!-- Written by QtCreator 2.8.0, 2013-08-29T03:32:50. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>ProjectExplorer.Project.ActiveTarget</variable> <variable>ProjectExplorer.Project.ActiveTarget</variable>
+7 -7
View File
@@ -30,7 +30,7 @@ SettingsWindow::SettingsWindow(MainWindow *parent) :
else else
{ {
setDefaults(); setDefaults();
applySettings(); printSettings();
} }
showSettings(); showSettings();
ui->settings_layout_lang_2->setHidden(true); ui->settings_layout_lang_2->setHidden(true);
@@ -117,12 +117,12 @@ void SettingsWindow::setDefaults()
suffix = QString(".exe"); suffix = QString(".exe");
#endif #endif
_parent->language = QString("eng"); _parent->language = QString("eng");
_parent->mm_trj_path = QDir::currentPath() + QDir::separator() + "mm_trj" + suffix; _parent->mm_trj_path = qApp->applicationDirPath() + QDir::separator() + "mm_trj" + suffix;
_parent->mm_statgen_path = QDir::currentPath() + QDir::separator() + "mm_statgen" + suffix; _parent->mm_statgen_path = qApp->applicationDirPath() + QDir::separator() + "mm_statgen" + suffix;
_parent->mm_envir_path = QDir::currentPath() + QDir::separator() + "mm_envir" + suffix; _parent->mm_envir_path = qApp->applicationDirPath() + QDir::separator() + "mm_envir" + suffix;
_parent->mm_radf_path = QDir::currentPath() + QDir::separator() + "mm_radf" + suffix; _parent->mm_radf_path = qApp->applicationDirPath() + QDir::separator() + "mm_radf" + suffix;
_parent->mm_trj2pdb_path = QDir::currentPath() + QDir::separator() + "mm_trj2pdb" + suffix; _parent->mm_trj2pdb_path = qApp->applicationDirPath() + QDir::separator() + "mm_trj2pdb" + suffix;
_parent->mm_agl_path = QDir::currentPath() + QDir::separator() + "mm_agl" + suffix; _parent->mm_agl_path = qApp->applicationDirPath() + QDir::separator() + "mm_agl" + suffix;
} }
void SettingsWindow::readSettings() void SettingsWindow::readSettings()
+50 -16
View File
@@ -1,4 +1,5 @@
#include <QDir> #include <QDir>
#include <math.h>
#include "mainwindow.h" #include "mainwindow.h"
#include "ui_mainwindow.h" #include "ui_mainwindow.h"
@@ -189,7 +190,7 @@ bool Start_events::start_statgen_analysis(QString mm_statgen_path,
QString output, QString output,
QString depth, QString depth,
QString log, QString log,
float int_step) float int_step, int imax)
{ {
// error check // error check
errorwin = new ErrorWindow(parent); errorwin = new ErrorWindow(parent);
@@ -238,12 +239,11 @@ bool Start_events::start_statgen_analysis(QString mm_statgen_path,
delete errorwin; delete errorwin;
// parsing criteria // parsing criteria
int imax = 10;
QStringList inter_list = inter.split(QString(" -r "), QString::SkipEmptyParts); QStringList inter_list = inter.split(QString(" -r "), QString::SkipEmptyParts);
float *inter_list_one; float *inter_list_one;
inter_list_one = new float[16*inter_list.count()]; inter_list_one = new float[16*inter_list.count()];
for (int i=0; i<16*inter_list.count(); i++) for (int i=0; i<16*inter_list.count(); i++)
inter_list_one[i] = -1.0; inter_list_one[i] = 0.0;
float item; float item;
int index; int index;
for (int i=0; i<inter_list.count(); i++) for (int i=0; i<inter_list.count(); i++)
@@ -259,15 +259,24 @@ bool Start_events::start_statgen_analysis(QString mm_statgen_path,
split(QString("-"), QString::SkipEmptyParts)[1].toInt() * 4; split(QString("-"), QString::SkipEmptyParts)[1].toInt() * 4;
inter_list_one[16*i+index] = item; inter_list_one[16*i+index] = item;
} }
QList<int> inter_list_index;
for (int i=0; i<16*inter_list.count(); i++) for (int i=0; i<16*inter_list.count(); i++)
if (inter_list_one[i] > 0.0) if (inter_list_one[i] != 0.0)
while (imax*int_step > inter_list_one[i]) inter_list_index.append(i);
imax--; int files = pow(2*imax+1, inter_list_index.count());
// exec // exec
for (int i=-imax; i<=imax; i++) char file[32];
int first, second, step;
float *cur_inter;
cur_inter = new float[16*inter_list.count()];
QString one_inter;
for (int i=0; i<16*inter_list.count(); i++)
cur_inter[i] = 0.0;
for (int i=0; i<files; i++)
{ {
QString command; QString command;
inter = QString("");
command.append(mm_statgen_path); command.append(mm_statgen_path);
if (mask.contains(QDir::separator())) if (mask.contains(QDir::separator()))
command.append(" -i " + QFileInfo(mask).absoluteFilePath()); command.append(" -i " + QFileInfo(mask).absoluteFilePath());
@@ -282,25 +291,50 @@ bool Start_events::start_statgen_analysis(QString mm_statgen_path,
command.append("," + atom2); command.append("," + atom2);
if (atom3 != QString("#")) if (atom3 != QString("#"))
command.append("," + atom3); command.append("," + atom3);
command.append(inter);
if (output.contains(QDir::separator()))
command.append(" -o " + QFileInfo(output).absoluteFilePath());
else
command.append(" -o " + QFileInfo(QDir(workDir), output).absoluteFilePath());
if (depth != QString("#")) if (depth != QString("#"))
command.append(" -g " + depth); command.append(" -g " + depth);
command.append(" -q");
step = i;
for (int j=0; j<inter_list_index.count(); j++)
{
index = step % (2 * imax + 1);
cur_inter[inter_list_index[j]] = inter_list_one[inter_list_index[j]] + int_step * (index - imax);
if (cur_inter[inter_list_index[j]] < 0.0)
cur_inter[inter_list_index[j]] = 0.1;
step = step / (2 * imax + 1);
}
for (int j=0; j<inter_list.count(); j++)
{
one_inter = " -r ";
for (int k=0; k<16; k++)
if (cur_inter[16*j+k] != 0.0)
{
first = k % 4;
second = k / 4;
one_inter.append(QString::number(first) + "-" + QString::number(second) +
":" + QString::number(cur_inter[16*j+k], 'f', 3) + ",");
}
one_inter.remove(one_inter.count()-1, 1);
inter.append(one_inter);
}
command.append(inter);
sprintf(file, "_%06i", i);
if (output.contains(QDir::separator()))
command.append(" -o " + QFileInfo(output).absoluteFilePath() + QString(file) + ".dat");
else
command.append(" -o " + QFileInfo(QDir(workDir), output).absoluteFilePath() + QString(file) + ".dat");
if (log != QString("#")) if (log != QString("#"))
{ {
if (log.contains(QDir::separator())) if (log.contains(QDir::separator()))
command.append(" -l " + QFileInfo(log).absoluteFilePath()); command.append(" -l " + QFileInfo(log).absoluteFilePath() + QString(file) + ".log");
else else
command.append(" -l " + QFileInfo(QDir(workDir), log).absoluteFilePath()); command.append(" -l " + QFileInfo(QDir(workDir), log).absoluteFilePath() + QString(file) + ".log");
} }
command.append(" -q");
system(command.toStdString().c_str()); system(command.toStdString().c_str());
} }
delete inter_list_one; delete inter_list_one;
delete cur_inter;
return true; return true;
} }
+1 -1
View File
@@ -42,7 +42,7 @@ public:
QString output, QString output,
QString depth, QString depth,
QString log, QString log,
float int_step); float int_step, int imax);
bool start_envir(QString mm_envir_path, bool start_envir(QString mm_envir_path,
QString workDir, QString workDir,
QString input, QString input,
+2 -2
View File
@@ -1,4 +1,4 @@
mm_agl - program that creates PDB file with chosen aglomerate mm_agl - program that creates PDB file with chosen agglomerate
Version: 1.0.1 Version: 1.0.1
License: GPL License: GPL
@@ -6,7 +6,7 @@ Usage:
mm_agl -a FILENAME -i FILENAME -c X,Y,Z -o FILEMANE [ -l LOGFILE ] [ -q ] [ -h ] mm_agl -a FILENAME -i FILENAME -c X,Y,Z -o FILEMANE [ -l LOGFILE ] [ -q ] [ -h ]
Parametrs: Parametrs:
-a - input file with aglomerates (in format statgen) -a - input file with agglomerates (in format statgen)
-i - input file with coordinates -i - input file with coordinates
-c - cell size (float), A -c - cell size (float), A
-o - output file with coordinates -o - output file with coordinates
+1 -1
View File
@@ -38,7 +38,7 @@ PROJECT_NUMBER = V.1.0.1
# for a project that appears at the top of each page and should give viewer # for a project that appears at the top of each page and should give viewer
# a quick idea about the purpose of the project. Keep the description short. # a quick idea about the purpose of the project. Keep the description short.
PROJECT_BRIEF = "Program that creates PDB file with chosen aglomerate" PROJECT_BRIEF = "Program that creates PDB file with chosen agglomerate"
# With the PROJECT_LOGO tag one can specify an logo or icon that is # With the PROJECT_LOGO tag one can specify an logo or icon that is
# included in the documentation. The maximum height of the logo should not # included in the documentation. The maximum height of the logo should not
Binary file not shown.
+2 -2
View File
@@ -18,7 +18,7 @@ int error_checking (const char *aglinp, const float *cell, const char *input,
* error_checking (aglinp, cell, input, output); * error_checking (aglinp, cell, input, output);
* @endcode * @endcode
* *
* @param aglinp aglomerate file name * @param aglinp agglomerate file name
* @param cell massive of cell size * @param cell massive of cell size
* @param input input file name * @param input input file name
* @param output output file name * @param output output file name
@@ -83,7 +83,7 @@ int set_defaults (char *aglinp, float *cell, char *input, int *log, char *output
* set_defaults (aglinp, cell, input, &log, output, &quiet); * set_defaults (aglinp, cell, input, &log, output, &quiet);
* @endcode * @endcode
* *
* @param aglinp aglomerate file name * @param aglinp agglomerate file name
* @param cell massive of cell size * @param cell massive of cell size
* @param input mask of trajectory files * @param input mask of trajectory files
* @param log status of log-mode * @param log status of log-mode
+7 -7
View File
@@ -9,7 +9,7 @@
* *
* <b>About this program</b>: * <b>About this program</b>:
* <ul> * <ul>
* <li>Program that creates PDB file with chosen aglomerate * <li>Program that creates PDB file with chosen agglomerate
* </ul> * </ul>
* *
* <b>Developer</b>: * <b>Developer</b>:
@@ -27,7 +27,7 @@
* mm_agl -a AGL_INP -i INPUT -c X,Y,Z -o OUTPUT [ -l LOGFILE ] [ -q ] [ -h ] * mm_agl -a AGL_INP -i INPUT -c X,Y,Z -o OUTPUT [ -l LOGFILE ] [ -q ] [ -h ]
* *
* Parametrs: * Parametrs:
* -a - input file with aglomerates (in format statgen) * -a - input file with agglomerates (in format statgen)
* -i - input file with coordinates * -i - input file with coordinates
* -c - cell size (float), A * -c - cell size (float), A
* -o - output file name * -o - output file name
@@ -100,7 +100,7 @@ int main(int argc, char *argv[])
int *label_mol, log, num_atoms, num_mol, num_needed_mol, *needed_mol, quiet, int *label_mol, log, num_atoms, num_mol, num_needed_mol, *needed_mol, quiet,
*true_label_mol; *true_label_mol;
/* aglinp aglomerate file name /* aglinp agglomerate file name
* ch_type_atoms massive of char atom types * ch_type_atoms massive of char atom types
* input input file name * input input file name
* logfile log file name * logfile log file name
@@ -127,14 +127,14 @@ int main(int argc, char *argv[])
if ((argv[i][0] == '-') && (argv[i][1] == 'h') && (argv[i][2] == '\0')) if ((argv[i][0] == '-') && (argv[i][1] == 'h') && (argv[i][2] == '\0'))
{ {
sprintf (tmp_str, " mm_agl\n"); sprintf (tmp_str, " mm_agl\n");
sprintf (tmp_str, "%sProgram for create PDB file with chosen aglomerate\n", tmp_str); sprintf (tmp_str, "%sProgram for create PDB file with chosen agglomerate\n", tmp_str);
sprintf (tmp_str, "%sVersion : 1.0.1 License : GPL\n", tmp_str); sprintf (tmp_str, "%sVersion : 1.0.1 License : GPL\n", tmp_str);
sprintf (tmp_str, "%s Evgeniy Alekseev aka arcanis\n", tmp_str); sprintf (tmp_str, "%s Evgeniy Alekseev aka arcanis\n", tmp_str);
sprintf (tmp_str, "%s E-mail : esalexeev@gmail.com\n\n", tmp_str); sprintf (tmp_str, "%s E-mail : esalexeev@gmail.com\n\n", tmp_str);
sprintf (tmp_str, "%sUsage:\n", tmp_str); sprintf (tmp_str, "%sUsage:\n", tmp_str);
sprintf (tmp_str, "%smm_agl -a AGL_INP -i INPUT -c X,Y,Z -o OUTPUT [ -l LOGFILE ] [ -q ] [ -h ]\n\n", tmp_str); sprintf (tmp_str, "%smm_agl -a AGL_INP -i INPUT -c X,Y,Z -o OUTPUT [ -l LOGFILE ] [ -q ] [ -h ]\n\n", tmp_str);
sprintf (tmp_str, "%sParametrs:\n", tmp_str); sprintf (tmp_str, "%sParametrs:\n", tmp_str);
sprintf (tmp_str, "%s -a - input file with aglomerates (in format statgen)\n", tmp_str); sprintf (tmp_str, "%s -a - input file with agglomerates (in format statgen)\n", tmp_str);
sprintf (tmp_str, "%s -i - input file with coordinates\n", tmp_str); sprintf (tmp_str, "%s -i - input file with coordinates\n", tmp_str);
sprintf (tmp_str, "%s -c - cell size (float), A\n", tmp_str); sprintf (tmp_str, "%s -c - cell size (float), A\n", tmp_str);
sprintf (tmp_str, "%s -o - output file name\n", tmp_str); sprintf (tmp_str, "%s -o - output file name\n", tmp_str);
@@ -238,13 +238,13 @@ int main(int argc, char *argv[])
print_message (quiet, stdout, log, f_log, 6, argv[0]); print_message (quiet, stdout, log, f_log, 6, argv[0]);
// reading aglomerate // reading agglomerate
print_message (quiet, stdout, log, f_log, 7, aglinp); print_message (quiet, stdout, log, f_log, 7, aglinp);
error = reading_agl (aglinp, &num_needed_mol, tmp_str, needed_mol); error = reading_agl (aglinp, &num_needed_mol, tmp_str, needed_mol);
if (error == 0) if (error == 0)
{ {
sprintf (tmp_str, "%6cNumber of molecules in aglomerate: %i\n", ' ', num_needed_mol); sprintf (tmp_str, "%6cNumber of molecules in agglomerate: %i\n", ' ', num_needed_mol);
print_message (quiet, stdout, log, f_log, 8, tmp_str); print_message (quiet, stdout, log, f_log, 8, tmp_str);
// reading coordinates // reading coordinates
print_message (quiet, stdout, log, f_log, 7, input); print_message (quiet, stdout, log, f_log, 7, input);
+1 -1
View File
@@ -53,7 +53,7 @@ int message (const int log, const int mode, const char *text, FILE *output)
sprintf (out, "Initialization of variables from file '%s'\n", text); sprintf (out, "Initialization of variables from file '%s'\n", text);
break; break;
case 4: case 4:
sprintf (out, "%6cAglomerate was selected successfully\n", ' '); sprintf (out, "%6cAgglomerate was selected successfully\n", ' ');
break; break;
case 5: case 5:
sprintf (out, "Initial parametrs: \n%s", text); sprintf (out, "Initial parametrs: \n%s", text);
+5 -5
View File
@@ -1,7 +1,7 @@
/** /**
* @file * @file
*/ */
/* Library for reading aglomerate from statgen-file /* Library for reading agglomerate from statgen-file
* *
* Usage: * Usage:
* reading_agl (aglinput, &num_needed_mol, agl_class, needed_mol) * reading_agl (aglinput, &num_needed_mol, agl_class, needed_mol)
@@ -15,14 +15,14 @@
*/ */
int reading_agl (const char *aglinp, int *num_needed_mol, char *agl_class, int *needed_mol) int reading_agl (const char *aglinp, int *num_needed_mol, char *agl_class, int *needed_mol)
/** /**
* @brief function that reads aglomerate from statgen-formated file * @brief function that reads agglomerate from statgen-formated file
* @code * @code
* reading_agl (aglinput, &num_needed_mol, agl_class, needed_mol); * reading_agl (aglinput, &num_needed_mol, agl_class, needed_mol);
* @endcode * @endcode
* *
* @param aglinp aglomerate file name * @param aglinp agglomerate file name
* @param num_needed_mol number of needed molecules * @param num_needed_mol number of needed molecules
* @param agl_class aglomerate class * @param agl_class agglomerate class
* @param needed_mol massive of numbed of needed molecules * @param needed_mol massive of numbed of needed molecules
* *
* @return 0 - exit without errors * @return 0 - exit without errors
@@ -33,7 +33,7 @@ int reading_agl (const char *aglinp, int *num_needed_mol, char *agl_class, int *
FILE *f_agl; FILE *f_agl;
/* connect - connectivity matrix for molecule /* connect - connectivity matrix for molecule
* f_agl - aglomerate file * f_agl - agglomerate file
*/ */
f_agl = fopen (aglinp, "r"); f_agl = fopen (aglinp, "r");
+1 -1
View File
@@ -53,7 +53,7 @@ int message (const int log, const int mode, const char *text, FILE *output)
sprintf (out, "Initialization of variables from file '%s'\n", text); sprintf (out, "Initialization of variables from file '%s'\n", text);
break; break;
case 4: case 4:
sprintf (out, "%6cAglomerate was selected successfully\n", ' '); sprintf (out, "%6cAgglomerate was selected successfully\n", ' ');
break; break;
case 5: case 5:
sprintf (out, "Initial parametrs: \n%s", text); sprintf (out, "Initial parametrs: \n%s", text);
+1 -1
View File
@@ -53,7 +53,7 @@ int message (const int log, const int mode, const char *text, FILE *output)
sprintf (out, "Initialization of variables from file '%s'\n", text); sprintf (out, "Initialization of variables from file '%s'\n", text);
break; break;
case 4: case 4:
sprintf (out, "%6cAglomerate was selected successfully\n", ' '); sprintf (out, "%6cAgglomerate was selected successfully\n", ' ');
break; break;
case 5: case 5:
sprintf (out, "Initial parametrs: \n%s", text); sprintf (out, "Initial parametrs: \n%s", text);
Binary file not shown.
+3 -3
View File
@@ -116,7 +116,7 @@ int main (int argc, char *argv[])
* coords massive of coordinates * coords massive of coordinates
* crit massive of criteria * crit massive of criteria
* *
* agl massive of aglomerates * agl massive of agglomerates
* connect connectivity graph for all molecules * connect connectivity graph for all molecules
* from first trajectory step * from first trajectory step
* label_atom massive of atom types for interactions * label_atom massive of atom types for interactions
@@ -125,14 +125,14 @@ int main (int argc, char *argv[])
* max_depth maximum depth for check cycles in graph analyze * max_depth maximum depth for check cycles in graph analyze
* num_atoms number of atoms * num_atoms number of atoms
* num_mol number of molecules * num_mol number of molecules
* num_mol_agl massive of number of molecules in aglomerates * num_mol_agl massive of number of molecules in agglomerates
* num_of_inter number of different interactions * num_of_inter number of different interactions
* stat massive of statistic * stat massive of statistic
* stat_all massive of summary statistic * stat_all massive of summary statistic
* step $(to - from + 1) * step $(to - from + 1)
* to last trajectory step * to last trajectory step
* true_label_mol massive of true numbers of molecule for atoms * true_label_mol massive of true numbers of molecule for atoms
* type_agl massive of number of aglomerate types * type_agl massive of number of agglomerate types
* type_atoms massive of atom types * type_atoms massive of atom types
* type_inter number of atoms for interactions * type_inter number of atoms for interactions
* quiet status of quiet-mode * quiet status of quiet-mode
+1 -1
View File
@@ -53,7 +53,7 @@ int message (const int log, const int mode, const char *text, FILE *output)
sprintf (out, "Initialization of variables from file '%s'\n", text); sprintf (out, "Initialization of variables from file '%s'\n", text);
break; break;
case 4: case 4:
sprintf (out, "%6cAglomerate was selected successfully\n", ' '); sprintf (out, "%6cAgglomerate was selected successfully\n", ' ');
break; break;
case 5: case 5:
sprintf (out, "Initial parametrs: \n%s", text); sprintf (out, "Initial parametrs: \n%s", text);
+7 -7
View File
@@ -15,11 +15,11 @@ int printing_agl (const char *input, const char *output, const int *connect,
const int num_mol, const int *true_label_mol, const int *num_mol_agl, const int num_mol, const int *true_label_mol, const int *num_mol_agl,
const int *agl, const int *stat, const int max_depth, int *type_agl) const int *agl, const int *stat, const int max_depth, int *type_agl)
/** /**
* @brief function that prints aglomerates to output file * @brief function that prints agglomerates to output file
* @code * @code
* printing_agl (input_file, output_file, number_of_molecules, true_label_molecules, * printing_agl (input_file, output_file, number_of_molecules, true_label_molecules,
* num_of_molecules_in_aglomerates, aglomerates, statistic, max_depth, * num_of_molecules_in_agglomerates, agglomerates, statistic, max_depth,
* type_of_aglomerate); * type_of_agglomerate);
* @endcode * @endcode
* *
* @param input input file name * @param input input file name
@@ -27,11 +27,11 @@ int printing_agl (const char *input, const char *output, const int *connect,
* @param connect connectivity graph for all molecules * @param connect connectivity graph for all molecules
* @param num_mol number of molecules * @param num_mol number of molecules
* @param true_label_mol massive of true numbers of molecule for atoms * @param true_label_mol massive of true numbers of molecule for atoms
* @param num_mol_agl massive of number of molecules in aglomerates * @param num_mol_agl massive of number of molecules in agglomerates
* @param agl massive of aglomerates * @param agl massive of agglomerates
* @param stat massive of statistic * @param stat massive of statistic
* @param max_depth maximum depth for check cycles in graph analyze * @param max_depth maximum depth for check cycles in graph analyze
* @param type_agl massive of number of aglomerate types * @param type_agl massive of number of agglomerate types
* *
* @return 1 - memory error * @return 1 - memory error
* @return 0 - exit without errors * @return 0 - exit without errors
@@ -90,7 +90,7 @@ int printing_agl (const char *input, const char *output, const int *connect,
if (error > 0) if (error > 0)
return 1; return 1;
// print class of aglomerate // print class of agglomerate
fprintf (f_out, "AGL=%i=", num_mol_agl[i]); fprintf (f_out, "AGL=%i=", num_mol_agl[i]);
for (j=0; j<max_depth; j++) for (j=0; j<max_depth; j++)
{ {
+4 -4
View File
@@ -13,14 +13,14 @@ int proc_matrix (const int num_mol, const int *connect, int *num_mol_agl, int *a
/** /**
* @brief function that processes connectivity matrix * @brief function that processes connectivity matrix
* @code * @code
* proc_matrix (number_of_molecules, connect_matrix, num_of_molecules_in_aglomerates, * proc_matrix (number_of_molecules, connect_matrix, num_of_molecules_in_agglomerates,
* aglomerates, statistic, summary_statistic); * agglomerates, statistic, summary_statistic);
* @endcode * @endcode
* *
* @param num_mol number of molecules * @param num_mol number of molecules
* @param connect connectivity graph for all molecules * @param connect connectivity graph for all molecules
* @param num_mol_agl massive of number of molecules in aglomerates * @param num_mol_agl massive of number of molecules in agglomerates
* @param agl massive of aglomerates * @param agl massive of agglomerates
* @param stat massive of statistic * @param stat massive of statistic
* @param stat_all massive of summary statistic * @param stat_all massive of summary statistic
* *
+6 -6
View File
@@ -14,14 +14,14 @@ int summary_statistic (const char *filename, const int step, const int num_mol,
* @brief function that prints summary statistic * @brief function that prints summary statistic
* @code * @code
* summary_statistic (filename, number_of_step, number_of_molecules, max_depth, * summary_statistic (filename, number_of_step, number_of_molecules, max_depth,
* type_of_aglomerate, summary_statistic); * type_of_agglomerate, summary_statistic);
* @endcode * @endcode
* *
* @param filename output file name * @param filename output file name
* @param step number of steps * @param step number of steps
* @param num_mol number of molecules * @param num_mol number of molecules
* @param max_depth maximum depth for check cycles in graph analyze * @param max_depth maximum depth for check cycles in graph analyze
* @param type_agl massive of number of aglomerate types * @param type_agl massive of number of agglomerate types
* @param stat_all massive of summary statistic * @param stat_all massive of summary statistic
* *
* @return 0 - exit without errors * @return 0 - exit without errors
@@ -31,9 +31,9 @@ int summary_statistic (const char *filename, const int step, const int num_mol,
int i, index; int i, index;
FILE *f_out; FILE *f_out;
/* conc concentrate of aglomerates /* conc concentrate of agglomerates
* p probability of aglomerates * p probability of agglomerates
* pn weight probability of aglomerates * pn weight probability of agglomerates
* f_out output file * f_out output file
*/ */
@@ -66,7 +66,7 @@ int summary_statistic (const char *filename, const int step, const int num_mol,
if (max_depth > 0) if (max_depth > 0)
{ {
// types of aglomerates // types of agglomerates
// linear and cycle // linear and cycle
x = type_agl[0] + type_agl[1]; x = type_agl[0] + type_agl[1];
type[0] = type_agl[0]; type[0] = type_agl[0];
+1 -1
View File
@@ -53,7 +53,7 @@ int message (const int log, const int mode, const char *text, FILE *output)
sprintf (out, "Initialization of variables from file '%s'\n", text); sprintf (out, "Initialization of variables from file '%s'\n", text);
break; break;
case 4: case 4:
sprintf (out, "%6cAglomerate was selected successfully\n", ' '); sprintf (out, "%6cAgglomerate was selected successfully\n", ' ');
break; break;
case 5: case 5:
sprintf (out, "Initial parametrs: \n%s", text); sprintf (out, "Initial parametrs: \n%s", text);
+1 -1
View File
@@ -53,7 +53,7 @@ int message (const int log, const int mode, const char *text, FILE *output)
sprintf (out, "Initialization of variables from file '%s'\n", text); sprintf (out, "Initialization of variables from file '%s'\n", text);
break; break;
case 4: case 4:
sprintf (out, "%6cAglomerate was selected successfully\n", ' '); sprintf (out, "%6cAgglomerate was selected successfully\n", ' ');
break; break;
case 5: case 5:
sprintf (out, "Initial parametrs: \n%s", text); sprintf (out, "Initial parametrs: \n%s", text);