Skip to content

Fix volume asset dropdown not populated and crash when no volume selected in Match Template panel #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Fix volume asset dropdown not populated and crash when no volume selected in Match Template panel #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9fc084
Initial plan
Copilot Sep 4, 2025
1ccce8f
Fix crash when no volume is selected in Match Template panel [skip ci]
Copilot Sep 4, 2025
0fd7966
Fix volume and image group dropdowns not populated when switching wor…
Copilot Sep 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/gui/MainFrame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,12 +311,12 @@ void MyMainFrame::DirtyVolumes( ) {
sharpen_3d_panel->volumes_are_dirty = true;
refine_ctf_panel->volumes_are_dirty = true;

if ( current_workflow == "Template Matching" ) {
match_template_panel->volumes_are_dirty = true;
// Always mark template matching panels as dirty, regardless of current workflow
// This ensures volumes are available when user switches to Template Matching workflow
match_template_panel->volumes_are_dirty = true;
#ifdef EXPERIMENTAL
refine_template_panel->volumes_are_dirty = true;
refine_template_panel->volumes_are_dirty = true;
#endif
}
}

void MyMainFrame::DirtyAtomicCoordinates( ) {
Expand All @@ -337,11 +337,11 @@ void MyMainFrame::DirtyImageGroups( ) {
findparticles_panel->group_combo_is_dirty = true;
picking_results_panel->group_combo_is_dirty = true;

if ( current_workflow == "Template Matching" ) {
match_template_panel->group_combo_is_dirty = true;
match_template_results_panel->group_combo_is_dirty = true;
refine_template_panel->group_combo_is_dirty = true;
}
// Always mark template matching panels as dirty, regardless of current workflow
// This ensures image groups are available when user switches to Template Matching workflow
match_template_panel->group_combo_is_dirty = true;
match_template_results_panel->group_combo_is_dirty = true;
refine_template_panel->group_combo_is_dirty = true;
}

void MyMainFrame::DirtyParticlePositionGroups( ) {
Expand Down
8 changes: 7 additions & 1 deletion src/gui/MatchTemplatePanel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ void MatchTemplatePanel::OnUpdateUI(wxUpdateUIEvent& event) {
ReferenceSelectPanel->Enable(true);

if ( RunProfileComboBox->GetCount( ) > 0 ) {
if ( image_asset_panel->ReturnGroupSize(GroupComboBox->GetSelection( )) > 0 && run_profiles_panel->run_profile_manager.ReturnTotalJobs(RunProfileComboBox->GetSelection( )) > 0 && all_images_have_defocus_values == true ) {
if ( image_asset_panel->ReturnGroupSize(GroupComboBox->GetSelection( )) > 0 && run_profiles_panel->run_profile_manager.ReturnTotalJobs(RunProfileComboBox->GetSelection( )) > 0 && all_images_have_defocus_values == true && ReferenceSelectPanel->GetSelection( ) >= 0 ) {
StartEstimationButton->Enable(true);
}
else
Expand Down Expand Up @@ -559,6 +559,12 @@ void MatchTemplatePanel::SetInputsForPossibleReRun(bool set_up_to_resume_job, Te

void MatchTemplatePanel::StartEstimationClick(wxCommandEvent& event) {

// Safety check: ensure a volume is selected before proceeding
if ( ReferenceSelectPanel->GetSelection( ) < 0 ) {
wxMessageBox("Please select a reference volume before starting the job.", "No Reference Volume Selected", wxOK | wxICON_ERROR);
return;
}

active_group.CopyFrom(&image_asset_panel->all_groups_list->groups[GroupComboBox->GetSelection( )]);

// Check if this is a resume job. If yes, get the job id and set the active
Expand Down