SettingInfo.h (pymol-open-source-2.2.0) | : | SettingInfo.h (pymol-open-source-2.3.0) | ||
---|---|---|---|---|
// vi:sw=2:expandtab | ||||
// clang-format off | ||||
/* | /* | |||
* Setting info table and indices | * Setting info table and indices | |||
* | * | |||
* WARNING: do not delete or change indices since they are used in session objec ts | * WARNING: do not delete or change indices since they are used in session objec ts | |||
* | * | |||
* Include this file exactly twice: | * Include this file exactly twice: | |||
* 1) in Setting.h to define the enum with all cSetting_<name> indices | * 1) in Setting.h to define the enum with all cSetting_<name> indices | |||
* 2) in Setting.cpp with SETTINGINFO_IMPLEMENTATION defined, to have | * 2) in Setting.cpp with SETTINGINFO_IMPLEMENTATION defined, to have | |||
* `SettingInfo` statically defined there | * `SettingInfo` statically defined there | |||
* | * | |||
skipping to change at line 366 | skipping to change at line 368 | |||
scattering factors (unblurred). At resolution of 4.0, they are | scattering factors (unblurred). At resolution of 4.0, they are | |||
blurred 2X, 8.0:4X, and so forth.... */ | blurred 2X, 8.0:4X, and so forth.... */ | |||
REC_f( 271, gaussian_resolution , global , 2.0F ), | REC_f( 271, gaussian_resolution , global , 2.0F ), | |||
REC_f( 272, gaussian_b_floor , global , 0.0F ), | REC_f( 272, gaussian_b_floor , global , 0.0F ), | |||
REC_i( 273, sculpt_nb_interval , ostate , 17 ), | REC_i( 273, sculpt_nb_interval , ostate , 17 ), | |||
REC_f( 274, sculpt_tors_weight , ostate , 0.05F ), | REC_f( 274, sculpt_tors_weight , ostate , 0.05F ), | |||
REC_f( 275, sculpt_tors_tolerance , ostate , 0.05F ), | REC_f( 275, sculpt_tors_tolerance , ostate , 0.05F ), | |||
REC_b( 276, stick_ball , atom , false ), | REC_b( 276, stick_ball , atom , false ), | |||
REC_f( 277, stick_ball_ratio , ostate , 1.0F ), | REC_f( 277, stick_ball_ratio , ostate , 1.0F ), | |||
REC_b( 278, stick_fixed_radius , ostate , false ), | REC_b( 278, stick_fixed_radius , ostate , false ), | |||
REC_f( 279, cartoon_transparency , ostate , 0.0F ), | REC_f( 279, cartoon_transparency , atom , 0.0F ), | |||
REC_b( 280, dash_round_ends , ostate , 1 ), | REC_b( 280, dash_round_ends , ostate , 1 ), | |||
REC_f( 281, h_bond_max_angle , global , 63.0F ), | REC_f( 281, h_bond_max_angle , global , 63.0F ), | |||
REC_f( 282, h_bond_cutoff_center , global , 3.6F ), | REC_f( 282, h_bond_cutoff_center , global , 3.6F ), | |||
REC_f( 283, h_bond_cutoff_edge , global , 3.2F ), | REC_f( 283, h_bond_cutoff_edge , global , 3.2F ), | |||
REC_f( 284, h_bond_power_a , global , 1.6F ), | REC_f( 284, h_bond_power_a , global , 1.6F ), | |||
REC_f( 285, h_bond_power_b , global , 5.0F ), | REC_f( 285, h_bond_power_b , global , 5.0F ), | |||
REC_f( 286, h_bond_cone , global , 180.0F ), | REC_f( 286, h_bond_cone , global , 180.0F ), | |||
REC_f( 287, ss_helix_psi_target , global , -48.0F ), | REC_f( 287, ss_helix_psi_target , global , -48.0F ), | |||
REC_f( 288, ss_helix_psi_include , global , 55.0F ), | REC_f( 288, ss_helix_psi_include , global , 55.0F ), | |||
REC_f( 289, ss_helix_psi_exclude , global , 85.0F ), | REC_f( 289, ss_helix_psi_exclude , global , 85.0F ), | |||
skipping to change at line 816 | skipping to change at line 818 | |||
REC_i( 707, edit_light , global , 1 ), | REC_i( 707, edit_light , global , 1 ), | |||
REC_b( 708, suspend_undo , object , 0 ), | REC_b( 708, suspend_undo , object , 0 ), | |||
REC_i( 709, suspend_undo_atom_count , global , 1000 ), | REC_i( 709, suspend_undo_atom_count , global , 1000 ), | |||
REC_b( 710, suspend_deferred , global , 0 ), | REC_b( 710, suspend_deferred , global , 0 ), | |||
REC_b( 711, pick_surface , ostate , 0 ), | REC_b( 711, pick_surface , ostate , 0 ), | |||
REC_s( 712, bg_image_filename , global , "" ), | REC_s( 712, bg_image_filename , global , "" ), | |||
/* 0 = streched; 1 = centered; 2 = tiled, 3 = centered&repeated */ | /* 0 = streched; 1 = centered; 2 = tiled, 3 = centered&repeated */ | |||
REC_i( 713, bg_image_mode , global , 0, 0, 3 ), | REC_i( 713, bg_image_mode , global , 0, 0, 3 ), | |||
REC_3( 714, bg_image_tilesize , global , 100.F, 100.F , 0.f ), /* XY in pixels, Z unused */ | REC_3( 714, bg_image_tilesize , global , 100.F, 100.F , 0.f ), /* XY in pixels, Z unused */ | |||
REC_b( 715, bg_image_linear , global , 1 ), | REC_b( 715, bg_image_linear , global , 1 ), | |||
REC_s( 716, load_object_props_default , global , "" ), | REC_s( 716, load_object_props_default , global , "*" ), | |||
REC_s( 717, load_atom_props_default , global , "" ), | REC_s( 717, load_atom_props_default , global , "*" ), | |||
REC_3( 718, label_placement_offset , astate , 0.f, 0.f, 0. f ), | REC_3( 718, label_placement_offset , astate , 0.f, 0.f, 0. f ), | |||
REC_b( 719, pdb_conect_nodup , global , 1 ), | REC_b( 719, pdb_conect_nodup , global , 1 ), | |||
REC_b( 720, label_connector , astate , 0 ), | REC_b( 720, label_connector , astate , 0 ), | |||
// 0 - line from target to closest corner/midpoint | // 0 - line from target to closest corner/midpoint | |||
// 1 - line from target to center (stops at bbx) | // 1 - line from target to center (stops at bbx) | |||
// 2 - 2 lines from target to bbx corner (with bend at label_connector_ext_len gth distance */ | // 2 - 2 lines from target to bbx corner (with bend at label_connector_ext_len gth distance */ | |||
// 3 - line from target to closest corner or edge of bounds | // 3 - line from target to closest corner or edge of bounds | |||
// 4 - line from target to closest corner/midpoint | // 4 - line from target to closest corner/midpoint | |||
REC_i( 721, label_connector_mode , astate , 0, 0, 4 ), | REC_i( 721, label_connector_mode , astate , 0, 0, 4 ), | |||
REC_c( 722, label_connector_color , astate , "-6" ), | REC_c( 722, label_connector_color , astate , "-6" ), | |||
skipping to change at line 875 | skipping to change at line 877 | |||
REC_b( 757, cartoon_all_alt , ostate , 0 ), | REC_b( 757, cartoon_all_alt , ostate , 0 ), | |||
REC_i( 758, display_scale_factor , global , 1 ), | REC_i( 758, display_scale_factor , global , 1 ), | |||
REC_b( 759, pick_shading , global , 0 ), | REC_b( 759, pick_shading , global , 0 ), | |||
REC_s( 760, fetch_type_default , global , "cif" ), | REC_s( 760, fetch_type_default , global , "cif" ), | |||
REC_b( 761, editor_auto_measure , global , 1 ), | REC_b( 761, editor_auto_measure , global , 1 ), | |||
REC_b( 762, surface_smooth_edges , ostate , 1 ), | REC_b( 762, surface_smooth_edges , ostate , 1 ), | |||
REC_i( 763, chem_comp_cartn_use , global , 0 ), | REC_i( 763, chem_comp_cartn_use , global , 0 ), | |||
REC_b( 764, colored_feedback , global , 0 ), | REC_b( 764, colored_feedback , global , 0 ), | |||
REC_b( 765, sdf_write_zero_order_bonds , global , 0 ), | REC_b( 765, sdf_write_zero_order_bonds , global , 0 ), | |||
REC_b( 766, cif_metalc_as_zero_order_bonds , global , 1 ), | REC_b( 766, cif_metalc_as_zero_order_bonds , global , 1 ), | |||
REC_i( 767, seq_view_gap_mode , global , 1 ), | ||||
#ifdef SETTINGINFO_IMPLEMENTATION | #ifdef SETTINGINFO_IMPLEMENTATION | |||
#undef SETTINGINFO_IMPLEMENTATION | #undef SETTINGINFO_IMPLEMENTATION | |||
#else | #else | |||
// last item in enum, automatically equals last index + 1 | // last item in enum, automatically equals last index + 1 | |||
cSetting_INIT | cSetting_INIT | |||
#endif | #endif | |||
}; | }; | |||
#undef REC__ | #undef REC__ | |||
End of changes. 4 change blocks. | ||||
3 lines changed or deleted | 6 lines changed or added |