Skip to content

Commit 74f137d

Browse files
committed
Corrected enabling and disabling widgets after simulation.
1 parent 0397ba3 commit 74f137d

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

src/mainwindow.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,14 @@ void MainWindow::on_pushButton_RunSimulation_clicked()
107107
mOtherPlotsFlag = true;
108108
mDistPlotFlag = true;
109109
}
110+
if (ui->comboBox_Distribution->currentIndex() ==2)
111+
support.DisableWidgetsDuringCustomPolyDisperseData(ui, true);
112+
else
113+
support.DisableWidgetsDuringCustomPolyDisperseData(ui, false);
110114
}
111115
//Enable widgets
112116
support.DisableWidgetsDuringSimulation(ui, false);
113-
}
114-
if (ui->comboBox_Distribution->currentIndex() ==2)
115-
support.DisableWidgetsDuringCustomPolyDisperseData(ui, true);
116-
else
117-
support.DisableWidgetsDuringCustomPolyDisperseData(ui, false);
118-
//delete mPara;
117+
}
119118
}
120119
}
121120

@@ -301,14 +300,15 @@ void MainWindow::on_radioButton_LogXAxis_clicked()
301300
void MainWindow::on_radioButton_MonoDisperse_clicked()
302301
{
303302
MainWindowSupport support;
303+
ui->comboBox_Distribution->setCurrentIndex(0);
304304
support.SetWidgets(ui);
305305
PlotData plot;
306306
plot.ClearPlots(ui,mPara);
307307
ui->tabWidget_PhaseFunction->setTabText(1,"S1 and S2");
308308
ui->tabWidget_ScatCross->setTabText(1,"Scattering Cross Section");
309309
mOtherPlotsFlag = false;
310310
mDistPlotFlag = false;
311-
ui->comboBox_Distribution->setCurrentIndex(0);
311+
312312
}
313313

314314
//radioButtonPolyDisperse_clicked: Select Poly disperse distribution

0 commit comments

Comments
 (0)