[ehb54/ultrascan3] c32962: Fix theme edge cases
Branch: refs/heads/875-request-cmake-remove-gmp-module-from-installer-for-osx Home: https://github.com/ehb54/ultrascan3 Commit: c32962f2eaf66f7230830f436e0fdb491e8ad9a8 https://github.com/ehb54/ultrascan3/commit/c32962f2eaf66f7230830f436e0fdb491... Author: Lukas Dobler <69309597+doluk@users.noreply.github.com> Date: 2026-08-19 (Wed, 19 Aug 2026) Changed paths: M gui/us_plot.cpp M gui/us_plot.h M gui/us_solution_gui.cpp M gui/us_theme.cpp M gui/us_theme.h M gui/us_widgets.cpp M gui/us_widgets_dialog.cpp M programs/us_config/us_color.cpp Log Message: ----------- Fix theme edge cases Commit: b79db6ebbbcc6df95babf034d1f7372ec746c623 https://github.com/ehb54/ultrascan3/commit/b79db6ebbbcc6df95babf034d1f7372ec... Author: ehb54 <brookes@uthscsa.edu> Date: 2026-08-19 (Wed, 19 Aug 2026) Changed paths: M us_somo/develop/include/us_hydrodyn_perceive_dialog.h Log Message: ----------- Fix Windows/MinGW build: std::byte vs rpcndr.h byte ambiguity moc_us_hydrodyn_perceive_dialog.cpp failed to compile under MSYS2/MinGW64 with ~40 "reference to byte is ambiguous" errors from the Win32 SDK headers. us_hydrodyn_perceive_somo.h reaches us_hydrodyn_pdbdefs.h, whose "using namespace std;" makes std::byte visible unqualified. us_util.h then pulls in windows.h via us.h -> QtWidgets -> qopengl.h -> qt_windows.h, and rpcndr.h typedefs a global "byte", so every subsequent use is ambiguous. Including us_util.h first parses windows.h before the using-directive is in scope, which is the order every other SOMO header already follows (see us_hydrodyn.h, us.h at line 29 ahead of us_hydrodyn_pdbdefs.h at line 35). The .cpp was unaffected because it includes us3_defines.h first; only the moc translation unit, which includes the header bare, hit the error. Ref ehb54/ultrascan-tickets#1022 Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Commit: e235c2d5b3f5800f7831622b920971a1e5dfcc0a https://github.com/ehb54/ultrascan3/commit/e235c2d5b3f5800f7831622b920971a1e... Author: emre brookes <ehb54@users.noreply.github.com> Date: 2026-08-19 (Wed, 19 Aug 2026) Changed paths: M us_somo/develop/include/us_hydrodyn_perceive_dialog.h Log Message: ----------- Merge pull request #529 from ehb54/ehb54-issue-1022 Fix Windows/MinGW build: std::byte vs rpcndr.h byte ambiguity in perceive dialog header Commit: 541ee619eefc3ce6c914f427300b34e325e1b9bb https://github.com/ehb54/ultrascan3/commit/541ee619eefc3ce6c914f427300b34e32... Author: Lukas Dobler <69309597+doluk@users.noreply.github.com> Date: 2026-08-19 (Wed, 19 Aug 2026) Changed paths: M us_somo/develop/include/us_hydrodyn_perceive_dialog.h Log Message: ----------- Merge branch 'main' into lukas/theme-fixes Commit: c6a60ed2b23dfa8ae71808dca2f60bf724bba514 https://github.com/ehb54/ultrascan3/commit/c6a60ed2b23dfa8ae71808dca2f60bf72... Author: alexsav815 <alexsav.science@gmail.com> Date: 2026-08-19 (Wed, 19 Aug 2026) Changed paths: M programs/us_experiment/us_experiment_gui_optima.cpp Log Message: ----------- GMP | R&D: 1. EXP.: Speeds -- align time widgets... Commit: ebd251ac84ba1fdb734b8d72ac3bac37e6d6c433 https://github.com/ehb54/ultrascan3/commit/ebd251ac84ba1fdb734b8d72ac3bac37e... Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Date: 2026-08-19 (Wed, 19 Aug 2026) Changed paths: M VERSION M utils/us_defines.h Log Message: ----------- Bump version to 4.2.0 Commit: c3af75e5474aa48d83525e0131866f61357ca870 https://github.com/ehb54/ultrascan3/commit/c3af75e5474aa48d83525e0131866f613... Author: aaron-auc <95181880+aaron-auc@users.noreply.github.com> Date: 2026-08-19 (Wed, 19 Aug 2026) Changed paths: M doc/manual/source/conf.py Log Message: ----------- Update docs version to v4.2.0 in conf.py Commit: b6fe806f04bd4ffa22a2ea0d3a338b5a2ca208e0 https://github.com/ehb54/ultrascan3/commit/b6fe806f04bd4ffa22a2ea0d3a338b5a2... Author: Lukas Dobler <69309597+doluk@users.noreply.github.com> Date: 2026-08-19 (Wed, 19 Aug 2026) Changed paths: M gui/us_plot.cpp M gui/us_plot.h M gui/us_solution_gui.cpp M gui/us_theme.cpp M gui/us_theme.h M gui/us_widgets.cpp M gui/us_widgets_dialog.cpp M programs/us_config/us_color.cpp Log Message: ----------- Merge pull request #528 from ehb54/lukas/theme-fixes Fix theme edge cases Commit: 03df6a27c1dcfd2740fa58f3bc38da61ec94f407 https://github.com/ehb54/ultrascan3/commit/03df6a27c1dcfd2740fa58f3bc38da61e... Author: aaron-auc <95181880+aaron-auc@users.noreply.github.com> Date: 2026-08-19 (Wed, 19 Aug 2026) Changed paths: M gui/us_plot.cpp M gui/us_plot.h M gui/us_solution_gui.cpp M gui/us_theme.cpp M gui/us_theme.h M gui/us_widgets.cpp M gui/us_widgets_dialog.cpp M programs/us_config/us_color.cpp Log Message: ----------- Merge branch 'main' into bump-to-v4.2.0 Commit: 6d9a1a1e6df5f257919824974de23c3f26ab0a6f https://github.com/ehb54/ultrascan3/commit/6d9a1a1e6df5f257919824974de23c3f2... Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Date: 2026-08-19 (Wed, 19 Aug 2026) Changed paths: M VERSION M utils/us_defines.h Log Message: ----------- Bump version to 4.3.0-dev Commit: 9887a93993076263fc434ca7610e1fe94096aec5 https://github.com/ehb54/ultrascan3/commit/9887a93993076263fc434ca7610e1fe94... Author: emre brookes <ehb54@users.noreply.github.com> Date: 2026-08-19 (Wed, 19 Aug 2026) Changed paths: M VERSION M doc/manual/source/conf.py M utils/us_defines.h Log Message: ----------- Merge pull request #531 from ehb54/bump-to-v4.2.0 Bump to v4.2.0 Commit: d6c7fbd12aab697c443183f00b8f48d4af54aae8 https://github.com/ehb54/ultrascan3/commit/d6c7fbd12aab697c443183f00b8f48d4a... Author: ehb54 <brookes@uthscsa.edu> Date: 2026-08-20 (Thu, 20 Aug 2026) Changed paths: M gui.pri Log Message: ----------- Define US_MAKE_DLL and QWT_DLL for Windows application builds Applications include gui.pri, which never defined US_MAKE_DLL, so us_extern.h fell through its Windows branch and expanded US_GUI_EXTERN and US_UTIL_EXTERN to a GCC visibility attribute instead of __declspec(dllimport). qwt_global.h leaves QWT_EXPORT empty on the same terms, and only libus_gui.pro defined QWT_DLL. Without the import attribute MinGW resolves the library classes through import thunks linked into the executable, so taking the address of a signal in an application translation unit yields the thunk rather than the function the library holds. The pointer-to-member form of connect() matches signals by that address, so every such connection silently failed to bind on Windows while the string based SIGNAL/SLOT form, which matches by name, was unaffected. This surfaced as the meniscus control-click and the scan exclusion click doing nothing in us_edit on the Windows package. The CMake build already defines both for every application target, which is why builds made through the presets were never affected. Commit: 9e358c8bba18a8ccba5b44c40ed4d869c8e69c27 https://github.com/ehb54/ultrascan3/commit/9e358c8bba18a8ccba5b44c40ed4d869c... Author: emre brookes <ehb54@users.noreply.github.com> Date: 2026-08-20 (Thu, 20 Aug 2026) Changed paths: M gui.pri Log Message: ----------- Merge pull request #533 from ehb54/ehb54-qmake-win-dllimport Fix Windows application builds losing dllimport for us_gui, us_utils and qwt Commit: f73ffab665d1015d137908badc7e64212136eebd https://github.com/ehb54/ultrascan3/commit/f73ffab665d1015d137908badc7e64212... Author: alexsav815 <alexsav.science@gmail.com> Date: 2026-08-20 (Thu, 20 Aug 2026) Changed paths: M VERSION M doc/manual/source/conf.py M gui.pri M gui/us_plot.cpp M gui/us_plot.h M gui/us_solution_gui.cpp M gui/us_theme.cpp M gui/us_theme.h M gui/us_widgets.cpp M gui/us_widgets_dialog.cpp M programs/us_config/us_color.cpp M utils/us_defines.h Log Message: ----------- Merge branch 'main' into alexey-dev-issue1020 Commit: b9bb346987fe0adee3ebccbc8a10a60e2928becd https://github.com/ehb54/ultrascan3/commit/b9bb346987fe0adee3ebccbc8a10a60e2... Author: alexsav815 <alexsav.science@gmail.com> Date: 2026-08-20 (Thu, 20 Aug 2026) Changed paths: M programs/us_experiment/us_experiment_gui_optima.cpp Log Message: ----------- Merge pull request #530 from ehb54/alexey-dev-issue1020 GMP | R&D: 1. EXP.: Speeds -- align time widgets... Commit: 619ea38f136aec298a9ae6eb788febf322579889 https://github.com/ehb54/ultrascan3/commit/619ea38f136aec298a9ae6eb788febf32... Author: aaron-auc <95181880+aaron-auc@users.noreply.github.com> Date: 2026-08-23 (Sun, 23 Aug 2026) Changed paths: M doc/manual/source/conf.py M gui.pri M programs/us_experiment/us_experiment_gui_optima.cpp Log Message: ----------- Merge branch 'main' into bump-to-v4.3.0-dev Commit: 5d67a0aa5e8dc6ddefabb6c3ff80a3ad51aa9001 https://github.com/ehb54/ultrascan3/commit/5d67a0aa5e8dc6ddefabb6c3ff80a3ad5... Author: aaron-auc <95181880+aaron-auc@users.noreply.github.com> Date: 2026-08-23 (Sun, 23 Aug 2026) Changed paths: M VERSION M utils/us_defines.h Log Message: ----------- Merge pull request #532 from ehb54/bump-to-v4.3.0-dev Bump to v4.3.0-dev Commit: 0528228ee80ceba80429b97a74c2bcc2a42e8ce3 https://github.com/ehb54/ultrascan3/commit/0528228ee80ceba80429b97a74c2bcc2a... Author: aaron-auc <95181880+aaron-auc@users.noreply.github.com> Date: 2026-09-02 (Wed, 02 Sep 2026) Changed paths: M VERSION M doc/manual/source/conf.py M gui.pri M gui/us_plot.cpp M gui/us_plot.h M gui/us_solution_gui.cpp M gui/us_theme.cpp M gui/us_theme.h M gui/us_widgets.cpp M gui/us_widgets_dialog.cpp M programs/us_config/us_color.cpp M programs/us_experiment/us_experiment_gui_optima.cpp M us_somo/develop/include/us_hydrodyn_perceive_dialog.h M utils/us_defines.h Log Message: ----------- Merge branch 'main' into 875-request-cmake-remove-gmp-module-from-installer-for-osx Compare: https://github.com/ehb54/ultrascan3/compare/9aa0949130b9...0528228ee80c To unsubscribe from these emails, change your notification settings at https://github.com/ehb54/ultrascan3/settings/notifications
participants (1)
-
aaron-auc