Branch: refs/heads/main Home: https://github.com/ehb54/ultrascan3 Commit: ef6f3bd3f96408decfe78facbf37acadc5834997 https://github.com/ehb54/ultrascan3/commit/ef6f3bd3f96408decfe78facbf37acadc... Author: aaron-auc <aaron@aucsolutions.com> Date: 2025-12-18 (Thu, 18 Dec 2025) Changed paths: A etc/icons/make-icons.sh A etc/icons/us3-icon-master-512.png M etc/us3-icon-128x128.ico M etc/us3-icon-128x128.png M etc/us3-icon-32x32.png M etc/us3-icon-48x48.ico M etc/us3-icon-48x48.png M etc/us3-icon.icns M gui/images/us3-icon-128x128.png M gui/images/us3-icon-16x16.png M gui/images/us3-icon-256x256.png M gui/images/us3-icon-32x32.png M gui/images/us3-icon-48x48.png M gui/images/us3-icon-512x512.png M gui/images/us3-icon-64x64.png Log Message: ----------- mod: icons remove border Commit: 8eb6af8dac0c0037f48381a8383228ef7f55a358 https://github.com/ehb54/ultrascan3/commit/8eb6af8dac0c0037f48381a8383228ef7... Author: aaron-auc <aaron@aucsolutions.com> Date: 2026-02-22 (Sun, 22 Feb 2026) Changed paths: M etc/etc_belongs_list.txt R etc/us3-GMP-icon-128x128.ico R etc/us3-GMP-icon-128x128.png R etc/us3-GMP-icon-128x128.xpm R etc/us3-GMP-icon-32x32.ico R etc/us3-GMP-icon-32x32.png R etc/us3-GMP-icon-32x32.xpm R etc/us3-GMP-icon-48x48.ico R etc/us3-GMP-icon-48x48.png R etc/us3-GMP-icon-48x48.xpm Log Message: ----------- mod: remove gmp icons Commit: ed169be467f3b5054b1675c832cee30a332f58e1 https://github.com/ehb54/ultrascan3/commit/ed169be467f3b5054b1675c832cee30a3... Author: aaron-auc <95181880+aaron-auc@users.noreply.github.com> Date: 2026-02-22 (Sun, 22 Feb 2026) Changed paths: A .github/workflows/bump-version.yml M .github/workflows/codeql-analysis.yml M CMakeLists.txt M CMakePresets.json M admin/cmake/FindQwt.cmake M admin/cmake/GenerateVersion.cmake A admin/cmake/toolchain-macos.cmake A admin/cmake/triplets/arm64-osx-dynamic.cmake A admin/cmake/triplets/x64-mingw-dynamic.cmake M admin/cmake/triplets/x64-osx-dynamic.cmake R alpha/srcdevel R alpha/us.cpp A buildsys/vcpkg/overlay-ports/qt5-multimedia/drop-wmf-plugin.patch A buildsys/vcpkg/overlay-ports/qt5-multimedia/portfile.cmake A buildsys/vcpkg/overlay-ports/qt5-multimedia/vcpkg.json A buildsys/vcpkg/overlay-ports/qt5-tools/fix-pkgconfig-qt5uiplugin-not-found.patch A buildsys/vcpkg/overlay-ports/qt5-tools/fix-spawnvp-argv.patch A buildsys/vcpkg/overlay-ports/qt5-tools/libclang.patch A buildsys/vcpkg/overlay-ports/qt5-tools/portfile.cmake A buildsys/vcpkg/overlay-ports/qt5-tools/vcpkg.json A buildsys/vcpkg/overlay-ports/qwt-6-1-6/portfile.cmake A buildsys/vcpkg/overlay-ports/qwt-6-1-6/vcpkg.json A buildsys/vcpkg/overlay-ports/qwt-6-3-0-qt5/config.patch A buildsys/vcpkg/overlay-ports/qwt-6-3-0-qt5/fix_dll_install.patch A buildsys/vcpkg/overlay-ports/qwt-6-3-0-qt5/portfile.cmake A buildsys/vcpkg/overlay-ports/qwt-6-3-0-qt5/unofficial-qwt-config.cmake A buildsys/vcpkg/overlay-ports/qwt-6-3-0-qt5/vcpkg.json A buildsys/vcpkg/overlay-ports/qwt-6-3-0-qt6/config.patch A buildsys/vcpkg/overlay-ports/qwt-6-3-0-qt6/fix_dll_install.patch A buildsys/vcpkg/overlay-ports/qwt-6-3-0-qt6/portfile.cmake A buildsys/vcpkg/overlay-ports/qwt-6-3-0-qt6/unofficial-qwt-config.cmake A buildsys/vcpkg/overlay-ports/qwt-6-3-0-qt6/vcpkg.json R buildsys/vcpkg/overlay-ports/qwt/portfile.cmake R buildsys/vcpkg/overlay-ports/qwt/vcpkg.json A buildsys/vcpkg/overlay-ports/qwtplot3d-qwt-6-1-6-qt5/portfile.cmake A buildsys/vcpkg/overlay-ports/qwtplot3d-qwt-6-1-6-qt5/qwtplot3d-config.cmake.in A buildsys/vcpkg/overlay-ports/qwtplot3d-qwt-6-1-6-qt5/vcpkg.json A buildsys/vcpkg/overlay-ports/qwtplot3d-qwt-6-3-0-qt5/portfile.cmake A buildsys/vcpkg/overlay-ports/qwtplot3d-qwt-6-3-0-qt5/qwtplot3d-config.cmake.in A buildsys/vcpkg/overlay-ports/qwtplot3d-qwt-6-3-0-qt5/vcpkg.json A buildsys/vcpkg/overlay-ports/qwtplot3d-qwt-6-3-0-qt6/portfile.cmake A buildsys/vcpkg/overlay-ports/qwtplot3d-qwt-6-3-0-qt6/qwtplot3d-config.cmake.in A buildsys/vcpkg/overlay-ports/qwtplot3d-qwt-6-3-0-qt6/vcpkg.json R buildsys/vcpkg/overlay-ports/qwtplot3d/portfile.cmake R buildsys/vcpkg/overlay-ports/qwtplot3d/qwtplot3d-config.cmake.in R buildsys/vcpkg/overlay-ports/qwtplot3d/vcpkg.json M doc/manual/advanced_config.body M gui.pri M gui/CMakeLists.txt M gui/fix-mac-make.sh R gui/images.qrc M gui/libus_gui.pro M gui/qrc_make_adds.txt M gui/us_analysis_base2.cpp M gui/us_analysis_base2.h M gui/us_analyte_gui.cpp M gui/us_analyte_gui.h M gui/us_buffer_gui.cpp M gui/us_buffer_gui.h M gui/us_convert_gui.cpp M gui/us_convert_gui.h M gui/us_csv_loader.cpp M gui/us_csv_loader.h M gui/us_experiment_gui.h M gui/us_extinctfitter_gui.cpp M gui/us_extinction_gui.cpp M gui/us_get_run.cpp M gui/us_get_run.h M gui/us_gui_util.cpp M gui/us_images.cpp M gui/us_images.h M gui/us_intensity.h M gui/us_investigator.cpp M gui/us_license.cpp M gui/us_minimize.cpp M gui/us_model_gui.cpp M gui/us_model_loader.cpp M gui/us_mwl_data.cpp M gui/us_new_spectrum.cpp M gui/us_new_spectrum.h M gui/us_passwd.cpp M gui/us_plot.cpp M gui/us_plot.h M gui/us_plot3d.cpp M gui/us_plot3d.h M gui/us_predict1.cpp M gui/us_predict1.h M gui/us_project_gui.h M gui/us_report_gui.cpp M gui/us_report_gui.h M gui/us_run_details2.cpp M gui/us_sassoc.cpp M gui/us_sassoc.h M gui/us_select_triples.h M gui/us_selectbox.h M gui/us_solution_gui.cpp M gui/us_solution_gui.h M gui/us_spectrodata.cpp M gui/us_spectrodata.h M gui/us_widgets.h M makeall.sh M programs/CMakeLists.txt M programs/main1.inc M programs/us/CMakeLists.txt M programs/us/revision.sh M programs/us/us.cpp M programs/us_2dsa/us_2dsa.cpp M programs/us_2dsa/us_2dsa.h M programs/us_2dsa/us_show_norm.cpp M programs/us_abde/us_abde_main.cpp M programs/us_abde/us_norm_profile.cpp M programs/us_abde/us_norm_profile.h M programs/us_analysis_profile/us_analysis_profile.cpp M programs/us_analysis_profile/us_analysis_profile.h M programs/us_analysis_profile/us_anapro_utils.cpp M programs/us_astfem_sim/us_astfem_sim.cpp M programs/us_audit_trail_gmp/us_audit_trail_gmp.cpp M programs/us_autoflow_analysis/CMakeLists.txt M programs/us_autoflow_analysis/us_autoflow_analysis.cpp M programs/us_autoflow_analysis/us_autoflow_analysis.h M programs/us_buoyancy/us_buoyancy.cpp M programs/us_buoyancy/us_buoyancy.h M programs/us_colorgradient/us_colorgradient.cpp M programs/us_com_project/CMakeLists.txt M programs/us_com_project/us_com_project_gui.cpp M programs/us_com_project/us_com_project_gui.h M programs/us_com_project_academic/CMakeLists.txt M programs/us_combine_models/us_combine_models.cpp M programs/us_config/us_color.cpp M programs/us_config/us_font.cpp M programs/us_config/us_font.h M programs/us_config/us_newxpnhost_db.cpp M programs/us_config/us_xpnhost_db.cpp M programs/us_dcdt/us_dcdt.cpp M programs/us_dcdt/us_dcdt.h M programs/us_ddist_combine/us_ddist_combine.cpp M programs/us_density_match/us_density_match.cpp M programs/us_dmga_init/us_dmga_init.cpp M programs/us_edit/us_edit.cpp M programs/us_edit/us_edit.h M programs/us_edit/us_edit_scan.cpp M programs/us_edit/us_edit_scan.h M programs/us_esigner_gmp/us_esigner_gmp.cpp M programs/us_esigner_gmp/us_esigner_gmp.h M programs/us_experiment/us_exp_utils.cpp M programs/us_experiment/us_experiment_gui_optima.cpp M programs/us_experiment/us_experiment_gui_optima.h M programs/us_experiment/us_proto_ranges.cpp M programs/us_export_legacy/us_export.cpp M programs/us_fds_filemanager/us_fds_filemanager.cpp M programs/us_fematch/CMakeLists.txt M programs/us_fematch/us_fematch.cpp M programs/us_fematch/us_plot_control_fem.cpp M programs/us_fematch/us_plot_control_fem.h M programs/us_fit_meniscus/CMakeLists.txt M programs/us_fit_meniscus/us_fit_meniscus.cpp M programs/us_fit_meniscus/us_fit_meniscus.h M programs/us_ga_init/us_ga_init.cpp M programs/us_ga_init/us_ga_init.h M programs/us_globalequil/us_eqfit_control.cpp M programs/us_globalequil/us_eqhistogram.cpp M programs/us_globalequil/us_eqmath.cpp M programs/us_globalequil/us_eqmodel_control.cpp M programs/us_globalequil/us_eqreporter.cpp M programs/us_globalequil/us_fit_worker.cpp M programs/us_globalequil/us_globalequil.cpp M programs/us_globalequil/us_globalequil.h M programs/us_grid_editor/us_grid_editor.cpp M programs/us_integral/us_integral.cpp M programs/us_integral/us_integral.h M programs/us_legacy_converter/us_legacy_converter.cpp M programs/us_manage_data/us_data_model.cpp M programs/us_modelmetrics/us_modelmetrics.cpp M programs/us_mwl_species_fit/CMakeLists.txt M programs/us_mwl_species_fit/us_mwl_sf_plot3d.cpp M programs/us_mwl_species_fit/us_mwl_sf_plot3d.h M programs/us_mwl_species_fit/us_mwl_species_fit.cpp M programs/us_mwl_species_fit/us_mwl_species_fit.h M programs/us_mwl_spectra/us_mwl_spectra.cpp M programs/us_mwl_spectra/us_mwls_pltctl.cpp M programs/us_mwl_spectra/us_mwls_pltctl.h M programs/us_mwlr_viewer/us_mwl_pltctrl.cpp M programs/us_mwlr_viewer/us_mwl_pltctrl.h M programs/us_mwlr_viewer/us_mwlr_viewer.cpp M programs/us_pcsa/us_mlplot.cpp M programs/us_pcsa/us_mrecs_loader.cpp M programs/us_pcsa/us_pcsa.cpp M programs/us_pcsa/us_pcsa.h M programs/us_pcsa/us_rpscan.cpp M programs/us_pcsa/us_rpscan.h M programs/us_protocol_dev/CMakeLists.txt M programs/us_protocol_dev/us_protocol_dev_gui.h M programs/us_pseudo3d_combine/us_pseudo3d_combine.cpp M programs/us_pseudo_absorbance/us_add_refScan.cpp M programs/us_pseudo_absorbance/us_convert_scan.cpp M programs/us_pseudo_absorbance/us_convert_scan.h M programs/us_pseudo_absorbance/us_pseudo_absorbance.cpp M programs/us_pseudo_absorbance/us_remove_ri.cpp M programs/us_pseudo_absorbance/us_remove_ri.h M programs/us_query_rmsd/CMakeLists.txt M programs/us_query_rmsd/us_query_rmsd.cpp M programs/us_ramp/us_experiment_ra.cpp M programs/us_ramp/us_get_dbrun_ra.cpp M programs/us_ramp/us_mwlramp.cpp M programs/us_ramp/us_ramp.cpp M programs/us_ramp/us_ramp_gui.cpp M programs/us_ramp/us_ramp_gui.h M programs/us_reporter_gmp/CMakeLists.txt M programs/us_reporter_gmp/us_reporter_gmp.cpp M programs/us_reporter_gmp/us_reporter_gmp.h M programs/us_rotor_calibration/us_rotor_calibration.cpp M programs/us_rotor_calibration/us_rotor_calibration.h M programs/us_second_moment/us_second_moment.cpp M programs/us_second_moment/us_second_moment.h M programs/us_spectrum/us_spectrum.cpp M programs/us_spectrum/us_spectrum.h M programs/us_vhw_combine/us_vhw_combine.cpp M programs/us_vhw_combine/us_vhwc_pltctl.cpp M programs/us_vhw_combine/us_vhwc_pltctl.h M programs/us_vhw_enhanced/us_distrib_plot.cpp M programs/us_vhw_enhanced/us_vhw_enhanced.cpp M programs/us_vhw_enhanced/us_vhw_enhanced.h M programs/us_xpn_viewer/us_xpn_viewer_gui.cpp M programs/us_xpn_viewer/us_xpn_viewer_gui.h M qwtplot3d/CMakeLists.txt M qwtplot3d/include/qwt3d_io_gl2ps.h M qwtplot3d/include/qwt3d_openglhelper.h M qwtplot3d/include/qwt3d_plot.h M qwtplot3d/include/qwt3d_surfaceplot.h M qwtplot3d/qwtplot3d.pro M qwtplot3d/src/qwt3d_io.cpp M qwtplot3d/src/qwt3d_io_gl2ps.cpp M qwtplot3d/src/qwt3d_label.cpp M qwtplot3d/src/qwt3d_lighting.cpp M qwtplot3d/src/qwt3d_movements.cpp M qwtplot3d/src/qwt3d_plot.cpp M qwtplot3d/src/qwt3d_surfaceplot.cpp M scripts/build.sh M test/utils/CMakeLists.txt M test/utils/test_us_ana_profile.cpp A test/utils/test_us_regex.cpp M test/utils/test_us_simparms.cpp M utils/CMakeLists.txt M utils/ius_db2.h M utils/libus_utils.pro M utils/us_ana_profile.cpp M utils/us_ana_profile.h M utils/us_analyte.cpp M utils/us_analyte.h M utils/us_archive.cpp M utils/us_archive.h M utils/us_astfem_math.cpp M utils/us_astfem_math.h M utils/us_astfem_rsa.cpp M utils/us_astfem_rsa.h M utils/us_buffer.cpp M utils/us_buffer.h M utils/us_cfa_data.cpp M utils/us_cfa_data.h M utils/us_constants.cpp M utils/us_constants.h M utils/us_convert.cpp M utils/us_convert.h M utils/us_convertio.cpp M utils/us_convertio.h M utils/us_crc.cpp M utils/us_crc.h M utils/us_crypto.cpp M utils/us_crypto.h M utils/us_csv_data.cpp M utils/us_csv_data.h M utils/us_dataIO.cpp M utils/us_dataIO.h M utils/us_datafiles.cpp M utils/us_datafiles.h M utils/us_db2.cpp M utils/us_db2.h M utils/us_dmga_constr.cpp M utils/us_eprofile.h M utils/us_experiment.cpp M utils/us_experiment.h M utils/us_extern.h M utils/us_geturl.cpp M utils/us_geturl.h M utils/us_global.cpp M utils/us_global.h M utils/us_gzip.cpp M utils/us_gzip.h M utils/us_hardware.h M utils/us_http_post.h M utils/us_hydrosim.cpp M utils/us_hydrosim.h M utils/us_lamm_astfvm.cpp M utils/us_lamm_astfvm.h M utils/us_license_t.cpp M utils/us_license_t.h M utils/us_link_ssl.cpp M utils/us_link_ssl.h M utils/us_lm.cpp M utils/us_local_server.cpp M utils/us_local_server.h M utils/us_math2.cpp M utils/us_math2.h M utils/us_matrix.cpp M utils/us_matrix.h M utils/us_memory.cpp M utils/us_memory.h M utils/us_model.cpp M utils/us_model.h M utils/us_noise.cpp M utils/us_noise.h M utils/us_pcsa_modelrec.cpp M utils/us_pcsa_modelrec.h M utils/us_project.cpp M utils/us_protocol_util.cpp M utils/us_protocol_util.h M utils/us_report.cpp M utils/us_report.h M utils/us_report_gmp.cpp M utils/us_rotor.cpp M utils/us_run_protocol.cpp M utils/us_run_protocol.h M utils/us_settings.cpp M utils/us_settings.h M utils/us_simparms.cpp M utils/us_simparms.h M utils/us_sleep.h M utils/us_solute.cpp M utils/us_solute.h M utils/us_solution.cpp M utils/us_solution.h M utils/us_solution_vals.h M utils/us_solve_sim.cpp M utils/us_stiffbase.cpp M utils/us_stiffbase.h M utils/us_tar.cpp M utils/us_tar.h M utils/us_time_state.h M utils/us_timer.cpp M utils/us_timer.h M utils/us_util.cpp M utils/us_util.h A utils/us_utils_qt.h M utils/us_vector.cpp M utils/us_vector.h M utils/us_xpn_data.cpp M utils/us_xpn_data.h M utils/us_zsolute.cpp M utils/us_zsolute.h M vcpkg.json Log Message: ----------- Merge branch 'main' into 666-bug-icons-dont-fill-space-on-new-macos Commit: a69727d693e60c02d3b9c4db2e16387437816ce5 https://github.com/ehb54/ultrascan3/commit/a69727d693e60c02d3b9c4db2e1638743... Author: aaron-auc <aaron@aucsolutions.com> Date: 2026-02-23 (Mon, 23 Feb 2026) Changed paths: M .gitignore M CMakeLists.txt A admin/cmake/triplets/arm64-windows.cmake M gui/CMakeLists.txt M programs/us/CMakeLists.txt M qwtplot3d/include/qwt3d_openglhelper.h A scripts/build.ps1 M vcpkg.json Log Message: ----------- Windows ARM64 build fixes: triplet, export macros, windeployqt Commit: 84d482ad6f56b2e3acc6c957d97719052eaefbd7 https://github.com/ehb54/ultrascan3/commit/84d482ad6f56b2e3acc6c957d97719052... Author: aaron-auc <aaron@aucsolutions.com> Date: 2026-02-23 (Mon, 23 Feb 2026) Changed paths: M CMakePresets.json R admin/cmake/toolchain-macos.cmake A admin/cmake/toolchain.cmake A scripts/build.bat M scripts/build.ps1 M scripts/build.sh R vcpkg Log Message: ----------- mod: add build for windows script and standardize linux and macos build Commit: e43bca35c3066c669ca922450241c6bdf5b4de40 https://github.com/ehb54/ultrascan3/commit/e43bca35c3066c669ca922450241c6bdf... Author: aaron-auc <aaron@aucsolutions.com> Date: 2026-02-23 (Mon, 23 Feb 2026) Changed paths: M scripts/build.ps1 Log Message: ----------- fix: processor core check Commit: 70a4fd76fe5b6edf065fdf2b5f5ba0bcedb2165e https://github.com/ehb54/ultrascan3/commit/70a4fd76fe5b6edf065fdf2b5f5ba0bce... Author: aaron-auc <aaron@aucsolutions.com> Date: 2026-02-23 (Mon, 23 Feb 2026) Changed paths: M admin/cmake/toolchain.cmake Log Message: ----------- fix: remove force Commit: 6d4f2ac655f09a8a6b067f5a54b974908ab10aaf https://github.com/ehb54/ultrascan3/commit/6d4f2ac655f09a8a6b067f5a54b974908... Author: aaron-auc <aaron@aucsolutions.com> Date: 2026-02-23 (Mon, 23 Feb 2026) Changed paths: M admin/cmake/toolchain.cmake Log Message: ----------- fix: linux arm64 now handled correctly Commit: 0880dfb2dd0e8e00e5613ff36d94c03e11edd27c https://github.com/ehb54/ultrascan3/commit/0880dfb2dd0e8e00e5613ff36d94c03e1... Author: aaron-auc <aaron@aucsolutions.com> Date: 2026-02-24 (Tue, 24 Feb 2026) Changed paths: M CMakePresets.json M admin/cmake/toolchain.cmake A admin/cmake/triplets/arm64-linux.cmake Log Message: ----------- fix: linux arm64 dynamic and config path added Commit: 95f4bf13cb912979ba31f07969ede459ee9a3cfb https://github.com/ehb54/ultrascan3/commit/95f4bf13cb912979ba31f07969ede459e... Author: aaron-auc <aaron@aucsolutions.com> Date: 2026-02-24 (Tue, 24 Feb 2026) Changed paths: M etc/etc_belongs_list.txt A etc/us3-GMP-icon-128x128.ico A etc/us3-GMP-icon-128x128.png A etc/us3-GMP-icon-128x128.xpm A etc/us3-GMP-icon-32x32.ico A etc/us3-GMP-icon-32x32.png A etc/us3-GMP-icon-32x32.xpm A etc/us3-GMP-icon-48x48.ico A etc/us3-GMP-icon-48x48.png A etc/us3-GMP-icon-48x48.xpm Log Message: ----------- fix: returned gmp icons back to branch because at least one is used us_comproject.desktop:Icon=/opt/ultrascan3/etc/us3-GMP-icon-128x128.png Commit: 8cef6842fe3282a17f7fe6a11688d966a17b86da https://github.com/ehb54/ultrascan3/commit/8cef6842fe3282a17f7fe6a11688d966a... Author: aaron-auc <95181880+aaron-auc@users.noreply.github.com> Date: 2026-02-25 (Wed, 25 Feb 2026) Changed paths: M .gitignore M CMakeLists.txt M CMakePresets.json R admin/cmake/toolchain-macos.cmake A admin/cmake/toolchain.cmake A admin/cmake/triplets/arm64-linux.cmake A admin/cmake/triplets/arm64-windows.cmake A etc/icons/make-icons.sh A etc/icons/us3-icon-master-512.png M etc/us3-icon-128x128.ico M etc/us3-icon-128x128.png M etc/us3-icon-32x32.png M etc/us3-icon-48x48.ico M etc/us3-icon-48x48.png M etc/us3-icon.icns M gui/CMakeLists.txt M gui/images/us3-icon-128x128.png M gui/images/us3-icon-16x16.png M gui/images/us3-icon-256x256.png M gui/images/us3-icon-32x32.png M gui/images/us3-icon-48x48.png M gui/images/us3-icon-512x512.png M gui/images/us3-icon-64x64.png M programs/us/CMakeLists.txt M qwtplot3d/include/qwt3d_openglhelper.h A scripts/build.bat A scripts/build.ps1 M scripts/build.sh R vcpkg M vcpkg.json Log Message: ----------- Merge pull request #337 from ehb54/666-bug-icons-dont-fill-space-on-new-macos New Icons Compare: https://github.com/ehb54/ultrascan3/compare/c8f871714964...8cef6842fe32 To unsubscribe from these emails, change your notification settings at https://github.com/ehb54/ultrascan3/settings/notifications