[us-commits] [ehb54/ultrascan3] cefb4f: add: cmake build update
Lukas Dobler
noreply at github.com
Fri Nov 7 02:47:21 MST 2025
Branch: refs/heads/lukas/qt6-compile
Home: https://github.com/ehb54/ultrascan3
Commit: cefb4f09592f41675136902739310639b3013aca
https://github.com/ehb54/ultrascan3/commit/cefb4f09592f41675136902739310639b3013aca
Author: aaron <aaron at aucsolutions.com>
Date: 2025-10-18 (Sat, 18 Oct 2025)
Changed paths:
M CMakeLists.txt
A CMakePresets.json
A admin/cmake/GenerateVersion.cmake
A admin/cmake/platform-config.cmake
A admin/cmake/triplets/x64-osx-dynamic.cmake
R admin/cmake/us_version.h.in
A buildsys/vcpkg/overlay-ports/qwt/portfile.cmake
A buildsys/vcpkg/overlay-ports/qwt/vcpkg.json
A buildsys/vcpkg/overlay-ports/qwtplot3d/portfile.cmake
A buildsys/vcpkg/overlay-ports/qwtplot3d/qwtplot3d-config.cmake.in
A buildsys/vcpkg/overlay-ports/qwtplot3d/vcpkg.json
M gui/CMakeLists.txt
R gui/us_mac_utils.c
R gui/us_mac_utils.h
R gui/us_win_utils.c
R gui/us_win_utils.h
R gui/us_window_message.cpp
R gui/us_window_message.h
R gui/us_x11_utils.c
R gui/us_x11_utils.h
M programs/CMakeLists.txt
M programs/us/revision.sh
M programs/us/us.cpp
M programs/us_astfem_sim/us_clipdata.h
M programs/us_fit_meniscus/CMakeLists.txt
R programs/us_rasmol_control/us_rasmol_control.cpp
R programs/us_rasmol_control/us_rasmol_control.h
R programs/us_rasmol_control/us_rasmol_control.pro
M programs/us_reporter_gmp/us_reporter_gmp.cpp
M qwtplot3d/CMakeLists.txt
M qwtplot3d/include/qwt3d_openglhelper.h
A scripts/bootstrap.sh
M test/utils/CMakeLists.txt
M utils/CMakeLists.txt
M utils/us_defines.h
A vcpkg
A vcpkg-configuration.json
A vcpkg.json
Log Message:
-----------
add: cmake build update
Commit: aaeaad6c02761cee619ff74a0115ebbed284238d
https://github.com/ehb54/ultrascan3/commit/aaeaad6c02761cee619ff74a0115ebbed284238d
Author: aaron <aaron at aucsolutions.com>
Date: 2025-10-18 (Sat, 18 Oct 2025)
Changed paths:
A .gitmodules
Log Message:
-----------
add: vcpkg submodule
Commit: 752239a4b3601d73dc40a986b5616f860208f51e
https://github.com/ehb54/ultrascan3/commit/752239a4b3601d73dc40a986b5616f860208f51e
Author: aaron <aaron at aucsolutions.com>
Date: 2025-10-18 (Sat, 18 Oct 2025)
Changed paths:
M gui/CMakeLists.txt
M gui/us_abstractrotor_gui.cpp
M gui/us_analysis_base2.cpp
M gui/us_analyte_gui.cpp
M gui/us_associations_gui.cpp
M gui/us_buffer_gui.cpp
M gui/us_choice.cpp
M gui/us_csv_loader.cpp
M gui/us_data_loader.cpp
M gui/us_editor.h
M gui/us_editor_gui.cpp
M gui/us_extinctfitter_gui.cpp
M gui/us_investigator.cpp
M gui/us_license.h
M gui/us_load_auc.cpp
M gui/us_loadable_noise.cpp
M gui/us_minimize.cpp
M gui/us_model_gui.cpp
M gui/us_model_loader.cpp
M gui/us_noise_loader.cpp
M gui/us_passwd.h
M gui/us_plot.cpp
M gui/us_plot3d.cpp
M gui/us_predict1.cpp
M gui/us_project_gui.cpp
M gui/us_properties.cpp
M gui/us_report_gui.cpp
M gui/us_resids_bitmap.cpp
M gui/us_rotor_gui.cpp
M gui/us_run_details2.cpp
M gui/us_sassoc.h
M gui/us_select_edits.cpp
M gui/us_select_item.cpp
M gui/us_select_runs.cpp
M gui/us_solution_gui.cpp
M gui/us_table.h
M gui/us_tmst_plot.cpp
M gui/us_widgets.cpp
M gui/us_widgets.h
M gui/us_widgets_dialog.cpp
M gui/us_widgets_dialog.h
M programs/us/us.h
M programs/us_2dsa/us_2dsa.cpp
M programs/us_2dsa/us_adv_analysis_2d.cpp
M programs/us_2dsa/us_analysis_control_2d.cpp
M programs/us_2dsa/us_plot_control_2d.cpp
M programs/us_2dsa/us_resplot_2d.cpp
M programs/us_2dsa/us_show_norm.cpp
M programs/us_analysis_profile/us_analysis_profile.cpp
M programs/us_analysis_profile/us_anapro_utils.cpp
M programs/us_astfem_sim/us_astfem_sim.cpp
M programs/us_astfem_sim/us_astfem_sim.h
M programs/us_astfem_sim/us_clipdata.cpp
M programs/us_astfem_sim/us_clipdata.h
M programs/us_audit_trail_gmp/us_audit_trail_gmp.cpp
M programs/us_autoflow_analysis/us_autoflow_analysis.cpp
M programs/us_buoyancy/us_buoyancy.cpp
M programs/us_colorgradient/us_colorgradient.h
M programs/us_com_project/us_com_project_gui.cpp
M programs/us_combine_models/us_combine_models.cpp
M programs/us_config/us_admin.h
M programs/us_config/us_advanced.h
M programs/us_config/us_color.cpp
M programs/us_config/us_color.h
M programs/us_config/us_config.h
M programs/us_config/us_font.h
M programs/us_config/us_xpnhost.h
M programs/us_config/us_xpnhost_db.h
M programs/us_convert/us_convert_gui.cpp
M programs/us_convert/us_experiment_gui.cpp
M programs/us_convert/us_get_run.cpp
M programs/us_convert/us_intensity.cpp
M programs/us_convert/us_select_triples.cpp
M programs/us_ddist_combine/us_ddist_combine.cpp
M programs/us_ddist_combine/us_select_rundd.cpp
M programs/us_density_match/us_density_match.cpp
M programs/us_density_match/us_model_params.cpp
M programs/us_density_match/us_remove_models.cpp
M programs/us_dmga_init/us_constraints_edit.cpp
M programs/us_edit/us_edit.cpp
M programs/us_edit/us_edit_scan.cpp
M programs/us_edit/us_exclude_profile.cpp
M programs/us_edit/us_get_edit.cpp
M programs/us_edit/us_ri_noise.cpp
M programs/us_edit/us_select_lambdas.cpp
M programs/us_equiltime/us_equiltime.cpp
M programs/us_esigner_gmp/us_esigner_gmp.cpp
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_fematch/us_adv_dmgamc.cpp
M programs/us_fematch/us_advanced_fem.cpp
M programs/us_fematch/us_fematch.cpp
M programs/us_fematch/us_plot_control_fem.cpp
M programs/us_fematch/us_resplot_fem.cpp
M programs/us_fit_meniscus/us_fit_meniscus.cpp
M programs/us_ga_init/us_ga_init.cpp
M programs/us_ga_init/us_solutedata.cpp
M programs/us_globalequil/us_eqfit_control.cpp
M programs/us_globalequil/us_eqhistogram.h
M programs/us_globalequil/us_eqmodel_control.cpp
M programs/us_globalequil/us_globalequil.cpp
M programs/us_globalequil/us_long_messagebox.h
M programs/us_globalequil/us_model_adpars.cpp
M programs/us_globalequil/us_model_select.cpp
M programs/us_integral/us_delete_models.cpp
M programs/us_manage_data/us_data_model.cpp
M programs/us_manage_data/us_data_tree.cpp
M programs/us_mpi_analysis/2dsa_master.cpp
M programs/us_mpi_analysis/dmga_worker.cpp
M programs/us_mpi_analysis/ga_master.cpp
M programs/us_mpi_analysis/ga_worker.cpp
M programs/us_mpi_analysis/pcsa_master.cpp
M programs/us_mpi_analysis/us_mpi_analysis.cpp
M programs/us_mpi_analysis/us_mpi_parse.cpp
M programs/us_mwl_species_fit/us_mwl_species_fit.cpp
M programs/us_mwl_species_sim/us_mwl_species_sim.cpp
M programs/us_mwl_spectra/us_mwl_spectra.cpp
M programs/us_mwl_spectra/us_mwls_pltctl.cpp
M programs/us_mwlr_viewer/us_mwl_pltctrl.cpp
M programs/us_mwlr_viewer/us_mwl_run.cpp
M programs/us_mwlr_viewer/us_mwlr_viewer.cpp
M programs/us_pcsa/us_adv_analysis_pc.cpp
M programs/us_pcsa/us_analysis_control_pc.cpp
M programs/us_pcsa/us_mlplot.cpp
M programs/us_pcsa/us_mrecs_loader.cpp
M programs/us_pcsa/us_plot_control_pc.cpp
M programs/us_pcsa/us_resplot_pc.cpp
M programs/us_pcsa/us_rpscan.cpp
M programs/us_protocol_dev/us_protocol_dev_gui.cpp
M programs/us_pseudo3d_combine/us_pseudo3d_combine.cpp
M programs/us_pseudo3d_combine/us_remove_distros.cpp
M programs/us_ramp/us_experiment_gui_ra.cpp
M programs/us_ramp/us_get_dbrun_ra.cpp
M programs/us_ramp/us_intensity_ra.cpp
M programs/us_ramp/us_select_triples_ra.cpp
M programs/us_reporter/us_sync_db.cpp
M programs/us_reporter_gmp/us_reporter_gmp.cpp
M programs/us_rotor_calibration/us_get_dbexp.cpp
M programs/us_spectrum/us_spectrum.cpp
M programs/us_vhw_combine/us_select_runid.cpp
M programs/us_vhw_combine/us_vhw_combine.cpp
M programs/us_vhw_combine/us_vhwc_pltctl.cpp
M programs/us_vhw_enhanced/us_distrib_plot.cpp
M programs/us_vhw_enhanced/us_vhw_enhanced.cpp
M programs/us_xpn_viewer/us_xpn_run_auc.cpp
M programs/us_xpn_viewer/us_xpn_run_raw.cpp
M programs/us_xpn_viewer/us_xpn_viewer_gui.cpp
M us_somo/develop/3dplot/lightingdlgbase.h
M us_somo/develop/src/us_hydrodyn.cpp
M utils/us_buffer.cpp
M utils/us_gzip.cpp
M utils/us_lamm_astfvm.cpp
M utils/us_license_t.cpp
M utils/us_matrix.cpp
M utils/us_pcsa_modelrec.cpp
M utils/us_project.cpp
M utils/us_run_protocol.cpp
M utils/us_run_protocol.h
M utils/us_simparms.cpp
M utils/us_simparms.h
M utils/us_solve_sim.cpp
M utils/us_tar.cpp
M utils/us_time_state.cpp
M utils/us_xpn_data.cpp
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into 534-enhancement-version-upgrade
# Conflicts:
# gui/us_window_message.cpp
# programs/us_rasmol_control/us_rasmol_control.cpp
Commit: aa011c07ff3e7a68fbec50f20b6e6b54dd9bc28e
https://github.com/ehb54/ultrascan3/commit/aa011c07ff3e7a68fbec50f20b6e6b54dd9bc28e
Author: aaron <aaron at aucsolutions.com>
Date: 2025-10-19 (Sun, 19 Oct 2025)
Changed paths:
M CMakeLists.txt
A admin/cmake/Us3QrcCheck.cmake
A admin/cmake/Us3Resources.cmake
M etc/us3-splash.png
M gui/CMakeLists.txt
M gui/images/us3-splash.png
M programs/CMakeLists.txt
M programs/us/us.cpp
M utils/us_defines.h
Log Message:
-----------
add: version to splash screen
Commit: 7f79da6635b8554a946f428c516d36f3cc0025cf
https://github.com/ehb54/ultrascan3/commit/7f79da6635b8554a946f428c516d36f3cc0025cf
Author: aaron <aaron at aucsolutions.com>
Date: 2025-10-20 (Mon, 20 Oct 2025)
Changed paths:
M CMakeLists.txt
A doc/manual/CMakeLists.txt
M gui/us_gui_settings.cpp
M gui/us_gui_settings.h
M programs/us/us.cpp
M programs/us/us_win_data.cpp
A programs/us/us_win_data.h
Log Message:
-----------
mod: color palette
Commit: d396732b1811c44b0e9b297acf9dbb04b42f5b9e
https://github.com/ehb54/ultrascan3/commit/d396732b1811c44b0e9b297acf9dbb04b42f5b9e
Author: aaron <aaron at aucsolutions.com>
Date: 2025-10-20 (Mon, 20 Oct 2025)
Changed paths:
M CMakeLists.txt
M admin/cmake/GenerateVersion.cmake
A admin/cmake/UsDefinesParser.cmake
M utils/us_defines.h
Log Message:
-----------
mod: get version description for build from us_defines
Commit: 0c3758833374f0f823c94711990117ec205ab239
https://github.com/ehb54/ultrascan3/commit/0c3758833374f0f823c94711990117ec205ab239
Author: aaron <aaron at aucsolutions.com>
Date: 2025-10-20 (Mon, 20 Oct 2025)
Changed paths:
M programs/us/us.cpp
Log Message:
-----------
mod: remove OS from splash screen
Commit: 11bbb002a0e60f0eae185c97adcae193b1ad6b40
https://github.com/ehb54/ultrascan3/commit/11bbb002a0e60f0eae185c97adcae193b1ad6b40
Author: aaron <aaron at aucsolutions.com>
Date: 2025-10-20 (Mon, 20 Oct 2025)
Changed paths:
M gui/images/us3-splash.png
M programs/us/us.cpp
Log Message:
-----------
mod: better font handling improved image
Commit: 4375dec9c287500081a412353bd6a8d4b0dbd015
https://github.com/ehb54/ultrascan3/commit/4375dec9c287500081a412353bd6a8d4b0dbd015
Author: aaron <aaron at aucsolutions.com>
Date: 2025-10-27 (Mon, 27 Oct 2025)
Changed paths:
M etc/us3-GMP-icon-128x128.ico
M etc/us3-GMP-icon-128x128.png
M etc/us3-GMP-icon-128x128.xpm
M etc/us3-GMP-icon-32x32.ico
M etc/us3-GMP-icon-32x32.png
M etc/us3-GMP-icon-32x32.xpm
M etc/us3-GMP-icon-48x48.ico
M etc/us3-GMP-icon-48x48.png
M etc/us3-GMP-icon-48x48.xpm
M etc/us3-icon-128x128.ico
M etc/us3-icon-128x128.png
M etc/us3-icon-32x32.png
M etc/us3-icon-32x32.xpm
M etc/us3-icon-48x48.ico
M etc/us3-icon-48x48.png
M etc/us3-icon-48x48.xpm
M etc/us3-icon.icns
M gui/images/check.png
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: update icons
Commit: 515eaaf6649d633f2f1ebe08fa6e6d17166ab7af
https://github.com/ehb54/ultrascan3/commit/515eaaf6649d633f2f1ebe08fa6e6d17166ab7af
Author: aaron <aaron at aucsolutions.com>
Date: 2025-10-27 (Mon, 27 Oct 2025)
Changed paths:
A etc/us3-icon-128x128.xpm
A etc/us3-icon-32x32.ico
Log Message:
-----------
add: icons for all extensions
Commit: 1f221d2f71c97c26c68d54f94c404ec7a1455bc3
https://github.com/ehb54/ultrascan3/commit/1f221d2f71c97c26c68d54f94c404ec7a1455bc3
Author: aaron <aaron at aucsolutions.com>
Date: 2025-10-28 (Tue, 28 Oct 2025)
Changed paths:
M gui/us_gui_settings.cpp
M gui/us_gui_settings.h
Log Message:
-----------
mod: remove qt4 code
Commit: 2db3a5f9997a9b2eb153a6af2832c0b693d5e640
https://github.com/ehb54/ultrascan3/commit/2db3a5f9997a9b2eb153a6af2832c0b693d5e640
Author: aaron <aaron at aucsolutions.com>
Date: 2025-10-28 (Tue, 28 Oct 2025)
Changed paths:
M gui/us_gui_settings.cpp
M gui/us_gui_settings.h
Log Message:
-----------
mod: format code
Commit: 3a91742fcd41c424cda2dfa8b85cd80aadc2255b
https://github.com/ehb54/ultrascan3/commit/3a91742fcd41c424cda2dfa8b85cd80aadc2255b
Author: aaron <aaron at aucsolutions.com>
Date: 2025-10-28 (Tue, 28 Oct 2025)
Changed paths:
A etc/README
Log Message:
-----------
add: image readme for image conversion
Commit: 2569ebda100a0b333a3f529881d53c8771f9aae5
https://github.com/ehb54/ultrascan3/commit/2569ebda100a0b333a3f529881d53c8771f9aae5
Author: aaron <aaron at aucsolutions.com>
Date: 2025-10-28 (Tue, 28 Oct 2025)
Changed paths:
M .github/workflows/codeql-analysis.yml
M .github/workflows/static-analysis.yml
M .github/workflows/unit-tests.yml
M CMakeLists.txt
M README.md
M admin/codeql/docker/local.pri.gui
M admin/codeql/docker/local.pri.mpi
M admin/codeql/docker/local.pri.somo
M admin/release/buildpkg.pl
M admin/release/centos7/Dockerfile
M admin/release/redhat/Dockerfile
M admin/release/ubuntu/Dockerfile
M admin/release/ubuntu_qt6/Dockerfile
M doc/manual/advanced_config.body
M gui/us_analyte_gui.cpp
M gui/us_buffer_gui.cpp
M gui/us_combined_plots_parms_gui.cpp
M gui/us_failed_gmp_run_gui.cpp
M gui/us_passwd.cpp
M gui/us_plot.cpp
M gui/us_report_gui.cpp
M gui/us_run_details2.cpp
M gui/us_sassoc.cpp
M gui/us_scan_excl_gui.cpp
M gui/us_table.cpp
M gui/us_widgets.cpp
M gui/us_widgets.h
M gui/us_widgets_dialog.cpp
M programs/us/us.cpp
M programs/us/us.h
M programs/us_2dsa/us_2dsa.cpp
M programs/us_2dsa/us_2dsa_process.cpp
M programs/us_2dsa/us_2dsa_process.h
M programs/us_2dsa/us_show_norm.cpp
M programs/us_analysis_profile/us_analysis_profile.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/us_autoflow_analysis.cpp
M programs/us_colorgradient/us_colorgradient.cpp
M programs/us_com_project/us_com_project_gui.cpp
M programs/us_config/us_config.cpp
M programs/us_convert/us_convert.cpp
M programs/us_convert/us_convert_gui.cpp
M programs/us_dcdt/us_dcdt.cpp
M programs/us_ddist_combine/us_ddist_combine.cpp
M programs/us_ddist_combine/us_select_rundd.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_select_lambdas.cpp
M programs/us_esigner_gmp/us_esigner_gmp.cpp
M programs/us_experiment/us_exp_utils.cpp
M programs/us_experiment/us_experiment_gui_optima.cpp
M programs/us_fds_filemanager/us_fds_filemanager.cpp
M programs/us_fematch/us_adv_dmgamc.cpp
M programs/us_fematch/us_dmga_mc_stats.cpp
M programs/us_fematch/us_fematch.cpp
M programs/us_fit_meniscus/us_fit_meniscus.cpp
M programs/us_ga_init/us_ga_init.cpp
M programs/us_ga_init/us_solutedata.cpp
M programs/us_ga_init/us_solutedata.h
M programs/us_globalequil/us_eqreporter.cpp
M programs/us_globalequil/us_long_messagebox.cpp
M programs/us_helpdaemon/us_helpdaemon.cpp
M programs/us_integral/us_integral.cpp
M programs/us_manage_data/us_data_tree.cpp
M programs/us_manage_data/us_manage_data.cpp
M programs/us_modelmetrics/us_modelmetrics.cpp
M programs/us_mpi_analysis/2dsa_master.cpp
M programs/us_mpi_analysis/dmga_master.cpp
M programs/us_mpi_analysis/dmga_worker.cpp
M programs/us_mpi_analysis/ga_master.cpp
M programs/us_mpi_analysis/ga_worker.cpp
M programs/us_mpi_analysis/parallel_masters.cpp
M programs/us_mpi_analysis/pcsa_master.cpp
M programs/us_mpi_analysis/pmasters_compjob.cpp
M programs/us_mpi_analysis/us_mpi_analysis.cpp
M programs/us_mpi_analysis/us_mpi_parse.cpp
M programs/us_mwl_species_fit/us_mwl_sf_plot3d.cpp
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_mwlr_viewer/us_mwlr_viewer.cpp
M programs/us_pcsa/us_adv_analysis_pc.cpp
M programs/us_pcsa/us_pcsa.cpp
M programs/us_pcsa/us_pcsa_process.cpp
M programs/us_pcsa/us_pcsa_process.h
M programs/us_pcsa/us_rpscan.cpp
M programs/us_pseudo3d_combine/us_pseudo3d_combine.cpp
M programs/us_pseudo_absorbance/us_add_refScan.cpp
M programs/us_ramp/us_ramp_gui.cpp
M programs/us_reporter/us_reporter.cpp
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_second_moment/us_second_moment.cpp
M programs/us_vhw_combine/us_select_runid.cpp
M programs/us_xpn_viewer/us_xpn_viewer_gui.cpp
M qwtplot3d/qwtplot3d.pro
M qwtplot3d/src/qwt3d_mousekeyboard.cpp
M test/modelbuilder/us_modelbuilder.cpp
M us_somo/develop/src/qwt/scrollzoomer.cpp
M us_somo/develop/src/us_dirhist.cpp
M us_somo/develop/src/us_editor.cpp
M us_somo/develop/src/us_hydrodyn.cpp
M us_somo/develop/src/us_hydrodyn_batch.cpp
M us_somo/develop/src/us_hydrodyn_bd.cpp
M us_somo/develop/src/us_hydrodyn_comparative.cpp
M us_somo/develop/src/us_hydrodyn_saxs.cpp
M utils/us_ana_profile.cpp
M utils/us_crypto.cpp
M utils/us_db2.cpp
M utils/us_hardware.cpp
M utils/us_hydrosim.h
M utils/us_link_ssl.cpp
M utils/us_math2.cpp
M utils/us_math2.h
M utils/us_timer.cpp
M utils/us_timer.h
M utils/us_xpn_data.cpp
Log Message:
-----------
Merge remote-tracking branch 'origin/main' into 534-enhancement-version-upgrade
# Conflicts:
# programs/us/us.cpp
Commit: 102666e6eebaafe3144edfce3728a62e33ab053c
https://github.com/ehb54/ultrascan3/commit/102666e6eebaafe3144edfce3728a62e33ab053c
Author: aaron <aaron at aucsolutions.com>
Date: 2025-10-31 (Fri, 31 Oct 2025)
Changed paths:
M CMakeLists.txt
M admin/test/docker/Dockerfile
M gui/CMakeLists.txt
M programs/CMakeLists.txt
A programs/us/CMakeLists.txt
M programs/us/us.cpp
M programs/us/us_win_data.h
A programs/us_2dplot/CMakeLists.txt
A programs/us_2dsa/CMakeLists.txt
A programs/us_abde/CMakeLists.txt
A programs/us_analysis_profile/CMakeLists.txt
A programs/us_analyte/CMakeLists.txt
A programs/us_assign_reviewers_gmp/CMakeLists.txt
A programs/us_astfem_sim/CMakeLists.txt
A programs/us_audit_trail_gmp/CMakeLists.txt
A programs/us_buffer/CMakeLists.txt
A programs/us_buoyancy/CMakeLists.txt
A programs/us_colorgradient/CMakeLists.txt
A programs/us_combine_models/CMakeLists.txt
A programs/us_config/CMakeLists.txt
A programs/us_convert/CMakeLists.txt
A programs/us_dcdt/CMakeLists.txt
A programs/us_ddist_combine/CMakeLists.txt
A programs/us_density_match/CMakeLists.txt
A programs/us_dmga_init/CMakeLists.txt
A programs/us_edit/CMakeLists.txt
A programs/us_equiltime/CMakeLists.txt
A programs/us_esigner_gmp/CMakeLists.txt
A programs/us_export_legacy/CMakeLists.txt
A programs/us_extinction/CMakeLists.txt
A programs/us_fds_filemanager/CMakeLists.txt
M programs/us_fit_meniscus/CMakeLists.txt
A programs/us_ga_init/CMakeLists.txt
A programs/us_globalequil/CMakeLists.txt
A programs/us_grid_editor/CMakeLists.txt
A programs/us_helpdaemon/CMakeLists.txt
A programs/us_integral/CMakeLists.txt
A programs/us_investigator/CMakeLists.txt
A programs/us_legacy_converter/CMakeLists.txt
A programs/us_license/CMakeLists.txt
A programs/us_manage_data/CMakeLists.txt
A programs/us_model_gui/CMakeLists.txt
A programs/us_modelmetrics/CMakeLists.txt
A programs/us_mpi_analysis/CMakeLists.txt
A programs/us_mwl_species_sim/CMakeLists.txt
A programs/us_mwl_spectra/CMakeLists.txt
A programs/us_mwlr_viewer/CMakeLists.txt
A programs/us_pcsa/CMakeLists.txt
A programs/us_predict1/CMakeLists.txt
A programs/us_predict2/CMakeLists.txt
A programs/us_project/CMakeLists.txt
A programs/us_pseudo3d_combine/CMakeLists.txt
A programs/us_pseudo_absorbance/CMakeLists.txt
A programs/us_ramp/CMakeLists.txt
A programs/us_reassign_reviewers_gmp/CMakeLists.txt
A programs/us_reporter/CMakeLists.txt
A programs/us_rotor/CMakeLists.txt
A programs/us_rotor_calibration/CMakeLists.txt
A programs/us_sassoc/CMakeLists.txt
A programs/us_second_moment/CMakeLists.txt
A programs/us_solution/CMakeLists.txt
A programs/us_spectrum/CMakeLists.txt
A programs/us_tmst_viewer/CMakeLists.txt
A programs/us_vhw_combine/CMakeLists.txt
A programs/us_vhw_enhanced/CMakeLists.txt
A programs/us_xpn_viewer/CMakeLists.txt
M scripts/bootstrap.sh
M test-docker.sh
M test/utils/CMakeLists.txt
M test/utils/test_us_ana_profile.cpp
M utils/CMakeLists.txt
Log Message:
-----------
mod: simply build by adding profile config
Commit: 18fcc684bbff2846566a57efafe210efec23cb07
https://github.com/ehb54/ultrascan3/commit/18fcc684bbff2846566a57efafe210efec23cb07
Author: aaron <aaron at aucsolutions.com>
Date: 2025-10-31 (Fri, 31 Oct 2025)
Changed paths:
M gui/us_gui_settings.cpp
M gui/us_gui_settings.h
Log Message:
-----------
mod: used if-else instead of series of if statements.
Commit: 5aae8e45629593aea0b0e007a8f2166c6f60b9c4
https://github.com/ehb54/ultrascan3/commit/5aae8e45629593aea0b0e007a8f2166c6f60b9c4
Author: aaron <aaron at aucsolutions.com>
Date: 2025-10-31 (Fri, 31 Oct 2025)
Changed paths:
M gui/libus_gui.pro
Log Message:
-----------
fix: remove mac x11 lib dependency and references to us_window_message
Commit: d66e17404eb6616c8b39235715683f81791c61b3
https://github.com/ehb54/ultrascan3/commit/d66e17404eb6616c8b39235715683f81791c61b3
Author: aaron <aaron at aucsolutions.com>
Date: 2025-10-31 (Fri, 31 Oct 2025)
Changed paths:
M programs/us/us.cpp
Log Message:
-----------
fix: antialiasing deprecation in qpainter
Commit: 9d2f668621b521ec83972272c72a14913582c0e2
https://github.com/ehb54/ultrascan3/commit/9d2f668621b521ec83972272c72a14913582c0e2
Author: aaron <aaron at aucsolutions.com>
Date: 2025-11-01 (Sat, 01 Nov 2025)
Changed paths:
M alpha/us.cpp
M gui/libus_gui.pro
M gui/us_analysis_base2.cpp
M gui/us_analyte_gui.cpp
M gui/us_buffer_gui.cpp
M gui/us_combined_plots_parms_gui.cpp
M gui/us_edit_spectrum.cpp
M gui/us_extinctfitter_gui.cpp
M gui/us_extinction_gui.cpp
M gui/us_gui_util.cpp
M gui/us_new_spectrum.cpp
M gui/us_plot.cpp
M gui/us_plot.h
M gui/us_plot3d.cpp
M gui/us_report_general_gui.cpp
M gui/us_report_gui.cpp
M gui/us_run_details2.cpp
M gui/us_sassoc.cpp
M gui/us_scan_excl_gui.cpp
M gui/us_sim_params_gui.cpp
M gui/us_solution_gui.cpp
M gui/us_spectrodata.cpp
M gui/us_spectrodata.h
M gui/us_tmst_plot.cpp
M gui/us_widgets.cpp
M gui/us_widgets_dialog.cpp
M programs/us_2dplot/us_2dplot.cpp
M programs/us_2dplot/us_2dplot.h
M programs/us_2dsa/us_2dsa.cpp
M programs/us_2dsa/us_analysis_control_2d.cpp
M programs/us_2dsa/us_resplot_2d.cpp
M programs/us_2dsa/us_show_norm.cpp
M programs/us_abde/us_norm_profile.cpp
M programs/us_analysis_profile/us_analysis_profile.cpp
M programs/us_analysis_profile/us_anapro_utils.cpp
M programs/us_astfem_sim/us_astfem_sim.cpp
M programs/us_buoyancy/us_buoyancy.cpp
M programs/us_com_project/us_com_project_gui.cpp
M programs/us_config/us_color.cpp
M programs/us_convert/us_convert_gui.cpp
M programs/us_convert/us_intensity.cpp
M programs/us_dcdt/us_dcdt.cpp
M programs/us_ddist_combine/us_ddist_combine.cpp
M programs/us_edit/us_edit.cpp
M programs/us_edit/us_edit_scan.cpp
M programs/us_edit/us_ri_noise.cpp
M programs/us_equiltime/us_equiltime.cpp
M programs/us_experiment/us_exp_utils.cpp
M programs/us_experiment/us_experiment_gui_optima.cpp
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/us_adv_dmgamc.cpp
M programs/us_fematch/us_fematch.cpp
M programs/us_fematch/us_resplot_fem.cpp
M programs/us_fit_meniscus/us_fit_meniscus.cpp
M programs/us_ga_init/us_ga_init.cpp
M programs/us_globalequil/us_eqfit_control.cpp
M programs/us_globalequil/us_eqhistogram.cpp
M programs/us_globalequil/us_globalequil.cpp
M programs/us_modelmetrics/us_modelmetrics.cpp
M programs/us_mwl_species_fit/us_mwl_species_fit.cpp
M programs/us_mwl_species_sim/us_mwl_species_sim.cpp
M programs/us_mwl_spectra/us_mwl_spectra.cpp
M programs/us_mwlr_viewer/us_mwlr_viewer.cpp
M programs/us_pcsa/us_mlplot.cpp
M programs/us_pcsa/us_pcsa.cpp
M programs/us_pcsa/us_resplot_pc.cpp
M programs/us_pcsa/us_rpscan.cpp
M programs/us_protocol_dev/us_protocol_dev_gui.cpp
M programs/us_pseudo3d_combine/us_pseudo3d_combine.cpp
M programs/us_ramp/us_intensity_ra.cpp
M programs/us_ramp/us_ramp_gui.cpp
M programs/us_rotor_calibration/us_rotor_calibration.cpp
M programs/us_second_moment/us_second_moment.cpp
M programs/us_spectrum/us_spectrum.cpp
M programs/us_vhw_combine/us_vhw_combine.cpp
M programs/us_vhw_enhanced/us_distrib_plot.cpp
M programs/us_vhw_enhanced/us_vhw_enhanced.cpp
M programs/us_xpn_viewer/us_xpn_viewer_gui.cpp
Log Message:
-----------
mod: remove qt4 code and qt 5 checks
Commit: 52e0a85023eb1f0cdb0de69292af086d18a1d727
https://github.com/ehb54/ultrascan3/commit/52e0a85023eb1f0cdb0de69292af086d18a1d727
Author: aaron <aaron at aucsolutions.com>
Date: 2025-11-01 (Sat, 01 Nov 2025)
Changed paths:
M programs/us/us.cpp
Log Message:
-----------
fix: depreciation error
Commit: 7e8cbe171f518cc11cbdf6c45239e1232ccb5726
https://github.com/ehb54/ultrascan3/commit/7e8cbe171f518cc11cbdf6c45239e1232ccb5726
Author: aaron <aaron at aucsolutions.com>
Date: 2025-11-03 (Mon, 03 Nov 2025)
Changed paths:
M admin/cmake/GenerateVersion.cmake
M programs/us/revision.sh
M programs/us/us.cpp
M programs/us/us.h
R scripts/bootstrap.sh
A scripts/build.sh
Log Message:
-----------
mod: add resizing and remove extra UTC in label
Commit: 675780eab109aad6807c5e89cbc50dbdbd962772
https://github.com/ehb54/ultrascan3/commit/675780eab109aad6807c5e89cbc50dbdbd962772
Author: aaron <aaron at aucsolutions.com>
Date: 2025-11-03 (Mon, 03 Nov 2025)
Changed paths:
M programs/us/us.pro
Log Message:
-----------
fix: add us_win_data.h
Commit: 320d50900efb79fdee663f85ef36825cc55e3c3d
https://github.com/ehb54/ultrascan3/commit/320d50900efb79fdee663f85ef36825cc55e3c3d
Author: aaron <aaron at aucsolutions.com>
Date: 2025-11-03 (Mon, 03 Nov 2025)
Changed paths:
M .gitignore
M CMakeLists.txt
M gui/images/check.png
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 gui/images/us3-splash.png
M programs/us/CMakeLists.txt
M programs/us/us.cpp
M programs/us/us.h
Log Message:
-----------
fix: splash screen resizing
Commit: e2b73576bf779849331ede9bc596170ef3add7d8
https://github.com/ehb54/ultrascan3/commit/e2b73576bf779849331ede9bc596170ef3add7d8
Author: aaron <aaron at aucsolutions.com>
Date: 2025-11-04 (Tue, 04 Nov 2025)
Changed paths:
R etc/README
M etc/us3-GMP-icon-128x128.ico
M etc/us3-GMP-icon-128x128.png
M etc/us3-GMP-icon-128x128.xpm
M etc/us3-GMP-icon-32x32.ico
M etc/us3-GMP-icon-32x32.png
M etc/us3-GMP-icon-32x32.xpm
M etc/us3-GMP-icon-48x48.ico
M etc/us3-GMP-icon-48x48.png
M etc/us3-GMP-icon-48x48.xpm
M etc/us3-icon-128x128.ico
M etc/us3-icon-128x128.png
R etc/us3-icon-128x128.xpm
R etc/us3-icon-32x32.ico
M etc/us3-icon-32x32.png
M etc/us3-icon-32x32.xpm
M etc/us3-icon-48x48.ico
M etc/us3-icon-48x48.png
M etc/us3-icon-48x48.xpm
M etc/us3-icon.icns
M etc/us3-splash.png
Log Message:
-----------
fix: revert icons
Commit: 53c47afaad0a6c5e254d3d2ff216638d871f21a4
https://github.com/ehb54/ultrascan3/commit/53c47afaad0a6c5e254d3d2ff216638d871f21a4
Author: aaron <aaron at aucsolutions.com>
Date: 2025-11-04 (Tue, 04 Nov 2025)
Changed paths:
M scripts/build.sh
Log Message:
-----------
mod: build defaults to 90% cores and vcpkg in home directory
Commit: 33d884f14decc31d36934b0a03e70bbed41854c9
https://github.com/ehb54/ultrascan3/commit/33d884f14decc31d36934b0a03e70bbed41854c9
Author: aaron <aaron at aucsolutions.com>
Date: 2025-11-04 (Tue, 04 Nov 2025)
Changed paths:
M CMakeLists.txt
M admin/cmake/GenerateVersion.cmake
M programs/us/revision.sh
M programs/us/us.cpp
M programs/us_reporter_gmp/CMakeLists.txt
Log Message:
-----------
mod: set a single time and reuse
Commit: 95598eae4d07bf9dc43bf02d6e58967bba5d282e
https://github.com/ehb54/ultrascan3/commit/95598eae4d07bf9dc43bf02d6e58967bba5d282e
Author: aaron <aaron at aucsolutions.com>
Date: 2025-11-04 (Tue, 04 Nov 2025)
Changed paths:
M programs/us/us.cpp
Log Message:
-----------
mod: additional contributors link
Commit: 08cb87c1bc238f8c201c7774797bb3d3de8bcf85
https://github.com/ehb54/ultrascan3/commit/08cb87c1bc238f8c201c7774797bb3d3de8bcf85
Author: aaron <aaron at aucsolutions.com>
Date: 2025-11-04 (Tue, 04 Nov 2025)
Changed paths:
M .gitignore
M CMakeLists.txt
M admin/cmake/GenerateVersion.cmake
R etc/README
M etc/us3-GMP-icon-128x128.ico
M etc/us3-GMP-icon-128x128.png
M etc/us3-GMP-icon-128x128.xpm
M etc/us3-GMP-icon-32x32.ico
M etc/us3-GMP-icon-32x32.png
M etc/us3-GMP-icon-32x32.xpm
M etc/us3-GMP-icon-48x48.ico
M etc/us3-GMP-icon-48x48.png
M etc/us3-GMP-icon-48x48.xpm
M etc/us3-icon-128x128.ico
M etc/us3-icon-128x128.png
R etc/us3-icon-128x128.xpm
R etc/us3-icon-32x32.ico
M etc/us3-icon-32x32.png
M etc/us3-icon-32x32.xpm
M etc/us3-icon-48x48.ico
M etc/us3-icon-48x48.png
M etc/us3-icon-48x48.xpm
M etc/us3-icon.icns
M etc/us3-splash.png
M gui/images/check.png
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 gui/images/us3-splash.png
M gui/libus_gui.pro
M programs/us/CMakeLists.txt
M programs/us/revision.sh
M programs/us/us.cpp
M programs/us/us.pro
M programs/us_reporter_gmp/CMakeLists.txt
R scripts/bootstrap.sh
A scripts/build.sh
Log Message:
-----------
Merge remote-tracking branch 'origin/534-enhancement-version-upgrade' into 597-request-qt-6-migration-remove-qt-4-code
# Conflicts:
# programs/us/us.cpp
Commit: baf9c94ac111af67948654073232919352e65f28
https://github.com/ehb54/ultrascan3/commit/baf9c94ac111af67948654073232919352e65f28
Author: aaron <aaron at aucsolutions.com>
Date: 2025-11-04 (Tue, 04 Nov 2025)
Changed paths:
M programs/us/us.cpp
Log Message:
-----------
merge
Commit: 6e58c37381bd4ac5dea4ae822375df0d0cbc7b9a
https://github.com/ehb54/ultrascan3/commit/6e58c37381bd4ac5dea4ae822375df0d0cbc7b9a
Author: aaron <aaron at aucsolutions.com>
Date: 2025-11-05 (Wed, 05 Nov 2025)
Changed paths:
M .gitignore
Log Message:
-----------
fix: add one newline
Commit: 13f85df6ceb512735407e0c337d01f57429991dc
https://github.com/ehb54/ultrascan3/commit/13f85df6ceb512735407e0c337d01f57429991dc
Author: aaron <aaron at aucsolutions.com>
Date: 2025-11-05 (Wed, 05 Nov 2025)
Changed paths:
M CMakeLists.txt
M CMakePresets.json
M admin/cmake/GenerateVersion.cmake
M admin/cmake/Us3QrcCheck.cmake
M admin/cmake/Us3Resources.cmake
M admin/cmake/UsDefinesParser.cmake
M admin/cmake/platform-config.cmake
M doc/manual/CMakeLists.txt
M gui/CMakeLists.txt
M programs/us_autoflow_analysis/CMakeLists.txt
M programs/us_com_project/CMakeLists.txt
M programs/us_com_project_academic/CMakeLists.txt
M programs/us_experiment/CMakeLists.txt
M programs/us_fematch/CMakeLists.txt
M programs/us_fit_meniscus/CMakeLists.txt
M programs/us_mwl_species_fit/CMakeLists.txt
M programs/us_query_rmsd/CMakeLists.txt
M programs/us_reporter_gmp/CMakeLists.txt
M qwtplot3d/CMakeLists.txt
M test/CMakeLists.txt
M test/utils/CMakeLists.txt
M utils/CMakeLists.txt
Log Message:
-----------
fix: add one newline
Commit: 208da0fac807bb4eab07d69d438597dfb03b8a52
https://github.com/ehb54/ultrascan3/commit/208da0fac807bb4eab07d69d438597dfb03b8a52
Author: aaron-auc <95181880+aaron-auc at users.noreply.github.com>
Date: 2025-11-05 (Wed, 05 Nov 2025)
Changed paths:
M .gitignore
A .gitmodules
M CMakeLists.txt
A CMakePresets.json
A admin/cmake/GenerateVersion.cmake
A admin/cmake/Us3QrcCheck.cmake
A admin/cmake/Us3Resources.cmake
A admin/cmake/UsDefinesParser.cmake
A admin/cmake/platform-config.cmake
A admin/cmake/triplets/x64-osx-dynamic.cmake
R admin/cmake/us_version.h.in
M admin/test/docker/Dockerfile
M alpha/us.cpp
A buildsys/vcpkg/overlay-ports/qwt/portfile.cmake
A buildsys/vcpkg/overlay-ports/qwt/vcpkg.json
A buildsys/vcpkg/overlay-ports/qwtplot3d/portfile.cmake
A buildsys/vcpkg/overlay-ports/qwtplot3d/qwtplot3d-config.cmake.in
A buildsys/vcpkg/overlay-ports/qwtplot3d/vcpkg.json
A doc/manual/CMakeLists.txt
M gui/CMakeLists.txt
M gui/libus_gui.pro
M gui/us_analysis_base2.cpp
M gui/us_analyte_gui.cpp
M gui/us_buffer_gui.cpp
M gui/us_combined_plots_parms_gui.cpp
M gui/us_edit_spectrum.cpp
M gui/us_extinctfitter_gui.cpp
M gui/us_extinction_gui.cpp
M gui/us_gui_settings.cpp
M gui/us_gui_settings.h
M gui/us_gui_util.cpp
R gui/us_mac_utils.c
R gui/us_mac_utils.h
M gui/us_new_spectrum.cpp
M gui/us_plot.cpp
M gui/us_plot.h
M gui/us_plot3d.cpp
M gui/us_report_general_gui.cpp
M gui/us_report_gui.cpp
M gui/us_run_details2.cpp
M gui/us_sassoc.cpp
M gui/us_scan_excl_gui.cpp
M gui/us_sim_params_gui.cpp
M gui/us_solution_gui.cpp
M gui/us_spectrodata.cpp
M gui/us_spectrodata.h
M gui/us_tmst_plot.cpp
M gui/us_widgets.cpp
M gui/us_widgets_dialog.cpp
R gui/us_win_utils.c
R gui/us_win_utils.h
R gui/us_window_message.cpp
R gui/us_window_message.h
R gui/us_x11_utils.c
R gui/us_x11_utils.h
M programs/CMakeLists.txt
A programs/us/CMakeLists.txt
M programs/us/revision.sh
M programs/us/us.cpp
M programs/us/us.pro
M programs/us/us_win_data.cpp
A programs/us/us_win_data.h
A programs/us_2dplot/CMakeLists.txt
M programs/us_2dplot/us_2dplot.cpp
M programs/us_2dplot/us_2dplot.h
A programs/us_2dsa/CMakeLists.txt
M programs/us_2dsa/us_2dsa.cpp
M programs/us_2dsa/us_analysis_control_2d.cpp
M programs/us_2dsa/us_resplot_2d.cpp
M programs/us_2dsa/us_show_norm.cpp
A programs/us_abde/CMakeLists.txt
M programs/us_abde/us_norm_profile.cpp
A programs/us_analysis_profile/CMakeLists.txt
M programs/us_analysis_profile/us_analysis_profile.cpp
M programs/us_analysis_profile/us_anapro_utils.cpp
A programs/us_analyte/CMakeLists.txt
A programs/us_assign_reviewers_gmp/CMakeLists.txt
A programs/us_astfem_sim/CMakeLists.txt
M programs/us_astfem_sim/us_astfem_sim.cpp
M programs/us_astfem_sim/us_clipdata.h
A programs/us_audit_trail_gmp/CMakeLists.txt
M programs/us_autoflow_analysis/CMakeLists.txt
A programs/us_buffer/CMakeLists.txt
A programs/us_buoyancy/CMakeLists.txt
M programs/us_buoyancy/us_buoyancy.cpp
A programs/us_colorgradient/CMakeLists.txt
M programs/us_com_project/CMakeLists.txt
M programs/us_com_project/us_com_project_gui.cpp
M programs/us_com_project_academic/CMakeLists.txt
A programs/us_combine_models/CMakeLists.txt
A programs/us_config/CMakeLists.txt
M programs/us_config/us_color.cpp
A programs/us_convert/CMakeLists.txt
M programs/us_convert/us_convert_gui.cpp
M programs/us_convert/us_intensity.cpp
A programs/us_dcdt/CMakeLists.txt
M programs/us_dcdt/us_dcdt.cpp
A programs/us_ddist_combine/CMakeLists.txt
M programs/us_ddist_combine/us_ddist_combine.cpp
A programs/us_density_match/CMakeLists.txt
A programs/us_dmga_init/CMakeLists.txt
A programs/us_edit/CMakeLists.txt
M programs/us_edit/us_edit.cpp
M programs/us_edit/us_edit_scan.cpp
M programs/us_edit/us_ri_noise.cpp
A programs/us_equiltime/CMakeLists.txt
M programs/us_equiltime/us_equiltime.cpp
A programs/us_esigner_gmp/CMakeLists.txt
M programs/us_experiment/CMakeLists.txt
M programs/us_experiment/us_exp_utils.cpp
M programs/us_experiment/us_experiment_gui_optima.cpp
M programs/us_experiment/us_proto_ranges.cpp
A programs/us_export_legacy/CMakeLists.txt
M programs/us_export_legacy/us_export.cpp
A programs/us_extinction/CMakeLists.txt
A programs/us_fds_filemanager/CMakeLists.txt
M programs/us_fds_filemanager/us_fds_filemanager.cpp
M programs/us_fematch/CMakeLists.txt
M programs/us_fematch/us_adv_dmgamc.cpp
M programs/us_fematch/us_fematch.cpp
M programs/us_fematch/us_resplot_fem.cpp
M programs/us_fit_meniscus/CMakeLists.txt
M programs/us_fit_meniscus/us_fit_meniscus.cpp
A programs/us_ga_init/CMakeLists.txt
M programs/us_ga_init/us_ga_init.cpp
A programs/us_globalequil/CMakeLists.txt
M programs/us_globalequil/us_eqfit_control.cpp
M programs/us_globalequil/us_eqhistogram.cpp
M programs/us_globalequil/us_globalequil.cpp
A programs/us_grid_editor/CMakeLists.txt
A programs/us_helpdaemon/CMakeLists.txt
A programs/us_integral/CMakeLists.txt
A programs/us_investigator/CMakeLists.txt
A programs/us_legacy_converter/CMakeLists.txt
A programs/us_license/CMakeLists.txt
A programs/us_manage_data/CMakeLists.txt
A programs/us_model_gui/CMakeLists.txt
A programs/us_modelmetrics/CMakeLists.txt
M programs/us_modelmetrics/us_modelmetrics.cpp
A programs/us_mpi_analysis/CMakeLists.txt
M programs/us_mwl_species_fit/CMakeLists.txt
M programs/us_mwl_species_fit/us_mwl_species_fit.cpp
A programs/us_mwl_species_sim/CMakeLists.txt
M programs/us_mwl_species_sim/us_mwl_species_sim.cpp
A programs/us_mwl_spectra/CMakeLists.txt
M programs/us_mwl_spectra/us_mwl_spectra.cpp
A programs/us_mwlr_viewer/CMakeLists.txt
M programs/us_mwlr_viewer/us_mwlr_viewer.cpp
A programs/us_pcsa/CMakeLists.txt
M programs/us_pcsa/us_mlplot.cpp
M programs/us_pcsa/us_pcsa.cpp
M programs/us_pcsa/us_resplot_pc.cpp
M programs/us_pcsa/us_rpscan.cpp
A programs/us_predict1/CMakeLists.txt
A programs/us_predict2/CMakeLists.txt
A programs/us_project/CMakeLists.txt
M programs/us_protocol_dev/us_protocol_dev_gui.cpp
A programs/us_pseudo3d_combine/CMakeLists.txt
M programs/us_pseudo3d_combine/us_pseudo3d_combine.cpp
A programs/us_pseudo_absorbance/CMakeLists.txt
M programs/us_query_rmsd/CMakeLists.txt
A programs/us_ramp/CMakeLists.txt
M programs/us_ramp/us_intensity_ra.cpp
M programs/us_ramp/us_ramp_gui.cpp
R programs/us_rasmol_control/us_rasmol_control.cpp
R programs/us_rasmol_control/us_rasmol_control.h
R programs/us_rasmol_control/us_rasmol_control.pro
A programs/us_reassign_reviewers_gmp/CMakeLists.txt
A programs/us_reporter/CMakeLists.txt
M programs/us_reporter_gmp/CMakeLists.txt
M programs/us_reporter_gmp/us_reporter_gmp.cpp
A programs/us_rotor/CMakeLists.txt
A programs/us_rotor_calibration/CMakeLists.txt
M programs/us_rotor_calibration/us_rotor_calibration.cpp
A programs/us_sassoc/CMakeLists.txt
A programs/us_second_moment/CMakeLists.txt
M programs/us_second_moment/us_second_moment.cpp
A programs/us_solution/CMakeLists.txt
A programs/us_spectrum/CMakeLists.txt
M programs/us_spectrum/us_spectrum.cpp
A programs/us_tmst_viewer/CMakeLists.txt
A programs/us_vhw_combine/CMakeLists.txt
M programs/us_vhw_combine/us_vhw_combine.cpp
A programs/us_vhw_enhanced/CMakeLists.txt
M programs/us_vhw_enhanced/us_distrib_plot.cpp
M programs/us_vhw_enhanced/us_vhw_enhanced.cpp
A programs/us_xpn_viewer/CMakeLists.txt
M programs/us_xpn_viewer/us_xpn_viewer_gui.cpp
M qwtplot3d/CMakeLists.txt
M qwtplot3d/include/qwt3d_openglhelper.h
A scripts/build.sh
M test-docker.sh
M test/CMakeLists.txt
M test/utils/CMakeLists.txt
M test/utils/test_us_ana_profile.cpp
M utils/CMakeLists.txt
M utils/us_defines.h
A vcpkg
A vcpkg-configuration.json
A vcpkg.json
Log Message:
-----------
Merge pull request #301 from ehb54/597-request-qt-6-migration-remove-qt-4-code
597 request qt 6 migration remove qt 4 code
Commit: fe96d5575a8f88b29c935c3e8c6c33468859f2cf
https://github.com/ehb54/ultrascan3/commit/fe96d5575a8f88b29c935c3e8c6c33468859f2cf
Author: Lukas Dobler <69309597+doluk at users.noreply.github.com>
Date: 2025-11-07 (Fri, 07 Nov 2025)
Changed paths:
M .gitignore
A .gitmodules
M CMakeLists.txt
A CMakePresets.json
A admin/cmake/GenerateVersion.cmake
A admin/cmake/Us3QrcCheck.cmake
A admin/cmake/Us3Resources.cmake
A admin/cmake/UsDefinesParser.cmake
A admin/cmake/platform-config.cmake
A admin/cmake/triplets/x64-osx-dynamic.cmake
R admin/cmake/us_version.h.in
M admin/test/docker/Dockerfile
M alpha/us.cpp
A buildsys/vcpkg/overlay-ports/qwt/portfile.cmake
A buildsys/vcpkg/overlay-ports/qwt/vcpkg.json
A buildsys/vcpkg/overlay-ports/qwtplot3d/portfile.cmake
A buildsys/vcpkg/overlay-ports/qwtplot3d/qwtplot3d-config.cmake.in
A buildsys/vcpkg/overlay-ports/qwtplot3d/vcpkg.json
A doc/manual/CMakeLists.txt
M gui/CMakeLists.txt
M gui/libus_gui.pro
M gui/us_analysis_base2.cpp
M gui/us_analyte_gui.cpp
M gui/us_buffer_gui.cpp
M gui/us_combined_plots_parms_gui.cpp
M gui/us_edit_spectrum.cpp
M gui/us_extinctfitter_gui.cpp
M gui/us_extinction_gui.cpp
M gui/us_gui_settings.cpp
M gui/us_gui_settings.h
M gui/us_gui_util.cpp
R gui/us_mac_utils.c
R gui/us_mac_utils.h
M gui/us_new_spectrum.cpp
M gui/us_plot.cpp
M gui/us_plot.h
M gui/us_plot3d.cpp
M gui/us_report_general_gui.cpp
M gui/us_report_gui.cpp
M gui/us_run_details2.cpp
M gui/us_sassoc.cpp
M gui/us_scan_excl_gui.cpp
M gui/us_sim_params_gui.cpp
M gui/us_solution_gui.cpp
M gui/us_spectrodata.cpp
M gui/us_spectrodata.h
M gui/us_tmst_plot.cpp
M gui/us_widgets.cpp
M gui/us_widgets_dialog.cpp
R gui/us_win_utils.c
R gui/us_win_utils.h
R gui/us_window_message.cpp
R gui/us_window_message.h
R gui/us_x11_utils.c
R gui/us_x11_utils.h
M programs/CMakeLists.txt
A programs/us/CMakeLists.txt
M programs/us/revision.sh
M programs/us/us.cpp
M programs/us/us.pro
M programs/us/us_win_data.cpp
A programs/us/us_win_data.h
A programs/us_2dplot/CMakeLists.txt
M programs/us_2dplot/us_2dplot.cpp
M programs/us_2dplot/us_2dplot.h
A programs/us_2dsa/CMakeLists.txt
M programs/us_2dsa/us_2dsa.cpp
M programs/us_2dsa/us_analysis_control_2d.cpp
M programs/us_2dsa/us_resplot_2d.cpp
M programs/us_2dsa/us_show_norm.cpp
A programs/us_abde/CMakeLists.txt
M programs/us_abde/us_norm_profile.cpp
A programs/us_analysis_profile/CMakeLists.txt
M programs/us_analysis_profile/us_analysis_profile.cpp
M programs/us_analysis_profile/us_anapro_utils.cpp
A programs/us_analyte/CMakeLists.txt
A programs/us_assign_reviewers_gmp/CMakeLists.txt
A programs/us_astfem_sim/CMakeLists.txt
M programs/us_astfem_sim/us_astfem_sim.cpp
M programs/us_astfem_sim/us_clipdata.h
A programs/us_audit_trail_gmp/CMakeLists.txt
M programs/us_autoflow_analysis/CMakeLists.txt
A programs/us_buffer/CMakeLists.txt
A programs/us_buoyancy/CMakeLists.txt
M programs/us_buoyancy/us_buoyancy.cpp
A programs/us_colorgradient/CMakeLists.txt
M programs/us_com_project/CMakeLists.txt
M programs/us_com_project/us_com_project_gui.cpp
M programs/us_com_project_academic/CMakeLists.txt
A programs/us_combine_models/CMakeLists.txt
A programs/us_config/CMakeLists.txt
M programs/us_config/us_color.cpp
A programs/us_convert/CMakeLists.txt
M programs/us_convert/us_convert_gui.cpp
M programs/us_convert/us_intensity.cpp
A programs/us_dcdt/CMakeLists.txt
M programs/us_dcdt/us_dcdt.cpp
A programs/us_ddist_combine/CMakeLists.txt
M programs/us_ddist_combine/us_ddist_combine.cpp
A programs/us_density_match/CMakeLists.txt
A programs/us_dmga_init/CMakeLists.txt
A programs/us_edit/CMakeLists.txt
M programs/us_edit/us_edit.cpp
M programs/us_edit/us_edit_scan.cpp
M programs/us_edit/us_ri_noise.cpp
A programs/us_equiltime/CMakeLists.txt
M programs/us_equiltime/us_equiltime.cpp
A programs/us_esigner_gmp/CMakeLists.txt
M programs/us_experiment/CMakeLists.txt
M programs/us_experiment/us_exp_utils.cpp
M programs/us_experiment/us_experiment_gui_optima.cpp
M programs/us_experiment/us_proto_ranges.cpp
A programs/us_export_legacy/CMakeLists.txt
M programs/us_export_legacy/us_export.cpp
A programs/us_extinction/CMakeLists.txt
A programs/us_fds_filemanager/CMakeLists.txt
M programs/us_fds_filemanager/us_fds_filemanager.cpp
M programs/us_fematch/CMakeLists.txt
M programs/us_fematch/us_adv_dmgamc.cpp
M programs/us_fematch/us_fematch.cpp
M programs/us_fematch/us_resplot_fem.cpp
M programs/us_fit_meniscus/CMakeLists.txt
M programs/us_fit_meniscus/us_fit_meniscus.cpp
A programs/us_ga_init/CMakeLists.txt
M programs/us_ga_init/us_ga_init.cpp
A programs/us_globalequil/CMakeLists.txt
M programs/us_globalequil/us_eqfit_control.cpp
M programs/us_globalequil/us_eqhistogram.cpp
M programs/us_globalequil/us_globalequil.cpp
A programs/us_grid_editor/CMakeLists.txt
A programs/us_helpdaemon/CMakeLists.txt
A programs/us_integral/CMakeLists.txt
A programs/us_investigator/CMakeLists.txt
A programs/us_legacy_converter/CMakeLists.txt
A programs/us_license/CMakeLists.txt
A programs/us_manage_data/CMakeLists.txt
A programs/us_model_gui/CMakeLists.txt
A programs/us_modelmetrics/CMakeLists.txt
M programs/us_modelmetrics/us_modelmetrics.cpp
A programs/us_mpi_analysis/CMakeLists.txt
M programs/us_mwl_species_fit/CMakeLists.txt
M programs/us_mwl_species_fit/us_mwl_species_fit.cpp
A programs/us_mwl_species_sim/CMakeLists.txt
M programs/us_mwl_species_sim/us_mwl_species_sim.cpp
A programs/us_mwl_spectra/CMakeLists.txt
M programs/us_mwl_spectra/us_mwl_spectra.cpp
A programs/us_mwlr_viewer/CMakeLists.txt
M programs/us_mwlr_viewer/us_mwlr_viewer.cpp
A programs/us_pcsa/CMakeLists.txt
M programs/us_pcsa/us_mlplot.cpp
M programs/us_pcsa/us_pcsa.cpp
M programs/us_pcsa/us_resplot_pc.cpp
M programs/us_pcsa/us_rpscan.cpp
A programs/us_predict1/CMakeLists.txt
A programs/us_predict2/CMakeLists.txt
A programs/us_project/CMakeLists.txt
M programs/us_protocol_dev/us_protocol_dev_gui.cpp
A programs/us_pseudo3d_combine/CMakeLists.txt
M programs/us_pseudo3d_combine/us_pseudo3d_combine.cpp
A programs/us_pseudo_absorbance/CMakeLists.txt
M programs/us_query_rmsd/CMakeLists.txt
A programs/us_ramp/CMakeLists.txt
M programs/us_ramp/us_intensity_ra.cpp
M programs/us_ramp/us_ramp_gui.cpp
R programs/us_rasmol_control/us_rasmol_control.cpp
R programs/us_rasmol_control/us_rasmol_control.h
R programs/us_rasmol_control/us_rasmol_control.pro
A programs/us_reassign_reviewers_gmp/CMakeLists.txt
A programs/us_reporter/CMakeLists.txt
M programs/us_reporter_gmp/CMakeLists.txt
M programs/us_reporter_gmp/us_reporter_gmp.cpp
A programs/us_rotor/CMakeLists.txt
A programs/us_rotor_calibration/CMakeLists.txt
M programs/us_rotor_calibration/us_rotor_calibration.cpp
A programs/us_sassoc/CMakeLists.txt
A programs/us_second_moment/CMakeLists.txt
M programs/us_second_moment/us_second_moment.cpp
A programs/us_solution/CMakeLists.txt
A programs/us_spectrum/CMakeLists.txt
M programs/us_spectrum/us_spectrum.cpp
A programs/us_tmst_viewer/CMakeLists.txt
A programs/us_vhw_combine/CMakeLists.txt
M programs/us_vhw_combine/us_vhw_combine.cpp
A programs/us_vhw_enhanced/CMakeLists.txt
M programs/us_vhw_enhanced/us_distrib_plot.cpp
M programs/us_vhw_enhanced/us_vhw_enhanced.cpp
A programs/us_xpn_viewer/CMakeLists.txt
M programs/us_xpn_viewer/us_xpn_viewer_gui.cpp
M qwtplot3d/CMakeLists.txt
M qwtplot3d/include/qwt3d_openglhelper.h
A scripts/build.sh
M test-docker.sh
M test/CMakeLists.txt
M test/utils/CMakeLists.txt
M test/utils/test_us_ana_profile.cpp
M utils/CMakeLists.txt
M utils/us_defines.h
A vcpkg
A vcpkg-configuration.json
A vcpkg.json
Log Message:
-----------
Merge branch 'main' into lukas/qt6-compile
Compare: https://github.com/ehb54/ultrascan3/compare/deb377ae673f...fe96d5575a8f
To unsubscribe from these emails, change your notification settings at https://github.com/ehb54/ultrascan3/settings/notifications
More information about the us-commits
mailing list