ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update version number and "about info" to also show whether LAMMPS was loaded dynamically

Browse Source
This commit is contained in:
Axel Kohlmeyer
2023-07-27 09:09:06 -04:00
parent dd25bac428
commit 2644c064e1
3 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/lammps-gui/CMakeLists.txt
View File

@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10)
project(lammps-gui VERSION 0.1 LANGUAGES CXX)
project(lammps-gui VERSION 0.9 LANGUAGES CXX)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
@ -11,7 +11,7 @@ set(CMAKE_AUTORCC ON)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
option(LAMMPS_GUI_USE_PLUGIN "Load LAMMPS library as plugin" OFF)
option(LAMMPS_GUI_USE_PLUGIN "Load LAMMPS library dynamically at runtime" OFF)
# when this file is included as subdirectory in the LAMMPS build, many settings are directly imported
if(LAMMPS_DIR)
@ -106,6 +106,7 @@ else()
target_include_directories(lammps-gui PRIVATE ${LAMMPS_HEADER_DIR})
target_link_libraries(lammps-gui PRIVATE ${LAMMPS_LIBRARY})
endif()
target_compile_definitions(lammps-gui PRIVATE LAMMPS_GUI_VERSION="${PROJECT_VERSION}")
target_link_libraries(lammps-gui PRIVATE Qt${QT_VERSION_MAJOR}::Widgets)
set_target_properties(lammps-gui PROPERTIES

26
tools/lammps-gui/lammpsgui.cpp
View File

@ -41,7 +41,7 @@
LammpsGui::LammpsGui(QWidget *parent, const char *filename) :
QMainWindow(parent), ui(new Ui::LammpsGui), highlighter(nullptr), capturer(nullptr),
status(nullptr), logwindow(nullptr), logupdater(nullptr), progress(nullptr),
lammps_handle(nullptr), plugin_handle(nullptr), is_running(false)
lammps_handle(nullptr), plugin_handle(nullptr), plugin_path(nullptr), is_running(false)
{
ui->setupUi(this);
this->setCentralWidget(ui->textEdit);
@ -89,11 +89,16 @@ LammpsGui::LammpsGui(QWidget *parent, const char *filename) :
ui->statusbar->addWidget(progress);
#if defined(LAMMPS_GUI_USE_PLUGIN)
liblammpsplugin_t *lammps = liblammpsplugin_load("liblammps.so");
if (!lammps) lammps = liblammpsplugin_load("liblammps.dylib");
if (!lammps) lammps = liblammpsplugin_load("liblammps.dll");
liblammpsplugin_t *lammps = nullptr;
for (const auto libfile : {"liblammps.so", "./liblammps.so", "liblammps.dylib", "./liblammps.dylib", "liblammps.dll"}) {
if (!lammps) lammps = liblammpsplugin_load(libfile);
if (lammps) {
plugin_path = libfile;
break;
}
}
bool do_exit = !lammps || (lammps && lammps->abiversion != LAMMPSPLUGIN_ABI_VERSION);
if (!lammps) QMessageBox::critical(this, "Warning", "Cannot open LAMMPS shared library file");
if (!lammps) QMessageBox::critical(this, "Error", "Cannot open LAMMPS shared library file");
if (lammps && (lammps->abiversion != LAMMPSPLUGIN_ABI_VERSION))
QMessageBox::critical(this, "Warning",
"ERROR: LAMMPS lib plugin ABI version does not match");
@ -376,7 +381,16 @@ void LammpsGui::clear()
void LammpsGui::about()
{
std::string version = "This is LAMMPS-GUI version 0.1";
std::string version = "This is LAMMPS-GUI version " LAMMPS_GUI_VERSION;
#if defined(LAMMPS_GUI_USE_PLUGIN)
version += " - LAMMPS linked dynamically";
if (plugin_path) {
version += " from file ";
version += plugin_path;
}
#else
version += " - LAMMPS linked statically";
#endif
std::string info = "LAMMPS is currently running. LAMMPS config info not available.";
// LAMMPS is not re-entrant, so we can only query LAMMPS when it is not running

1
tools/lammps-gui/lammpsgui.h
View File

@ -76,6 +76,7 @@ private:
QString current_dir;
void *lammps_handle;
void *plugin_handle;
const char *plugin_path;
bool is_running;
};