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

changes for portability with Qt 5.12 on Ubuntu 20.04LTS

Browse Source
This commit is contained in:
Axel Kohlmeyer
2023-07-31 07:04:25 -04:00
parent 0a0184221c
commit 2f159df3b7
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,7 +78,7 @@ set(PROJECT_SOURCES
stdcapture.cpp stdcapture.cpp
${PLUGIN_LOADER_SRC} ${PLUGIN_LOADER_SRC}
) )
qt_add_resources(PROJECT_SOURCES lammpsgui.qrc) qt5_add_resources(PROJECT_SOURCES lammpsgui.qrc)
if(APPLE) if(APPLE)
set(MACOSX_ICON_FILE ${LAMMPS_DIR}/cmake/packaging/lammps.icns) set(MACOSX_ICON_FILE ${LAMMPS_DIR}/cmake/packaging/lammps.icns)
@ -99,7 +99,7 @@ else()
target_link_libraries(lammps-gui PRIVATE ${LAMMPS_LIBRARY}) target_link_libraries(lammps-gui PRIVATE ${LAMMPS_LIBRARY})
endif() endif()
target_compile_definitions(lammps-gui PRIVATE LAMMPS_GUI_VERSION="${PROJECT_VERSION}") target_compile_definitions(lammps-gui PRIVATE LAMMPS_GUI_VERSION="${PROJECT_VERSION}")
target_link_libraries(lammps-gui PRIVATE Qt${QT_VERSION_MAJOR}::Widgets) target_link_libraries(lammps-gui PRIVATE Qt5::Widgets)
if(BUILD_OMP) if(BUILD_OMP)
find_package(OpenMP COMPONENTS CXX REQUIRED) find_package(OpenMP COMPONENTS CXX REQUIRED)
target_link_libraries(lammps-gui PRIVATE OpenMP::OpenMP_CXX) target_link_libraries(lammps-gui PRIVATE OpenMP::OpenMP_CXX)

4
tools/lammps-gui/imageviewer.cpp
View File

@ -161,7 +161,11 @@ void ImageViewer::updateActions()
void ImageViewer::scaleImage(double factor) void ImageViewer::scaleImage(double factor)
{ {
scaleFactor *= factor; scaleFactor *= factor;
#if QT_VERSION < QT_VERSION_CHECK(5,15,0)
imageLabel->resize(scaleFactor * imageLabel->pixmap()->size());
#else
imageLabel->resize(scaleFactor * imageLabel->pixmap(Qt::ReturnByValue).size()); imageLabel->resize(scaleFactor * imageLabel->pixmap(Qt::ReturnByValue).size());
#endif
adjustScrollBar(scrollArea->horizontalScrollBar(), factor); adjustScrollBar(scrollArea->horizontalScrollBar(), factor);
adjustScrollBar(scrollArea->verticalScrollBar(), factor); adjustScrollBar(scrollArea->verticalScrollBar(), factor);

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

@ -611,7 +611,7 @@ void LammpsGui::about()
QFont font; QFont font;
font.setFixedPitch(true); font.setFixedPitch(true);
font.setStyleHint(QFont::TypeWriter); font.setStyleHint(QFont::TypeWriter);
font.setFamilies(QStringList({"Arial", "Helvetica"})); font.setFamily("Arial");
font.setPointSize(8); font.setPointSize(8);
msg.setFont(font); msg.setFont(font);
msg.exec(); msg.exec();