diff --git a/src/pardialog.cpp b/src/pardialog.cpp --- a/src/pardialog.cpp +++ b/src/pardialog.cpp @@ -43,6 +43,11 @@ ParameterDialog::ParameterDialog(QWidget outlinewidth_edit = new QLineEdit( QString("%1").arg(par.outlinewidth), this, "outlinewidth_edit" ); cell_outline_color_edit = new QLineEdit( QString("%1").arg(par.cell_outline_color), this, "cell_outline_color_edit" ); resize_stride_edit = new QLineEdit( QString("%1").arg(par.resize_stride), this, "resize_stride_edit" ); + export_interval_edit = new QLineEdit( QString("%1").arg(par.export_interval), this, "export_interval_edit" ); + export_fn_prefix_edit = new QLineEdit( QString("%1").arg(par.export_fn_prefix), this, "export_fn_prefix_edit" ); + storage_stride_edit = new QLineEdit( QString("%1").arg(par.storage_stride), this, "storage_stride_edit" ); + xml_storage_stride_edit = new QLineEdit( QString("%1").arg(par.xml_storage_stride), this, "xml_storage_stride_edit" ); + datadir_edit = new QLineEdit( QString("%1").arg(par.datadir), this, "datadir_edit" ); T_edit = new QLineEdit( QString("%1").arg(par.T), this, "T_edit" ); lambda_length_edit = new QLineEdit( QString("%1").arg(par.lambda_length), this, "lambda_length_edit" ); yielding_threshold_edit = new QLineEdit( QString("%1").arg(par.yielding_threshold), this, "yielding_threshold_edit" ); @@ -101,12 +106,9 @@ ParameterDialog::ParameterDialog(QWidget k2van3_edit = new QLineEdit( QString("%1").arg(par.k2van3), this, "k2van3_edit" ); dt_edit = new QLineEdit( QString("%1").arg(par.dt), this, "dt_edit" ); rd_dt_edit = new QLineEdit( QString("%1").arg(par.rd_dt), this, "rd_dt_edit" ); - datadir_edit = new QLineEdit( QString("%1").arg(par.datadir), this, "datadir_edit" ); movie_edit = new QLineEdit( QString("%1").arg(sbool(par.movie)), this, "movie_edit" ); nit_edit = new QLineEdit( QString("%1").arg(par.nit), this, "nit_edit" ); maxt_edit = new QLineEdit( QString("%1").arg(par.maxt), this, "maxt_edit" ); - storage_stride_edit = new QLineEdit( QString("%1").arg(par.storage_stride), this, "storage_stride_edit" ); - xml_storage_stride_edit = new QLineEdit( QString("%1").arg(par.xml_storage_stride), this, "xml_storage_stride_edit" ); rseed_edit = new QLineEdit( QString("%1").arg(par.rseed), this, "rseed_edit" ); constituous_expansion_limit_edit = new QLineEdit( QString("%1").arg(par.constituous_expansion_limit), this, "constituous_expansion_limit_edit" ); vessel_inh_level_edit = new QLineEdit( QString("%1").arg(par.vessel_inh_level), this, "vessel_inh_level_edit" ); @@ -139,8 +141,6 @@ ParameterDialog::ParameterDialog(QWidget b4_edit = new QLineEdit( QString("%1").arg(sbool(par.b4)), this, "b4_edit" ); dir1_edit = new QLineEdit( QString("%1").arg(par.dir1), this, "dir1_edit" ); dir2_edit = new QLineEdit( QString("%1").arg(par.dir2), this, "dir2_edit" ); - export_interval_edit = new QLineEdit( QString("%1").arg(par.export_interval), this, "export_interval_edit" ); - export_fn_prefix_edit = new QLineEdit( QString("%1").arg(par.export_fn_prefix), this, "export_fn_prefix_edit" ); // make a 1x1 grid; it will auto-expand QGridLayout *grid = new QGridLayout( this, 1, 1 ); @@ -168,199 +168,201 @@ QGridLayout *grid = new QGridLayout( thi grid->addWidget( new QLabel( "resize_stride", this ),12, 0 ); grid->addWidget( resize_stride_edit, 12, 0+1 ); grid->addWidget( new QLabel( "", this), 13, 0, 1, 2 ); - grid->addWidget( new QLabel( " Cell mechanics", this), 14, 0, 1, 2 ); - grid->addWidget( new QLabel( "T", this ),15, 0 ); - grid->addWidget( T_edit, 15, 0+1 ); - grid->addWidget( new QLabel( "lambda_length", this ),16, 0 ); - grid->addWidget( lambda_length_edit, 16, 0+1 ); - grid->addWidget( new QLabel( "yielding_threshold", this ),17, 0 ); - grid->addWidget( yielding_threshold_edit, 17, 0+1 ); - grid->addWidget( new QLabel( "lambda_celllength", this ),18, 0 ); - grid->addWidget( lambda_celllength_edit, 18, 0+1 ); - grid->addWidget( new QLabel( "target_length", this ),19, 0 ); - grid->addWidget( target_length_edit, 19, 0+1 ); - grid->addWidget( new QLabel( "cell_expansion_rate", this ),20, 0 ); - grid->addWidget( cell_expansion_rate_edit, 20, 0+1 ); - grid->addWidget( new QLabel( "cell_div_expansion_rate", this ),21, 0 ); - grid->addWidget( cell_div_expansion_rate_edit, 21, 0+1 ); - grid->addWidget( new QLabel( "auxin_dependent_growth", this ),22, 0 ); - grid->addWidget( auxin_dependent_growth_edit, 22, 0+1 ); - grid->addWidget( new QLabel( "ode_accuracy", this ),23, 0 ); - grid->addWidget( ode_accuracy_edit, 23, 0+1 ); - grid->addWidget( new QLabel( "mc_stepsize", this ),24, 0 ); - grid->addWidget( mc_stepsize_edit, 24, 0+1 ); - grid->addWidget( new QLabel( "mc_cell_stepsize", this ),25, 0 ); - grid->addWidget( mc_cell_stepsize_edit, 25, 0+1 ); - grid->addWidget( new QLabel( "energy_threshold", this ),26, 0 ); - grid->addWidget( energy_threshold_edit, 26, 0+1 ); - grid->addWidget( new QLabel( "bend_lambda", this ),27, 0 ); - grid->addWidget( bend_lambda_edit, 27, 0+1 ); - grid->addWidget( new QLabel( "alignment_lambda", this ),28, 0 ); - grid->addWidget( alignment_lambda_edit, 28, 0+1 ); - grid->addWidget( new QLabel( "rel_cell_div_threshold", this ),29, 0 ); - grid->addWidget( rel_cell_div_threshold_edit, 29, 0+1 ); - grid->addWidget( new QLabel( "rel_perimeter_stiffness", this ),3, 2 ); - grid->addWidget( rel_perimeter_stiffness_edit, 3, 2+1 ); - grid->addWidget( new QLabel( "collapse_node_threshold", this ),4, 2 ); - grid->addWidget( collapse_node_threshold_edit, 4, 2+1 ); - grid->addWidget( new QLabel( "morphogen_div_threshold", this ),5, 2 ); - grid->addWidget( morphogen_div_threshold_edit, 5, 2+1 ); - grid->addWidget( new QLabel( "morphogen_expansion_threshold", this ),6, 2 ); - grid->addWidget( morphogen_expansion_threshold_edit, 6, 2+1 ); - grid->addWidget( new QLabel( "copy_wall", this ),7, 2 ); - grid->addWidget( copy_wall_edit, 7, 2+1 ); - grid->addWidget( new QLabel( "", this), 8, 2, 1, 2 ); - grid->addWidget( new QLabel( " Auxin transport and PIN1 dynamics", this), 9, 2, 1, 2 ); - grid->addWidget( new QLabel( "source", this ),10, 2 ); - grid->addWidget( source_edit, 10, 2+1 ); - grid->addWidget( new QLabel( "D", this ),11, 2 ); - grid->addWidget( D_edit, 11, 2+1 ); - grid->addWidget( new QLabel( "initval", this ),12, 2 ); - grid->addWidget( initval_edit, 12, 2+1 ); - grid->addWidget( new QLabel( "k1", this ),13, 2 ); - grid->addWidget( k1_edit, 13, 2+1 ); - grid->addWidget( new QLabel( "k2", this ),14, 2 ); - grid->addWidget( k2_edit, 14, 2+1 ); - grid->addWidget( new QLabel( "r", this ),15, 2 ); - grid->addWidget( r_edit, 15, 2+1 ); - grid->addWidget( new QLabel( "kr", this ),16, 2 ); - grid->addWidget( kr_edit, 16, 2+1 ); - grid->addWidget( new QLabel( "km", this ),17, 2 ); - grid->addWidget( km_edit, 17, 2+1 ); - grid->addWidget( new QLabel( "Pi_tot", this ),18, 2 ); - grid->addWidget( Pi_tot_edit, 18, 2+1 ); - grid->addWidget( new QLabel( "transport", this ),19, 2 ); - grid->addWidget( transport_edit, 19, 2+1 ); - grid->addWidget( new QLabel( "ka", this ),20, 2 ); - grid->addWidget( ka_edit, 20, 2+1 ); - grid->addWidget( new QLabel( "pin_prod", this ),21, 2 ); - grid->addWidget( pin_prod_edit, 21, 2+1 ); - grid->addWidget( new QLabel( "pin_prod_in_epidermis", this ),22, 2 ); - grid->addWidget( pin_prod_in_epidermis_edit, 22, 2+1 ); - grid->addWidget( new QLabel( "pin_breakdown", this ),23, 2 ); - grid->addWidget( pin_breakdown_edit, 23, 2+1 ); - grid->addWidget( new QLabel( "pin_breakdown_internal", this ),24, 2 ); - grid->addWidget( pin_breakdown_internal_edit, 24, 2+1 ); - grid->addWidget( new QLabel( "aux1prod", this ),25, 2 ); - grid->addWidget( aux1prod_edit, 25, 2+1 ); - grid->addWidget( new QLabel( "aux1prodmeso", this ),26, 2 ); - grid->addWidget( aux1prodmeso_edit, 26, 2+1 ); - grid->addWidget( new QLabel( "aux1decay", this ),27, 2 ); - grid->addWidget( aux1decay_edit, 27, 2+1 ); - grid->addWidget( new QLabel( "aux1decaymeso", this ),28, 2 ); - grid->addWidget( aux1decaymeso_edit, 28, 2+1 ); - grid->addWidget( new QLabel( "aux1transport", this ),29, 2 ); - grid->addWidget( aux1transport_edit, 29, 2+1 ); - grid->addWidget( new QLabel( "aux_cons", this ),3, 4 ); - grid->addWidget( aux_cons_edit, 3, 4+1 ); - grid->addWidget( new QLabel( "aux_breakdown", this ),4, 4 ); - grid->addWidget( aux_breakdown_edit, 4, 4+1 ); - grid->addWidget( new QLabel( "kaux1", this ),5, 4 ); - grid->addWidget( kaux1_edit, 5, 4+1 ); - grid->addWidget( new QLabel( "kap", this ),6, 4 ); - grid->addWidget( kap_edit, 6, 4+1 ); - grid->addWidget( new QLabel( "leaf_tip_source", this ),7, 4 ); - grid->addWidget( leaf_tip_source_edit, 7, 4+1 ); - grid->addWidget( new QLabel( "sam_efflux", this ),8, 4 ); - grid->addWidget( sam_efflux_edit, 8, 4+1 ); - grid->addWidget( new QLabel( "sam_auxin", this ),9, 4 ); - grid->addWidget( sam_auxin_edit, 9, 4+1 ); - grid->addWidget( new QLabel( "sam_auxin_breakdown", this ),10, 4 ); - grid->addWidget( sam_auxin_breakdown_edit, 10, 4+1 ); - grid->addWidget( new QLabel( "van3prod", this ),11, 4 ); - grid->addWidget( van3prod_edit, 11, 4+1 ); - grid->addWidget( new QLabel( "van3autokat", this ),12, 4 ); - grid->addWidget( van3autokat_edit, 12, 4+1 ); - grid->addWidget( new QLabel( "van3sat", this ),13, 4 ); - grid->addWidget( van3sat_edit, 13, 4+1 ); - grid->addWidget( new QLabel( "k2van3", this ),14, 4 ); - grid->addWidget( k2van3_edit, 14, 4+1 ); - grid->addWidget( new QLabel( "", this), 15, 4, 1, 2 ); - grid->addWidget( new QLabel( " Integration parameters", this), 16, 4, 1, 2 ); - grid->addWidget( new QLabel( "dt", this ),17, 4 ); - grid->addWidget( dt_edit, 17, 4+1 ); - grid->addWidget( new QLabel( "rd_dt", this ),18, 4 ); - grid->addWidget( rd_dt_edit, 18, 4+1 ); - grid->addWidget( new QLabel( "datadir", this ),19, 4 ); - grid->addWidget( datadir_edit, 19, 4+1 ); - grid->addWidget( new QLabel( "movie", this ),20, 4 ); - grid->addWidget( movie_edit, 20, 4+1 ); - grid->addWidget( new QLabel( "nit", this ),21, 4 ); - grid->addWidget( nit_edit, 21, 4+1 ); - grid->addWidget( new QLabel( "maxt", this ),22, 4 ); - grid->addWidget( maxt_edit, 22, 4+1 ); - grid->addWidget( new QLabel( "storage_stride", this ),23, 4 ); - grid->addWidget( storage_stride_edit, 23, 4+1 ); - grid->addWidget( new QLabel( "xml_storage_stride", this ),24, 4 ); - grid->addWidget( xml_storage_stride_edit, 24, 4+1 ); - grid->addWidget( new QLabel( "rseed", this ),25, 4 ); - grid->addWidget( rseed_edit, 25, 4+1 ); - grid->addWidget( new QLabel( "", this), 26, 4, 1, 2 ); - grid->addWidget( new QLabel( " Meinhardt leaf venation model", this), 27, 4, 1, 2 ); - grid->addWidget( new QLabel( "constituous_expansion_limit", this ),28, 4 ); - grid->addWidget( constituous_expansion_limit_edit, 28, 4+1 ); - grid->addWidget( new QLabel( "vessel_inh_level", this ),29, 4 ); - grid->addWidget( vessel_inh_level_edit, 29, 4+1 ); - grid->addWidget( new QLabel( "vessel_expansion_rate", this ),3, 6 ); - grid->addWidget( vessel_expansion_rate_edit, 3, 6+1 ); - grid->addWidget( new QLabel( "d", this ),4, 6 ); - grid->addWidget( d_edit, 4, 6+1 ); - grid->addWidget( new QLabel( "e", this ),5, 6 ); - grid->addWidget( e_edit, 5, 6+1 ); - grid->addWidget( new QLabel( "f", this ),6, 6 ); - grid->addWidget( f_edit, 6, 6+1 ); - grid->addWidget( new QLabel( "c", this ),7, 6 ); - grid->addWidget( c_edit, 7, 6+1 ); - grid->addWidget( new QLabel( "mu", this ),8, 6 ); - grid->addWidget( mu_edit, 8, 6+1 ); - grid->addWidget( new QLabel( "nu", this ),9, 6 ); - grid->addWidget( nu_edit, 9, 6+1 ); - grid->addWidget( new QLabel( "rho0", this ),10, 6 ); - grid->addWidget( rho0_edit, 10, 6+1 ); - grid->addWidget( new QLabel( "rho1", this ),11, 6 ); - grid->addWidget( rho1_edit, 11, 6+1 ); - grid->addWidget( new QLabel( "c0", this ),12, 6 ); - grid->addWidget( c0_edit, 12, 6+1 ); - grid->addWidget( new QLabel( "gamma", this ),13, 6 ); - grid->addWidget( gamma_edit, 13, 6+1 ); - grid->addWidget( new QLabel( "eps", this ),14, 6 ); - grid->addWidget( eps_edit, 14, 6+1 ); - grid->addWidget( new QLabel( "", this), 15, 6, 1, 2 ); - grid->addWidget( new QLabel( " User-defined parameters", this), 16, 6, 1, 2 ); - grid->addWidget( new QLabel( "k", this ),17, 6 ); - grid->addWidget( k_edit, 17, 6+1 ); - grid->addWidget( new QLabel( "i1", this ),18, 6 ); - grid->addWidget( i1_edit, 18, 6+1 ); - grid->addWidget( new QLabel( "i2", this ),19, 6 ); - grid->addWidget( i2_edit, 19, 6+1 ); - grid->addWidget( new QLabel( "i3", this ),20, 6 ); - grid->addWidget( i3_edit, 20, 6+1 ); - grid->addWidget( new QLabel( "i4", this ),21, 6 ); - grid->addWidget( i4_edit, 21, 6+1 ); - grid->addWidget( new QLabel( "i5", this ),22, 6 ); - grid->addWidget( i5_edit, 22, 6+1 ); - grid->addWidget( new QLabel( "s1", this ),23, 6 ); - grid->addWidget( s1_edit, 23, 6+1 ); - grid->addWidget( new QLabel( "s2", this ),24, 6 ); - grid->addWidget( s2_edit, 24, 6+1 ); - grid->addWidget( new QLabel( "s3", this ),25, 6 ); - grid->addWidget( s3_edit, 25, 6+1 ); - grid->addWidget( new QLabel( "b1", this ),26, 6 ); - grid->addWidget( b1_edit, 26, 6+1 ); - grid->addWidget( new QLabel( "b2", this ),27, 6 ); - grid->addWidget( b2_edit, 27, 6+1 ); - grid->addWidget( new QLabel( "b3", this ),28, 6 ); - grid->addWidget( b3_edit, 28, 6+1 ); - grid->addWidget( new QLabel( "b4", this ),29, 6 ); - grid->addWidget( b4_edit, 29, 6+1 ); - grid->addWidget( new QLabel( "dir1", this ),3, 8 ); - grid->addWidget( dir1_edit, 3, 8+1 ); - grid->addWidget( new QLabel( "dir2", this ),4, 8 ); - grid->addWidget( dir2_edit, 4, 8+1 ); - grid->addWidget( new QLabel( "export_interval", this ),5, 8 ); - grid->addWidget( export_interval_edit, 5, 8+1 ); - grid->addWidget( new QLabel( "export_fn_prefix", this ),6, 8 ); - grid->addWidget( export_fn_prefix_edit, 6, 8+1 ); + grid->addWidget( new QLabel( " Data Export", this), 14, 0, 1, 2 ); + grid->addWidget( new QLabel( "export_interval", this ),15, 0 ); + grid->addWidget( export_interval_edit, 15, 0+1 ); + grid->addWidget( new QLabel( "export_fn_prefix", this ),16, 0 ); + grid->addWidget( export_fn_prefix_edit, 16, 0+1 ); + grid->addWidget( new QLabel( "storage_stride", this ),17, 0 ); + grid->addWidget( storage_stride_edit, 17, 0+1 ); + grid->addWidget( new QLabel( "xml_storage_stride", this ),18, 0 ); + grid->addWidget( xml_storage_stride_edit, 18, 0+1 ); + grid->addWidget( new QLabel( "datadir", this ),19, 0 ); + grid->addWidget( datadir_edit, 19, 0+1 ); + grid->addWidget( new QLabel( "", this), 20, 0, 1, 2 ); + grid->addWidget( new QLabel( " Cell mechanics", this), 21, 0, 1, 2 ); + grid->addWidget( new QLabel( "T", this ),22, 0 ); + grid->addWidget( T_edit, 22, 0+1 ); + grid->addWidget( new QLabel( "lambda_length", this ),23, 0 ); + grid->addWidget( lambda_length_edit, 23, 0+1 ); + grid->addWidget( new QLabel( "yielding_threshold", this ),24, 0 ); + grid->addWidget( yielding_threshold_edit, 24, 0+1 ); + grid->addWidget( new QLabel( "lambda_celllength", this ),25, 0 ); + grid->addWidget( lambda_celllength_edit, 25, 0+1 ); + grid->addWidget( new QLabel( "target_length", this ),26, 0 ); + grid->addWidget( target_length_edit, 26, 0+1 ); + grid->addWidget( new QLabel( "cell_expansion_rate", this ),27, 0 ); + grid->addWidget( cell_expansion_rate_edit, 27, 0+1 ); + grid->addWidget( new QLabel( "cell_div_expansion_rate", this ),28, 0 ); + grid->addWidget( cell_div_expansion_rate_edit, 28, 0+1 ); + grid->addWidget( new QLabel( "auxin_dependent_growth", this ),29, 0 ); + grid->addWidget( auxin_dependent_growth_edit, 29, 0+1 ); + grid->addWidget( new QLabel( "ode_accuracy", this ),3, 2 ); + grid->addWidget( ode_accuracy_edit, 3, 2+1 ); + grid->addWidget( new QLabel( "mc_stepsize", this ),4, 2 ); + grid->addWidget( mc_stepsize_edit, 4, 2+1 ); + grid->addWidget( new QLabel( "mc_cell_stepsize", this ),5, 2 ); + grid->addWidget( mc_cell_stepsize_edit, 5, 2+1 ); + grid->addWidget( new QLabel( "energy_threshold", this ),6, 2 ); + grid->addWidget( energy_threshold_edit, 6, 2+1 ); + grid->addWidget( new QLabel( "bend_lambda", this ),7, 2 ); + grid->addWidget( bend_lambda_edit, 7, 2+1 ); + grid->addWidget( new QLabel( "alignment_lambda", this ),8, 2 ); + grid->addWidget( alignment_lambda_edit, 8, 2+1 ); + grid->addWidget( new QLabel( "rel_cell_div_threshold", this ),9, 2 ); + grid->addWidget( rel_cell_div_threshold_edit, 9, 2+1 ); + grid->addWidget( new QLabel( "rel_perimeter_stiffness", this ),10, 2 ); + grid->addWidget( rel_perimeter_stiffness_edit, 10, 2+1 ); + grid->addWidget( new QLabel( "collapse_node_threshold", this ),11, 2 ); + grid->addWidget( collapse_node_threshold_edit, 11, 2+1 ); + grid->addWidget( new QLabel( "morphogen_div_threshold", this ),12, 2 ); + grid->addWidget( morphogen_div_threshold_edit, 12, 2+1 ); + grid->addWidget( new QLabel( "morphogen_expansion_threshold", this ),13, 2 ); + grid->addWidget( morphogen_expansion_threshold_edit, 13, 2+1 ); + grid->addWidget( new QLabel( "copy_wall", this ),14, 2 ); + grid->addWidget( copy_wall_edit, 14, 2+1 ); + grid->addWidget( new QLabel( "", this), 15, 2, 1, 2 ); + grid->addWidget( new QLabel( " Auxin transport and PIN1 dynamics", this), 16, 2, 1, 2 ); + grid->addWidget( new QLabel( "source", this ),17, 2 ); + grid->addWidget( source_edit, 17, 2+1 ); + grid->addWidget( new QLabel( "D", this ),18, 2 ); + grid->addWidget( D_edit, 18, 2+1 ); + grid->addWidget( new QLabel( "initval", this ),19, 2 ); + grid->addWidget( initval_edit, 19, 2+1 ); + grid->addWidget( new QLabel( "k1", this ),20, 2 ); + grid->addWidget( k1_edit, 20, 2+1 ); + grid->addWidget( new QLabel( "k2", this ),21, 2 ); + grid->addWidget( k2_edit, 21, 2+1 ); + grid->addWidget( new QLabel( "r", this ),22, 2 ); + grid->addWidget( r_edit, 22, 2+1 ); + grid->addWidget( new QLabel( "kr", this ),23, 2 ); + grid->addWidget( kr_edit, 23, 2+1 ); + grid->addWidget( new QLabel( "km", this ),24, 2 ); + grid->addWidget( km_edit, 24, 2+1 ); + grid->addWidget( new QLabel( "Pi_tot", this ),25, 2 ); + grid->addWidget( Pi_tot_edit, 25, 2+1 ); + grid->addWidget( new QLabel( "transport", this ),26, 2 ); + grid->addWidget( transport_edit, 26, 2+1 ); + grid->addWidget( new QLabel( "ka", this ),27, 2 ); + grid->addWidget( ka_edit, 27, 2+1 ); + grid->addWidget( new QLabel( "pin_prod", this ),28, 2 ); + grid->addWidget( pin_prod_edit, 28, 2+1 ); + grid->addWidget( new QLabel( "pin_prod_in_epidermis", this ),29, 2 ); + grid->addWidget( pin_prod_in_epidermis_edit, 29, 2+1 ); + grid->addWidget( new QLabel( "pin_breakdown", this ),3, 4 ); + grid->addWidget( pin_breakdown_edit, 3, 4+1 ); + grid->addWidget( new QLabel( "pin_breakdown_internal", this ),4, 4 ); + grid->addWidget( pin_breakdown_internal_edit, 4, 4+1 ); + grid->addWidget( new QLabel( "aux1prod", this ),5, 4 ); + grid->addWidget( aux1prod_edit, 5, 4+1 ); + grid->addWidget( new QLabel( "aux1prodmeso", this ),6, 4 ); + grid->addWidget( aux1prodmeso_edit, 6, 4+1 ); + grid->addWidget( new QLabel( "aux1decay", this ),7, 4 ); + grid->addWidget( aux1decay_edit, 7, 4+1 ); + grid->addWidget( new QLabel( "aux1decaymeso", this ),8, 4 ); + grid->addWidget( aux1decaymeso_edit, 8, 4+1 ); + grid->addWidget( new QLabel( "aux1transport", this ),9, 4 ); + grid->addWidget( aux1transport_edit, 9, 4+1 ); + grid->addWidget( new QLabel( "aux_cons", this ),10, 4 ); + grid->addWidget( aux_cons_edit, 10, 4+1 ); + grid->addWidget( new QLabel( "aux_breakdown", this ),11, 4 ); + grid->addWidget( aux_breakdown_edit, 11, 4+1 ); + grid->addWidget( new QLabel( "kaux1", this ),12, 4 ); + grid->addWidget( kaux1_edit, 12, 4+1 ); + grid->addWidget( new QLabel( "kap", this ),13, 4 ); + grid->addWidget( kap_edit, 13, 4+1 ); + grid->addWidget( new QLabel( "leaf_tip_source", this ),14, 4 ); + grid->addWidget( leaf_tip_source_edit, 14, 4+1 ); + grid->addWidget( new QLabel( "sam_efflux", this ),15, 4 ); + grid->addWidget( sam_efflux_edit, 15, 4+1 ); + grid->addWidget( new QLabel( "sam_auxin", this ),16, 4 ); + grid->addWidget( sam_auxin_edit, 16, 4+1 ); + grid->addWidget( new QLabel( "sam_auxin_breakdown", this ),17, 4 ); + grid->addWidget( sam_auxin_breakdown_edit, 17, 4+1 ); + grid->addWidget( new QLabel( "van3prod", this ),18, 4 ); + grid->addWidget( van3prod_edit, 18, 4+1 ); + grid->addWidget( new QLabel( "van3autokat", this ),19, 4 ); + grid->addWidget( van3autokat_edit, 19, 4+1 ); + grid->addWidget( new QLabel( "van3sat", this ),20, 4 ); + grid->addWidget( van3sat_edit, 20, 4+1 ); + grid->addWidget( new QLabel( "k2van3", this ),21, 4 ); + grid->addWidget( k2van3_edit, 21, 4+1 ); + grid->addWidget( new QLabel( "", this), 22, 4, 1, 2 ); + grid->addWidget( new QLabel( " Integration parameters", this), 23, 4, 1, 2 ); + grid->addWidget( new QLabel( "dt", this ),24, 4 ); + grid->addWidget( dt_edit, 24, 4+1 ); + grid->addWidget( new QLabel( "rd_dt", this ),25, 4 ); + grid->addWidget( rd_dt_edit, 25, 4+1 ); + grid->addWidget( new QLabel( "movie", this ),26, 4 ); + grid->addWidget( movie_edit, 26, 4+1 ); + grid->addWidget( new QLabel( "nit", this ),27, 4 ); + grid->addWidget( nit_edit, 27, 4+1 ); + grid->addWidget( new QLabel( "maxt", this ),28, 4 ); + grid->addWidget( maxt_edit, 28, 4+1 ); + grid->addWidget( new QLabel( "rseed", this ),29, 4 ); + grid->addWidget( rseed_edit, 29, 4+1 ); + grid->addWidget( new QLabel( "", this), 3, 6, 1, 2 ); + grid->addWidget( new QLabel( " Meinhardt leaf venation model", this), 4, 6, 1, 2 ); + grid->addWidget( new QLabel( "constituous_expansion_limit", this ),5, 6 ); + grid->addWidget( constituous_expansion_limit_edit, 5, 6+1 ); + grid->addWidget( new QLabel( "vessel_inh_level", this ),6, 6 ); + grid->addWidget( vessel_inh_level_edit, 6, 6+1 ); + grid->addWidget( new QLabel( "vessel_expansion_rate", this ),7, 6 ); + grid->addWidget( vessel_expansion_rate_edit, 7, 6+1 ); + grid->addWidget( new QLabel( "d", this ),8, 6 ); + grid->addWidget( d_edit, 8, 6+1 ); + grid->addWidget( new QLabel( "e", this ),9, 6 ); + grid->addWidget( e_edit, 9, 6+1 ); + grid->addWidget( new QLabel( "f", this ),10, 6 ); + grid->addWidget( f_edit, 10, 6+1 ); + grid->addWidget( new QLabel( "c", this ),11, 6 ); + grid->addWidget( c_edit, 11, 6+1 ); + grid->addWidget( new QLabel( "mu", this ),12, 6 ); + grid->addWidget( mu_edit, 12, 6+1 ); + grid->addWidget( new QLabel( "nu", this ),13, 6 ); + grid->addWidget( nu_edit, 13, 6+1 ); + grid->addWidget( new QLabel( "rho0", this ),14, 6 ); + grid->addWidget( rho0_edit, 14, 6+1 ); + grid->addWidget( new QLabel( "rho1", this ),15, 6 ); + grid->addWidget( rho1_edit, 15, 6+1 ); + grid->addWidget( new QLabel( "c0", this ),16, 6 ); + grid->addWidget( c0_edit, 16, 6+1 ); + grid->addWidget( new QLabel( "gamma", this ),17, 6 ); + grid->addWidget( gamma_edit, 17, 6+1 ); + grid->addWidget( new QLabel( "eps", this ),18, 6 ); + grid->addWidget( eps_edit, 18, 6+1 ); + grid->addWidget( new QLabel( "", this), 19, 6, 1, 2 ); + grid->addWidget( new QLabel( " User-defined parameters", this), 20, 6, 1, 2 ); + grid->addWidget( new QLabel( "k", this ),21, 6 ); + grid->addWidget( k_edit, 21, 6+1 ); + grid->addWidget( new QLabel( "i1", this ),22, 6 ); + grid->addWidget( i1_edit, 22, 6+1 ); + grid->addWidget( new QLabel( "i2", this ),23, 6 ); + grid->addWidget( i2_edit, 23, 6+1 ); + grid->addWidget( new QLabel( "i3", this ),24, 6 ); + grid->addWidget( i3_edit, 24, 6+1 ); + grid->addWidget( new QLabel( "i4", this ),25, 6 ); + grid->addWidget( i4_edit, 25, 6+1 ); + grid->addWidget( new QLabel( "i5", this ),26, 6 ); + grid->addWidget( i5_edit, 26, 6+1 ); + grid->addWidget( new QLabel( "s1", this ),27, 6 ); + grid->addWidget( s1_edit, 27, 6+1 ); + grid->addWidget( new QLabel( "s2", this ),28, 6 ); + grid->addWidget( s2_edit, 28, 6+1 ); + grid->addWidget( new QLabel( "s3", this ),29, 6 ); + grid->addWidget( s3_edit, 29, 6+1 ); + grid->addWidget( new QLabel( "b1", this ),3, 8 ); + grid->addWidget( b1_edit, 3, 8+1 ); + grid->addWidget( new QLabel( "b2", this ),4, 8 ); + grid->addWidget( b2_edit, 4, 8+1 ); + grid->addWidget( new QLabel( "b3", this ),5, 8 ); + grid->addWidget( b3_edit, 5, 8+1 ); + grid->addWidget( new QLabel( "b4", this ),6, 8 ); + grid->addWidget( b4_edit, 6, 8+1 ); + grid->addWidget( new QLabel( "dir1", this ),7, 8 ); + grid->addWidget( dir1_edit, 7, 8+1 ); + grid->addWidget( new QLabel( "dir2", this ),8, 8 ); + grid->addWidget( dir2_edit, 8, 8+1 ); QPushButton *pb = new QPushButton( "&Write", this ); grid->addWidget(pb, 31, 6 ); connect( pb, SIGNAL( clicked() ), this, SLOT( write() ) ); @@ -383,6 +385,11 @@ delete node_mag_edit; delete outlinewidth_edit; delete cell_outline_color_edit; delete resize_stride_edit; +delete export_interval_edit; +delete export_fn_prefix_edit; +delete storage_stride_edit; +delete xml_storage_stride_edit; +delete datadir_edit; delete T_edit; delete lambda_length_edit; delete yielding_threshold_edit; @@ -437,12 +444,9 @@ 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; @@ -473,8 +477,6 @@ delete b3_edit; delete b4_edit; delete dir1_edit; delete dir2_edit; -delete export_interval_edit; -delete export_fn_prefix_edit; } void ParameterDialog::write(void) { @@ -490,6 +492,11 @@ QString tmpval; par.outlinewidth = outlinewidth_edit->text().toDouble(); par.cell_outline_color = strdup((const char *)cell_outline_color_edit->text()); par.resize_stride = resize_stride_edit->text().toInt(); + par.export_interval = export_interval_edit->text().toInt(); + par.export_fn_prefix = strdup((const char *)export_fn_prefix_edit->text()); + par.storage_stride = storage_stride_edit->text().toInt(); + par.xml_storage_stride = xml_storage_stride_edit->text().toInt(); + par.datadir = strdup((const char *)datadir_edit->text()); par.T = T_edit->text().toDouble(); par.lambda_length = lambda_length_edit->text().toDouble(); par.yielding_threshold = yielding_threshold_edit->text().toDouble(); @@ -614,7 +621,6 @@ QString tmpval; par.k2van3 = k2van3_edit->text().toDouble(); par.dt = dt_edit->text().toDouble(); par.rd_dt = rd_dt_edit->text().toDouble(); - par.datadir = strdup((const char *)datadir_edit->text()); tmpval = movie_edit->text().stripWhiteSpace(); if (tmpval == "true" || tmpval == "yes" ) par.movie = true; else if (tmpval == "false" || tmpval == "no") par.movie = false; @@ -624,8 +630,6 @@ QString tmpval; } par.nit = nit_edit->text().toInt(); par.maxt = maxt_edit->text().toDouble(); - par.storage_stride = storage_stride_edit->text().toInt(); - par.xml_storage_stride = xml_storage_stride_edit->text().toInt(); par.rseed = rseed_edit->text().toInt(); par.constituous_expansion_limit = constituous_expansion_limit_edit->text().toInt(); par.vessel_inh_level = vessel_inh_level_edit->text().toDouble(); @@ -709,8 +713,6 @@ QString tmpval; } par.dir1 = strdup((const char *)dir1_edit->text()); par.dir2 = strdup((const char *)dir2_edit->text()); - par.export_interval = export_interval_edit->text().toInt(); - par.export_fn_prefix = strdup((const char *)export_fn_prefix_edit->text()); Reset(); } @@ -725,6 +727,11 @@ void ParameterDialog::Reset(void) { outlinewidth_edit->setText( QString("%1").arg(par.outlinewidth) ); cell_outline_color_edit->setText( QString("%1").arg(par.cell_outline_color) ); resize_stride_edit->setText( QString("%1").arg(par.resize_stride) ); + export_interval_edit->setText( QString("%1").arg(par.export_interval) ); + export_fn_prefix_edit->setText( QString("%1").arg(par.export_fn_prefix) ); + storage_stride_edit->setText( QString("%1").arg(par.storage_stride) ); + xml_storage_stride_edit->setText( QString("%1").arg(par.xml_storage_stride) ); + datadir_edit->setText( QString("%1").arg(par.datadir) ); T_edit->setText( QString("%1").arg(par.T) ); lambda_length_edit->setText( QString("%1").arg(par.lambda_length) ); yielding_threshold_edit->setText( QString("%1").arg(par.yielding_threshold) ); @@ -783,12 +790,9 @@ void ParameterDialog::Reset(void) { k2van3_edit->setText( QString("%1").arg(par.k2van3) ); dt_edit->setText( QString("%1").arg(par.dt) ); rd_dt_edit->setText( QString("%1").arg(par.rd_dt) ); - datadir_edit->setText( QString("%1").arg(par.datadir) ); movie_edit->setText( QString("%1").arg(sbool(par.movie))); nit_edit->setText( QString("%1").arg(par.nit) ); maxt_edit->setText( QString("%1").arg(par.maxt) ); - storage_stride_edit->setText( QString("%1").arg(par.storage_stride) ); - xml_storage_stride_edit->setText( QString("%1").arg(par.xml_storage_stride) ); rseed_edit->setText( QString("%1").arg(par.rseed) ); constituous_expansion_limit_edit->setText( QString("%1").arg(par.constituous_expansion_limit) ); vessel_inh_level_edit->setText( QString("%1").arg(par.vessel_inh_level) ); @@ -821,7 +825,5 @@ void ParameterDialog::Reset(void) { b4_edit->setText( QString("%1").arg(sbool(par.b4))); dir1_edit->setText( QString("%1").arg(par.dir1) ); dir2_edit->setText( QString("%1").arg(par.dir2) ); - export_interval_edit->setText( QString("%1").arg(par.export_interval) ); - export_fn_prefix_edit->setText( QString("%1").arg(par.export_fn_prefix) ); }