From e146f059b272127db67232ae33569881e6b3c99a Mon Sep 17 00:00:00 2001 From: arcan1s Date: Wed, 29 Jan 2014 04:21:45 +0400 Subject: [PATCH] release 1.2.0 --- mathmech/PKGBUILD | 2 +- mathmech/agl/CMakeLists.txt | 6 +- mathmech/create_archive.sh | 5 +- mathmech/envir/CMakeLists.txt | 6 +- .../mathmech/resources/translations/eng.ts | 222 +++++++++--------- .../mathmech/resources/translations/rus.ts | 222 +++++++++--------- mathmech/mm/src/CMakeLists.txt | 1 + mathmech/radf/CMakeLists.txt | 6 +- mathmech/statgen/CMakeLists.txt | 6 +- mathmech/trj/CMakeLists.txt | 6 +- mathmech/trj2pdb/CMakeLists.txt | 6 +- 11 files changed, 257 insertions(+), 231 deletions(-) diff --git a/mathmech/PKGBUILD b/mathmech/PKGBUILD index 0d2475b..d040587 100644 --- a/mathmech/PKGBUILD +++ b/mathmech/PKGBUILD @@ -11,7 +11,7 @@ license=('Beerware') depends=('qt4' 'qwt') makedepends=('cmake' 'automoc4') source=(https://github.com/arcan1s/moldyn/releases/download/mm-${pkgver}/${pkgname}-${pkgver}-src.zip) -md5sums=('7b52d5d3cf576f1b6ae88d0e5ab8a2c2') +md5sums=('f3f01c7eefdedf23b4eadfbf59058332') _cmakekeys="-DCMAKE_INSTALL_PREFIX=/usr -DQWT_INCLUDE_PATH=/usr/include/qwt -DQWT_LIBRARY_PATH=/usr/lib diff --git a/mathmech/agl/CMakeLists.txt b/mathmech/agl/CMakeLists.txt index f0fccb4..d5f8de7 100644 --- a/mathmech/agl/CMakeLists.txt +++ b/mathmech/agl/CMakeLists.txt @@ -7,7 +7,11 @@ include (${SUBPROJECT}.cmake) set (LIBRARIES mm) foreach (LIBRARY ${LIBRARIES}) include_directories (${CMAKE_CURRENT_SOURCE_DIR}/../${LIBRARY}/include/) - link_directories (${LIBRARY}/src/lib) + if (CMAKE_COMPILER_IS_GNUCXX) + link_directories (${LIBRARY}/src/lib) + elseif (CMAKE_COMPILER_IS_MSVC) + link_directories (${LIBRARY}/src/Release) + endif () endforeach () # additional targets diff --git a/mathmech/create_archive.sh b/mathmech/create_archive.sh index 55fba05..21a8a94 100755 --- a/mathmech/create_archive.sh +++ b/mathmech/create_archive.sh @@ -1,6 +1,7 @@ #!/bin/bash -FILES="docs mathmech mm agl envir radf statgen trj trj2pdb AUTHORS CHANGELOG CMakeLists.txt COPYING docs.cmake doxygen.conf.in INSTALL version.h.in" +SUBS="docs mathmech mm agl envir radf statgen trj trj2pdb" +ADDS="AUTHORS CHANGELOG CMakeLists.txt COPYING docs.cmake doxygen.conf.in INSTALL version.h.in" ARCHIVE="mathmech" VERSION=`grep -m1 PROJECT_VERSION_MAJOR CMakeLists.txt | awk '{print $3}' | cut -c 1`.\ `grep -m1 PROJECT_VERSION_MINOR CMakeLists.txt | awk '{print $3}' | cut -c 1`.\ @@ -10,7 +11,7 @@ VERSION=`grep -m1 PROJECT_VERSION_MAJOR CMakeLists.txt | awk '{print $3}' | cut if [ -e ${ARCHIVE}-${VERSION}-src.zip ]; then rm -f ${ARCHIVE}-${VERSION}-src.zip fi -zip -9 -y -r -q ${ARCHIVE}-${VERSION}-src.zip ${FILES} +zip -9qry ${ARCHIVE}-${VERSION}-src.zip ${ADDS} ${SUBS} # update md5sum MD5SUMS=`md5sum ${ARCHIVE}-${VERSION}-src.zip | awk '{print $1}'` diff --git a/mathmech/envir/CMakeLists.txt b/mathmech/envir/CMakeLists.txt index d2c1534..02dedfb 100644 --- a/mathmech/envir/CMakeLists.txt +++ b/mathmech/envir/CMakeLists.txt @@ -7,7 +7,11 @@ include (${SUBPROJECT}.cmake) set (LIBRARIES mm) foreach (LIBRARY ${LIBRARIES}) include_directories (${CMAKE_CURRENT_SOURCE_DIR}/../${LIBRARY}/include/) - link_directories (${LIBRARY}/src/lib) + if (CMAKE_COMPILER_IS_GNUCXX) + link_directories (${LIBRARY}/src/lib) + elseif (CMAKE_COMPILER_IS_MSVC) + link_directories (${LIBRARY}/src/Release) + endif () endforeach () # additional targets diff --git a/mathmech/mathmech/resources/translations/eng.ts b/mathmech/mathmech/resources/translations/eng.ts index 18a135c..13ef623 100644 --- a/mathmech/mathmech/resources/translations/eng.ts +++ b/mathmech/mathmech/resources/translations/eng.ts @@ -50,22 +50,22 @@ p, li { white-space: pre-wrap; } AgglWindow - + Select file Select file - + 'statgen' output files (*.dat);;All files (*.*) 'statgen' output files (*.dat);;All files (*.*) - + Save file as... Save file as... - + Agglomerate files (*.agl);;All files (*.*) Agglomerate files (*.agl);;All files (*.*) @@ -155,13 +155,13 @@ p, li { white-space: pre-wrap; } AglAll - - + + Processing 'agl'... Processing 'agl'... - + Done Done @@ -169,27 +169,27 @@ p, li { white-space: pre-wrap; } AglAllWindow - + Select work directory Select work directory - + Select trajectory file Select trajectory file - + 'statgen' output files (*.dat);;All files (*.*) 'statgen' output files (*.dat);;All files (*.*) - + Save file as... Save file as... - + PDB files (*.pdb);;All files (*.*) PDB files (*.pdb);;All files (*.*) @@ -285,19 +285,19 @@ p, li { white-space: pre-wrap; } AtomTypesWindow - + Save file as... Save file as... - + Atom types files (*.types);;All files (*.*) Atom types files (*.types);;All files (*.*) - - + + Add new molecule Add new molecule @@ -426,72 +426,72 @@ p, li { white-space: pre-wrap; } ErrorWindow - + Work directory does not exists Work directory does not exists - + Input file is not set Input file is not set - + Atoms in plane must be different Atoms in plane must be different - + Atom types file is not set Atom types file is not set - + Output file is not set Output file is not set - + Atom type must contain 2 characters Atom type must contain 2 characters - + Log file is not set Log file is not set - + Component is not found Component is not found - + Atom types is not set Atom types is not set - + Something wrong Something wrong - + Interactions are not set Interactions are not set - + Invalid file type Invalid file type - + Interaction step is not set Interaction step is not set - + Unknown error Unknown error @@ -1108,7 +1108,7 @@ p, li { white-space: pre-wrap; } <li align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Set the maximum depth for search cycles, the log file and the graph generate if this needed.</li> <li align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">For the variation of geometric criteria you need specify the criteria step changes and the number of steps.</li> <li align="justify" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Run application.</li></ol></body></html> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Liberation Serif'; font-size:10pt; font-weight:400; font-style:normal;"> @@ -1136,7 +1136,7 @@ p, li { white-space: pre-wrap; } <li align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Set the output file.</li> <li align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Set the maximum depth for search cycles, the log file and the graph generate if this needed.</li> <li align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">For the variation of geometric criteria you need specify the criteria step changes and the number of steps.</li> -<li align="justify" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Run application.</li></ol></body></html> {3C?} {4.0/?} {3.?} {40/?} {1"?} {10p?} {400;?} {12p?} {12p?} {0p?} {0p?} {0;?} {0p?} {600;?} {12p?} {12p?} {0p?} {0p?} {0;?} {0p?} {12p?} {12p?} {0p?} {0p?} {0;?} {0p?} {4.?} {0-0:2.4,0-1:3.0&?} {0-0 ?} {2.4 ?} {0-1 ?} {3.0 ?} {3)?} {12p?} {12p?} {0p?} {0p?} {0;?} {0p?} {12p?} {12p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {1;?} {12p?} {0p?} {0p?} {0p?} {0;?} {0p?} {1.1.0&?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {1)?} {1)?} {1)?} {1)?} {1.0000,2.0000,3.0000)?} {1,2,3,4)?} {0, 0 ?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {001)?} {2 ?} {0000001 0000001 ?} {7 ?} {7 ?} {2=?} {1.3.4.?} {1 ?} {1.3.4.?} {0000001=?} {2,3,4,5,?} {1 ?} {7 ?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {2 ?} {0000001 0000002 000003.00 004.00000 0005.00000<?} {7 ?} {7 ?} {9 ?} {2 ?} {9 ?} {5 ?} {10 ?} {5 ?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0.10000)?} {0.10000)?} {0.10000)?} {0.10000)?} {03=?} {0.10000)?} {12p?} {12p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {1;?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {12p?} {12p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {1;?} {12p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {12p?} {0p?} {0p?} {0;?} {0p?} +<li align="justify" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Run application.</li></ol></body></html> @@ -1167,7 +1167,7 @@ p, li { white-space: pre-wrap; } <li align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Set radial criteria. Set angular criteria if this needed.</li> <li align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Set the matrix output, the log file and the graph generate if this needed.</li> <li align="justify" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Run application.</li></ol></body></html> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Liberation Serif'; font-size:10pt; font-weight:400; font-style:normal;"> @@ -1193,7 +1193,7 @@ p, li { white-space: pre-wrap; } <li align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Set needed atoms.</li> <li align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Set radial criteria. Set angular criteria if this needed.</li> <li align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Set the matrix output, the log file and the graph generate if this needed.</li> -<li align="justify" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Run application.</li></ol></body></html> {3C?} {4.0/?} {3.?} {40/?} {1"?} {10p?} {400;?} {12p?} {12p?} {0p?} {0p?} {0;?} {0p?} {600;?} {12p?} {12p?} {0p?} {0p?} {0;?} {0p?} {12p?} {12p?} {0p?} {0p?} {0;?} {0p?} {1-2&?} {1,2,3-4,5,6&?} {2.0 ?} {15.0<?} {0.2<?} {0.0 ?} {90.0<?} {12p?} {12p?} {0p?} {0p?} {0;?} {0p?} {12p?} {12p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {1;?} {12p?} {0p?} {0p?} {0p?} {0;?} {0p?} {1.1.0&?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {1)?} {1)?} {1)?} {1)?} {1)?} {1.0000,2.0000,3.0000)?} {0)?} {0 ?} {1 ?} {2 ?} {0.100)?} {0.100)?} {0.100)?} {0.10)?} {0.10)?} {0.10)?} {1-2)?} {1,2,3-4,5,6)?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {2 ?} {0001.0000 2.0000e?} {01 000000003 04.000000<?} {9 ?} {4 ?} {10 ?} {4 ?} {9 ?} {9 ?} {6 ?} {0001.0000 04.000000<?} {9 ?} {4 ?} {9 ?} {6 ?} {0001.0000 000005.00 2.0000e?} {01 000000003 04.000000<?} {9 ?} {4 ?} {9 ?} {2 ?} {10 ?} {4 ?} {9 ?} {9 ?} {6 ?} {9 ?} {2 ?} {0001.0000 04.000000 ?} {9 ?} {4 ?} {9 ?} {6 ?} {0p?} {12p?} {0p?} {0p?} {0;?} {0p?} {12p?} {12p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {1;?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {1 ?} {4*?} {2*?} {1 ?} {4*?} {2*?} {12p?} {12p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {1;?} {12p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {12p?} {0p?} {0p?} {0;?} {0p?} +<li align="justify" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Run application.</li></ol></body></html> @@ -1341,12 +1341,12 @@ p, li { white-space: pre-wrap; } Close - + Save file as Save file as - + html files (*.html);;All files (*.*) html files (*.html);;All files (*.*) @@ -1358,159 +1358,159 @@ p, li { white-space: pre-wrap; } MainWindow - + Ready Ready - - - - - + + + + + Select work directory Select work directory - - - + + + Select trajectory file Select trajectory file - + All files (*.*) All files (*.*) - + Select atom types file Select atom types file - + Atom types files (*.types);;All files (*.*) Atom types files (*.types);;All files (*.*) - + Save files as Save files as - + Mask of trajectory files Mask of trajectory files - - - - - + + + + + Save log file as... Save log file as... - - - - - + + + + + Log files (*.log) Log files (*.log) - - + + Select trajectory files Select trajectory files - - - - + + + + Trajectory files (*.*[0-9]) Trajectory files (*.*[0-9]) - - + + Save output file as... Save output file as... - - + + Output files (*.dat) Output files (*.dat) - - + + Save PDB file as... Save PDB file as... - - + + PDB files (*.pdb) PDB files (*.pdb) - + Select agglomerate file Select agglomerate file - + Agglomerate files (*.agl);;All files (*.*) Agglomerate files (*.agl);;All files (*.*) - - + + Processing 'trj'... Processing 'trj'... - - - - - + + + + + Done Done - - + + Processing 'statgen'... Processing 'statgen'... - - + + Processing 'envir'... Processing 'envir'... - - + + Processing 'radf'... Processing 'radf'... - - + + Processing 'agl'... Processing 'agl'... - - + + Processing 'trj2pdb'... Processing 'trj2pdb'... @@ -2181,22 +2181,22 @@ p, li { white-space: pre-wrap; } SettingsWindow - - - - - - + + + + + + Select component Select component - - - - - - + + + + + + All files (*) All files (*) @@ -2299,32 +2299,32 @@ p, li { white-space: pre-wrap; } StatgenGraphWindow - + N N - + p p - + r r - + g g - + Save image as... Save image as... - + JPEG file (*.jpeg);;Portable Network Graphics file (*.png);;Bitmap file (*.bmp) JPEG file (*.jpeg);;Portable Network Graphics file (*.png);;Bitmap file (*.bmp) diff --git a/mathmech/mathmech/resources/translations/rus.ts b/mathmech/mathmech/resources/translations/rus.ts index 70c512f..1035ae7 100644 --- a/mathmech/mathmech/resources/translations/rus.ts +++ b/mathmech/mathmech/resources/translations/rus.ts @@ -50,22 +50,22 @@ p, li { white-space: pre-wrap; } AgglWindow - + Select file Выбор файла - + 'statgen' output files (*.dat);;All files (*.*) Файлы 'statgen' (*.dat);;Все файлы (*.*) - + Save file as... Сохранить файл как... - + Agglomerate files (*.agl);;All files (*.*) Файл с агломератом (*.agl);Все файлы (*.*) @@ -155,13 +155,13 @@ p, li { white-space: pre-wrap; } AglAll - - + + Processing 'agl'... Выполняется 'agl'... - + Done Готово @@ -169,27 +169,27 @@ p, li { white-space: pre-wrap; } AglAllWindow - + Select work directory Выбор рабочей директории - + Select trajectory file Выбор файла траектории - + 'statgen' output files (*.dat);;All files (*.*) Файлы 'statgen' (*.dat);;Все файлы (*.*) - + Save file as... Сохранить файл как... - + PDB files (*.pdb);;All files (*.*) PDB файлы (*.pdb);;Все файлы (*.*) @@ -315,9 +315,9 @@ p, li { white-space: pre-wrap; } 1 - - + + Add new molecule Добавить новую молекулу @@ -413,12 +413,12 @@ p, li { white-space: pre-wrap; } Закрыть - + Save file as... Сохранить файл как... - + Atom types files (*.types);;All files (*.*) Файл типов атомов (*.types);;Все файлы (*.*) @@ -426,72 +426,72 @@ p, li { white-space: pre-wrap; } ErrorWindow - + Work directory does not exists Рабочая директория не существует - + Input file is not set Входной файл не задан - + Atoms in plane must be different Атомы, образующие плоскость, должны быть различными - + Atom types file is not set Типы атомов не заданы - + Output file is not set Выходной файл не задан - + Atom type must contain 2 characters Тип атома должен содержать 2 символа - + Log file is not set Лог файл не задан - + Component is not found Компонент не найден - + Atom types is not set Тип атома не задан - + Something wrong Что то не так - + Interactions are not set Взаимодействия не заданы - + Invalid file type Неправильный тип файла - + Interaction step is not set Шаг взаимодействия не задан - + Unknown error Неизвестная ошибка @@ -1108,7 +1108,7 @@ p, li { white-space: pre-wrap; } <li align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Set the maximum depth for search cycles, the log file and the graph generate if this needed.</li> <li align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">For the variation of geometric criteria you need specify the criteria step changes and the number of steps.</li> <li align="justify" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Run application.</li></ol></body></html> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Liberation Serif'; font-size:10pt; font-weight:400; font-style:normal;"> @@ -1136,7 +1136,7 @@ p, li { white-space: pre-wrap; } <li align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Указать генерируемый файл.</li> <li align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">При необходимости указать максимальную глубину для проверки числа циклов в агломератах, файл лога и генерацию графика.</li> <li align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Для вариации геометрических критериев необходимо указать шаг изменения критериев и число шагов.</li> -<li align="justify" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Запустить приложение.</li></ol></body></html> {3C?} {4.0/?} {3.?} {40/?} {1"?} {10p?} {400;?} {12p?} {12p?} {0p?} {0p?} {0;?} {0p?} {600;?} {12p?} {12p?} {0p?} {0p?} {0;?} {0p?} {12p?} {12p?} {0p?} {0p?} {0;?} {0p?} {4.?} {0-0:2.4,0-1:3.0&?} {0-0 ?} {2.4 ?} {0-1 ?} {3.0 ?} {3)?} {12p?} {12p?} {0p?} {0p?} {0;?} {0p?} {12p?} {12p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {1;?} {12p?} {0p?} {0p?} {0p?} {0;?} {0p?} {1.1.0&?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {1)?} {1)?} {1)?} {1)?} {1.0000,2.0000,3.0000)?} {1,2,3,4)?} {0, 0 ?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {001)?} {2 ?} {0000001 0000001 ?} {7 ?} {7 ?} {2=?} {1.3.4.?} {1 ?} {1.3.4.?} {0000001=?} {2,3,4,5,?} {1 ?} {7 ?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {2 ?} {0000001 0000002 000003.00 004.00000 0005.00000<?} {7 ?} {7 ?} {9 ?} {2 ?} {9 ?} {5 ?} {10 ?} {5 ?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0.10000)?} {0.10000)?} {0.10000)?} {0.10000)?} {03=?} {0.10000)?} {12p?} {12p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {1;?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {12p?} {12p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {1;?} {12p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {12p?} {0p?} {0p?} {0;?} {0p?} +<li align="justify" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Запустить приложение.</li></ol></body></html> @@ -1167,7 +1167,7 @@ p, li { white-space: pre-wrap; } <li align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Set radial criteria. Set angular criteria if this needed.</li> <li align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Set the matrix output, the log file and the graph generate if this needed.</li> <li align="justify" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Run application.</li></ol></body></html> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Liberation Serif'; font-size:10pt; font-weight:400; font-style:normal;"> @@ -1193,7 +1193,7 @@ p, li { white-space: pre-wrap; } <li align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Указать искомые атомы.</li> <li align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Указать радиальные параметры функции в А. При необходимости указать угловые параметры функции в градусах.</li> <li align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">При необходимости указать печать в виде матрицы, файл лога и генерацию графика.</li> -<li align="justify" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Запустить приложение.</li></ol></body></html> {3C?} {4.0/?} {3.?} {40/?} {1"?} {10p?} {400;?} {12p?} {12p?} {0p?} {0p?} {0;?} {0p?} {600;?} {12p?} {12p?} {0p?} {0p?} {0;?} {0p?} {12p?} {12p?} {0p?} {0p?} {0;?} {0p?} {1-2&?} {1,2,3-4,5,6&?} {2.0 ?} {15.0<?} {0.2<?} {0.0 ?} {90.0<?} {12p?} {12p?} {0p?} {0p?} {0;?} {0p?} {12p?} {12p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {1;?} {12p?} {0p?} {0p?} {0p?} {0;?} {0p?} {1.1.0&?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {1)?} {1)?} {1)?} {1)?} {1)?} {1.0000,2.0000,3.0000)?} {0)?} {0 ?} {1 ?} {2 ?} {0.100)?} {0.100)?} {0.100)?} {0.10)?} {0.10)?} {0.10)?} {1-2)?} {1,2,3-4,5,6)?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {2 ?} {0001.0000 2.0000e?} {01 000000003 04.000000<?} {9 ?} {4 ?} {10 ?} {4 ?} {9 ?} {9 ?} {6 ?} {0001.0000 04.000000<?} {9 ?} {4 ?} {9 ?} {6 ?} {0001.0000 000005.00 2.0000e?} {01 000000003 04.000000<?} {9 ?} {4 ?} {9 ?} {2 ?} {10 ?} {4 ?} {9 ?} {9 ?} {6 ?} {9 ?} {2 ?} {0001.0000 04.000000 ?} {9 ?} {4 ?} {9 ?} {6 ?} {0p?} {12p?} {0p?} {0p?} {0;?} {0p?} {12p?} {12p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {1;?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {1 ?} {4*?} {2*?} {1 ?} {4*?} {2*?} {12p?} {12p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {1;?} {12p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {0p?} {12p?} {0p?} {0p?} {0;?} {0p?} +<li align="justify" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Запустить приложение.</li></ol></body></html> @@ -1341,12 +1341,12 @@ p, li { white-space: pre-wrap; } Закрыть - + Save file as Сохранить файл как - + html files (*.html);;All files (*.*) html файлы (*.html);;Все файлы (*.*) @@ -1358,159 +1358,159 @@ p, li { white-space: pre-wrap; } MainWindow - + Ready Готов - - - - - + + + + + Select work directory Выбор рабочей директории - - - + + + Select trajectory file Выбор файла траектории - + All files (*.*) Все файлы (*.*) - + Select atom types file Выбор файла типов атомов - + Atom types files (*.types);;All files (*.*) Файл типов атомов (*.types);;Все файлы (*.*) - + Save files as Сохранить файл как... - + Mask of trajectory files Маска файлов траектории - - - - - + + + + + Save log file as... Сохранить лог как... - - - - - + + + + + Log files (*.log) Лог (*.log) - - + + Select trajectory files Выбор файла траектории - - - - + + + + Trajectory files (*.*[0-9]) Файлы траектории (*.*[0-9]) - - + + Save output file as... Сохранить файл как... - - + + Output files (*.dat) Выходной файл (*.dat) - - + + Save PDB file as... Сохранить PDB как... - - + + PDB files (*.pdb) PDB файл (*.pdb) - + Select agglomerate file Выбор файла с агломератом - + Agglomerate files (*.agl);;All files (*.*) Файл с агломератом (*.agl);Все файлы (*.*) - - + + Processing 'trj'... Выполняется 'trj'... - - - - - + + + + + Done Готово - - + + Processing 'statgen'... Выполняется 'statgen'... - - + + Processing 'envir'... Выполняется 'envir'... - - + + Processing 'radf'... Выполняется 'radf'... - - + + Processing 'agl'... Выполняется 'agl'... - - + + Processing 'trj2pdb'... Выполняется 'trj2pdb'... @@ -2181,22 +2181,22 @@ p, li { white-space: pre-wrap; } SettingsWindow - - - - - - + + + + + + Select component Выбор компонента - - - - - - + + + + + + All files (*) Все файлы (*) @@ -2299,32 +2299,32 @@ p, li { white-space: pre-wrap; } StatgenGraphWindow - + N N - + p p - + r r - + g g - + Save image as... Сохранить изображение как... - + JPEG file (*.jpeg);;Portable Network Graphics file (*.png);;Bitmap file (*.bmp) JPEG (*.jpeg);;Portable Network Graphics (*.png);;Bitmap (*.bmp) diff --git a/mathmech/mm/src/CMakeLists.txt b/mathmech/mm/src/CMakeLists.txt index f4ed7e2..0a188ba 100644 --- a/mathmech/mm/src/CMakeLists.txt +++ b/mathmech/mm/src/CMakeLists.txt @@ -15,6 +15,7 @@ message (STATUS "${SUBPROJECT} HEADERS: ${HEADERS}") # link libraries and compile add_library (${SUBPROJECT} SHARED ${SOURCES} ${HEADERS}) +add_library (${SUBPROJECT} STATIC ${SOURCES} ${HEADERS}) set_target_properties (${SUBPROJECT} PROPERTIES SOVERSION ${PROJECT_VERSION}) target_link_libraries (${SUBPROJECT} ${ADDITIONAL_LIB}) diff --git a/mathmech/radf/CMakeLists.txt b/mathmech/radf/CMakeLists.txt index 8b8f097..ba3c4a1 100644 --- a/mathmech/radf/CMakeLists.txt +++ b/mathmech/radf/CMakeLists.txt @@ -7,7 +7,11 @@ include (${SUBPROJECT}.cmake) set (LIBRARIES mm) foreach (LIBRARY ${LIBRARIES}) include_directories (${CMAKE_CURRENT_SOURCE_DIR}/../${LIBRARY}/include/) - link_directories (${LIBRARY}/src/lib) + if (CMAKE_COMPILER_IS_GNUCXX) + link_directories (${LIBRARY}/src/lib) + elseif (CMAKE_COMPILER_IS_MSVC) + link_directories (${LIBRARY}/src/Release) + endif () endforeach () # additional targets diff --git a/mathmech/statgen/CMakeLists.txt b/mathmech/statgen/CMakeLists.txt index 0d68d7d..686f99a 100644 --- a/mathmech/statgen/CMakeLists.txt +++ b/mathmech/statgen/CMakeLists.txt @@ -7,7 +7,11 @@ include (${SUBPROJECT}.cmake) set (LIBRARIES mm) foreach (LIBRARY ${LIBRARIES}) include_directories (${CMAKE_CURRENT_SOURCE_DIR}/../${LIBRARY}/include/) - link_directories (${LIBRARY}/src/lib) + if (CMAKE_COMPILER_IS_GNUCXX) + link_directories (${LIBRARY}/src/lib) + elseif (CMAKE_COMPILER_IS_MSVC) + link_directories (${LIBRARY}/src/Release) + endif () endforeach () # additional targets diff --git a/mathmech/trj/CMakeLists.txt b/mathmech/trj/CMakeLists.txt index ce1e4bf..4914df8 100644 --- a/mathmech/trj/CMakeLists.txt +++ b/mathmech/trj/CMakeLists.txt @@ -7,7 +7,11 @@ include (${SUBPROJECT}.cmake) set (LIBRARIES mm) foreach (LIBRARY ${LIBRARIES}) include_directories (${CMAKE_CURRENT_SOURCE_DIR}/../${LIBRARY}/include/) - link_directories (${LIBRARY}/src/lib) + if (CMAKE_COMPILER_IS_GNUCXX) + link_directories (${LIBRARY}/src/lib) + elseif (CMAKE_COMPILER_IS_MSVC) + link_directories (${LIBRARY}/src/Release) + endif () endforeach () # additional targets diff --git a/mathmech/trj2pdb/CMakeLists.txt b/mathmech/trj2pdb/CMakeLists.txt index 9b223a8..e1d88cf 100644 --- a/mathmech/trj2pdb/CMakeLists.txt +++ b/mathmech/trj2pdb/CMakeLists.txt @@ -7,7 +7,11 @@ include (${SUBPROJECT}.cmake) set (LIBRARIES mm) foreach (LIBRARY ${LIBRARIES}) include_directories (${CMAKE_CURRENT_SOURCE_DIR}/../${LIBRARY}/include/) - link_directories (${LIBRARY}/src/lib) + if (CMAKE_COMPILER_IS_GNUCXX) + link_directories (${LIBRARY}/src/lib) + elseif (CMAKE_COMPILER_IS_MSVC) + link_directories (${LIBRARY}/src/Release) + endif () endforeach () # additional targets