diff --git a/src/pardialog.cpp b/src/pardialog.cpp --- a/src/pardialog.cpp +++ b/src/pardialog.cpp @@ -137,7 +137,7 @@ ParameterDialog::ParameterDialog(QWidget dir2_edit = new QLineEdit( QString("%1").arg(par.dir2), this, "dir2_edit" ); // make a 1x1 grid; it will auto-expand QGridLayout *grid = new QGridLayout( this, 1, 1 ); - + // add the first four widgets with (row, column) addressing setWindowTitle( QString( " Parameter values for The Virtual Leaf") ); grid->addWidget( new QLabel( "

Parameter values for The Virtual Leaf

",this), 0, 0, 1, -1, Qt::AlignCenter); @@ -362,108 +362,108 @@ ParameterDialog::ParameterDialog(QWidget }; ParameterDialog::~ParameterDialog(void) { -delete arrowcolor_edit; -delete arrowsize_edit; -delete textcolor_edit; -delete cellnumsize_edit; -delete nodenumsize_edit; -delete node_mag_edit; -delete outlinewidth_edit; -delete cell_outline_color_edit; -delete resize_stride_edit; -delete T_edit; -delete lambda_length_edit; -delete lambda_celllength_edit; -delete target_length_edit; -delete cell_expansion_rate_edit; -delete cell_div_expansion_rate_edit; -delete auxin_dependent_growth_edit; -delete ode_accuracy_edit; -delete mc_stepsize_edit; -delete mc_cell_stepsize_edit; -delete energy_threshold_edit; -delete bend_lambda_edit; -delete alignment_lambda_edit; -delete rel_cell_div_threshold_edit; -delete rel_perimeter_stiffness_edit; -delete collapse_node_threshold_edit; -delete morphogen_div_threshold_edit; -delete morphogen_expansion_threshold_edit; -delete copy_wall_edit; -delete source_edit; -delete D_edit; -delete initval_edit; -delete k1_edit; -delete k2_edit; -delete r_edit; -delete kr_edit; -delete km_edit; -delete Pi_tot_edit; -delete transport_edit; -delete ka_edit; -delete pin_prod_edit; -delete pin_prod_in_epidermis_edit; -delete pin_breakdown_edit; -delete pin_breakdown_internal_edit; -delete aux1prod_edit; -delete aux1prodmeso_edit; -delete aux1decay_edit; -delete aux1decaymeso_edit; -delete aux1transport_edit; -delete aux_cons_edit; -delete aux_breakdown_edit; -delete kaux1_edit; -delete kap_edit; -delete leaf_tip_source_edit; -delete sam_efflux_edit; -delete sam_auxin_edit; -delete sam_auxin_breakdown_edit; -delete van3prod_edit; -delete van3autokat_edit; -delete van3sat_edit; -delete k2van3_edit; -delete dt_edit; -delete rd_dt_edit; -delete datadir_edit; -delete movie_edit; -delete nit_edit; -delete maxt_edit; -delete storage_stride_edit; -delete xml_storage_stride_edit; -delete rseed_edit; -delete constituous_expansion_limit_edit; -delete vessel_inh_level_edit; -delete vessel_expansion_rate_edit; -delete d_edit; -delete e_edit; -delete f_edit; -delete c_edit; -delete mu_edit; -delete nu_edit; -delete rho0_edit; -delete rho1_edit; -delete c0_edit; -delete gamma_edit; -delete eps_edit; -delete k_edit; -delete i1_edit; -delete i2_edit; -delete i3_edit; -delete i4_edit; -delete i5_edit; -delete s1_edit; -delete s2_edit; -delete s3_edit; -delete b1_edit; -delete b2_edit; -delete b3_edit; -delete b4_edit; -delete dir1_edit; -delete dir2_edit; + delete arrowcolor_edit; + delete arrowsize_edit; + delete textcolor_edit; + delete cellnumsize_edit; + delete nodenumsize_edit; + delete node_mag_edit; + delete outlinewidth_edit; + delete cell_outline_color_edit; + delete resize_stride_edit; + delete T_edit; + delete lambda_length_edit; + delete lambda_celllength_edit; + delete target_length_edit; + delete cell_expansion_rate_edit; + delete cell_div_expansion_rate_edit; + delete auxin_dependent_growth_edit; + delete ode_accuracy_edit; + delete mc_stepsize_edit; + delete mc_cell_stepsize_edit; + delete energy_threshold_edit; + delete bend_lambda_edit; + delete alignment_lambda_edit; + delete rel_cell_div_threshold_edit; + delete rel_perimeter_stiffness_edit; + delete collapse_node_threshold_edit; + delete morphogen_div_threshold_edit; + delete morphogen_expansion_threshold_edit; + delete copy_wall_edit; + delete source_edit; + delete D_edit; + delete initval_edit; + delete k1_edit; + delete k2_edit; + delete r_edit; + delete kr_edit; + delete km_edit; + delete Pi_tot_edit; + delete transport_edit; + delete ka_edit; + delete pin_prod_edit; + delete pin_prod_in_epidermis_edit; + delete pin_breakdown_edit; + delete pin_breakdown_internal_edit; + delete aux1prod_edit; + delete aux1prodmeso_edit; + delete aux1decay_edit; + delete aux1decaymeso_edit; + delete aux1transport_edit; + delete aux_cons_edit; + delete aux_breakdown_edit; + delete kaux1_edit; + delete kap_edit; + delete leaf_tip_source_edit; + delete sam_efflux_edit; + delete sam_auxin_edit; + delete sam_auxin_breakdown_edit; + delete van3prod_edit; + delete van3autokat_edit; + delete van3sat_edit; + delete k2van3_edit; + delete dt_edit; + delete rd_dt_edit; + delete datadir_edit; + delete movie_edit; + delete nit_edit; + delete maxt_edit; + delete storage_stride_edit; + delete xml_storage_stride_edit; + delete rseed_edit; + delete constituous_expansion_limit_edit; + delete vessel_inh_level_edit; + delete vessel_expansion_rate_edit; + delete d_edit; + delete e_edit; + delete f_edit; + delete c_edit; + delete mu_edit; + delete nu_edit; + delete rho0_edit; + delete rho1_edit; + delete c0_edit; + delete gamma_edit; + delete eps_edit; + delete k_edit; + delete i1_edit; + delete i2_edit; + delete i3_edit; + delete i4_edit; + delete i5_edit; + delete s1_edit; + delete s2_edit; + delete s3_edit; + delete b1_edit; + delete b2_edit; + delete b3_edit; + delete b4_edit; + delete dir1_edit; + delete dir2_edit; } void ParameterDialog::write(void) { - + extern Parameter par; QString tmpval; par.arrowcolor = strdup((const char *)arrowcolor_edit->text()); @@ -486,7 +486,7 @@ void ParameterDialog::write(void) { else if (tmpval == "false" || tmpval == "no") par.auxin_dependent_growth = false; else { if (QMessageBox::question(this, "Syntax error", tr("Value %1 of parameter %2 is not recognized as Boolean.\nDo you mean TRUE or FALSE?").arg(tmpval).arg("auxin_dependent_growth"),"True","False", QString::null, 0, 1)==0) par.auxin_dependent_growth=true; - else par.auxin_dependent_growth=false; + else par.auxin_dependent_growth=false; } par.ode_accuracy = ode_accuracy_edit->text().toDouble(); par.mc_stepsize = mc_stepsize_edit->text().toDouble(); @@ -504,7 +504,7 @@ void ParameterDialog::write(void) { else if (tmpval == "false" || tmpval == "no") par.copy_wall = false; else { if (QMessageBox::question(this, "Syntax error", tr("Value %1 of parameter %2 is not recognized as Boolean.\nDo you mean TRUE or FALSE?").arg(tmpval).arg("copy_wall"),"True","False", QString::null, 0, 1)==0) par.copy_wall=true; - else par.copy_wall=false; + else par.copy_wall=false; } par.source = source_edit->text().toDouble(); tmpval = D_edit->text().section(',', 0, 0); @@ -604,7 +604,7 @@ void ParameterDialog::write(void) { else if (tmpval == "false" || tmpval == "no") par.movie = false; else { if (QMessageBox::question(this, "Syntax error", tr("Value %1 of parameter %2 is not recognized as Boolean.\nDo you mean TRUE or FALSE?").arg(tmpval).arg("movie"),"True","False", QString::null, 0, 1)==0) par.movie=true; - else par.movie=false; + else par.movie=false; } par.nit = nit_edit->text().toInt(); par.maxt = maxt_edit->text().toDouble(); @@ -668,33 +668,32 @@ void ParameterDialog::write(void) { else if (tmpval == "false" || tmpval == "no") par.b1 = false; else { if (QMessageBox::question(this, "Syntax error", tr("Value %1 of parameter %2 is not recognized as Boolean.\nDo you mean TRUE or FALSE?").arg(tmpval).arg("b1"),"True","False", QString::null, 0, 1)==0) par.b1=true; - else par.b1=false; + else par.b1=false; } tmpval = b2_edit->text().stripWhiteSpace(); if (tmpval == "true" || tmpval == "yes" ) par.b2 = true; else if (tmpval == "false" || tmpval == "no") par.b2 = false; else { if (QMessageBox::question(this, "Syntax error", tr("Value %1 of parameter %2 is not recognized as Boolean.\nDo you mean TRUE or FALSE?").arg(tmpval).arg("b2"),"True","False", QString::null, 0, 1)==0) par.b2=true; - else par.b2=false; + else par.b2=false; } tmpval = b3_edit->text().stripWhiteSpace(); if (tmpval == "true" || tmpval == "yes" ) par.b3 = true; else if (tmpval == "false" || tmpval == "no") par.b3 = false; else { if (QMessageBox::question(this, "Syntax error", tr("Value %1 of parameter %2 is not recognized as Boolean.\nDo you mean TRUE or FALSE?").arg(tmpval).arg("b3"),"True","False", QString::null, 0, 1)==0) par.b3=true; - else par.b3=false; + else par.b3=false; } tmpval = b4_edit->text().stripWhiteSpace(); if (tmpval == "true" || tmpval == "yes" ) par.b4 = true; else if (tmpval == "false" || tmpval == "no") par.b4 = false; else { if (QMessageBox::question(this, "Syntax error", tr("Value %1 of parameter %2 is not recognized as Boolean.\nDo you mean TRUE or FALSE?").arg(tmpval).arg("b4"),"True","False", QString::null, 0, 1)==0) par.b4=true; - else par.b4=false; + else par.b4=false; } par.dir1 = strdup((const char *)dir1_edit->text()); par.dir2 = strdup((const char *)dir2_edit->text()); Reset(); - } void ParameterDialog::Reset(void) { extern Parameter par;