SettingInfo.h (pymol-v1.8.6.0.tar.bz2) | : | SettingInfo.h (pymol-v2.1.0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 146 | skipping to change at line 146 | |||
REC_f( 54, fast_idle , global , 10000.0F ), /* 1/100th of a sec. */ | REC_f( 54, fast_idle , global , 10000.0F ), /* 1/100th of a sec. */ | |||
REC_f( 55, slow_idle , global , 40000.0F ), /* 1/25th of a sec. */ | REC_f( 55, slow_idle , global , 40000.0F ), /* 1/25th of a sec. */ | |||
REC_f( 56, rock_delay , global , 30.0F ), | REC_f( 56, rock_delay , global , 30.0F ), | |||
REC_i( 57, dist_counter , global , 0 ), | REC_i( 57, dist_counter , global , 0 ), | |||
REC_f( 58, dash_length , ostate , 0.15F ), | REC_f( 58, dash_length , ostate , 0.15F ), | |||
REC_f( 59, dash_gap , ostate , 0.45F ), | REC_f( 59, dash_gap , ostate , 0.45F ), | |||
REC_i( 60, auto_zoom , global , -1 ), | REC_i( 60, auto_zoom , global , -1 ), | |||
REC_i( 61, overlay , global , 0 ), | REC_i( 61, overlay , global , 0 ), | |||
REC_b( 62, text , global , 0 ), | REC_b( 62, text , global , 0 ), | |||
REC_i( 63, button_mode , global , 0 ), | REC_i( 63, button_mode , global , 0 ), | |||
REC_b( 64, valence , bond , 0 ), | REC_b( 64, valence , bond , 1 ), | |||
REC_f( 65, nonbonded_size , ostate , 0.25F ), | REC_f( 65, nonbonded_size , ostate , 0.25F ), | |||
REC_c( 66, label_color , atom , "-6" ), | REC_c( 66, label_color , atom , "-6" ), | |||
REC_f( 67, ray_trace_fog , global , -1.0F ), | REC_f( 67, ray_trace_fog , global , -1.0F ), | |||
REC_f( 68, spheroid_scale , ostate , 1.0F ), | REC_f( 68, spheroid_scale , ostate , 1.0F ), | |||
REC_f( 69, ray_trace_fog_start , global , -1.0F ), | REC_f( 69, ray_trace_fog_start , global , -1.0F ), | |||
REC_f( 70, spheroid_smooth , global , 1.1F ), | REC_f( 70, spheroid_smooth , global , 1.1F ), | |||
REC_f( 71, spheroid_fill , global , 1.30F ), | REC_f( 71, spheroid_fill , global , 1.30F ), | |||
REC_b( 72, auto_show_nonbonded , global , 1 ), | REC_b( 72, auto_show_nonbonded , global , 1 ), | |||
REC_b( 73, cache_display , global , 1 ), | REC_b( 73, cache_display , global , 1 ), | |||
REC_f( 74, mesh_radius , ostate , 0.000F ), | REC_f( 74, mesh_radius , ostate , 0.000F ), | |||
skipping to change at line 528 | skipping to change at line 528 | |||
REC_b( 425, rank_assisted_sorts , global , true ), | REC_b( 425, rank_assisted_sorts , global , true ), | |||
REC_i( 426, ribbon_nucleic_acid_mode , ostate , 0 ), | REC_i( 426, ribbon_nucleic_acid_mode , ostate , 0 ), | |||
REC_i( 427, cartoon_ring_mode , ostate , 0 ), | REC_i( 427, cartoon_ring_mode , ostate , 0 ), | |||
REC_f( 428, cartoon_ring_width , ostate , 0.125F ), | REC_f( 428, cartoon_ring_width , ostate , 0.125F ), | |||
REC_c( 429, cartoon_ring_color , ostate , "-1" ), | REC_c( 429, cartoon_ring_color , ostate , "-1" ), | |||
REC_i( 430, cartoon_ring_finder , ostate , 1 ), | REC_i( 430, cartoon_ring_finder , ostate , 1 ), | |||
REC_i( 431, cartoon_tube_cap , ostate , 2 ), | REC_i( 431, cartoon_tube_cap , ostate , 2 ), | |||
REC_i( 432, cartoon_loop_cap , ostate , 1 ), | REC_i( 432, cartoon_loop_cap , ostate , 1 ), | |||
REC_i( 433, nvidia_bugs , global , 0 ), | REC_i( 433, nvidia_bugs , global , 0 ), | |||
REC_f( 434, image_dots_per_inch , global , 0.0F ), | REC_f( 434, image_dots_per_inch , global , 0.0F ), | |||
REC_b( 435, opaque_background , global , 1 ), | REC_b( 435, opaque_background , global , 0 ), | |||
REC_b( 436, draw_frames , global , 0 ), | REC_b( 436, draw_frames , global , 0 ), | |||
REC_b( 437, show_alpha_checker , global , 1 ), | REC_b( 437, show_alpha_checker , global , 1 ), | |||
/* -1: automatic behavior based on implied intent | /* -1: automatic behavior based on implied intent | |||
0: coordinates (pre-1.0 legacy default mode) | 0: coordinates (pre-1.0 legacy default mode) | |||
1: per-object matrices (TTTs: version 1.0 default mode?) | 1: per-object matrices (TTTs: version 1.0 default mode?) | |||
2: per-state matrices (partially implemented) | 2: per-state matrices (partially implemented) | |||
3: per-group matrices (may come in the future) */ | 3: per-group matrices (may come in the future) */ | |||
REC_i( 438, matrix_mode , ostate , -1, -1, 2 ), | REC_i( 438, matrix_mode , ostate , -1, -1, 2 ), | |||
REC_b( 439, editor_auto_origin , global , 1 ), | REC_b( 439, editor_auto_origin , global , 1 ), | |||
REC_s( 440, session_file , global , "" ), | REC_s( 440, session_file , global , "" ), | |||
skipping to change at line 703 | skipping to change at line 703 | |||
REC_i( 595, mesh_grid_max , ostate , 80 ), | REC_i( 595, mesh_grid_max , ostate , 80 ), | |||
REC_i( 596, session_cache_optimize , global , 0 ), | REC_i( 596, session_cache_optimize , global , 0 ), | |||
REC_f( 597, sdof_drag_scale , global , 0.5F ), | REC_f( 597, sdof_drag_scale , global , 0.5F ), | |||
REC_i( 598, scene_buttons_mode , unused , 1 ), | REC_i( 598, scene_buttons_mode , unused , 1 ), | |||
REC_b( 599, scene_buttons , global , 1 ), | REC_b( 599, scene_buttons , global , 1 ), | |||
REC_b( 600, map_auto_expand_sym , object , 1 ), | REC_b( 600, map_auto_expand_sym , object , 1 ), | |||
REC_b( 601, image_copy_always , global , 0 ), | REC_b( 601, image_copy_always , global , 0 ), | |||
REC_i( 602, max_ups , global , 0 ), | REC_i( 602, max_ups , global , 0 ), | |||
REC_i( 603, auto_overlay , global , 0 ), | REC_i( 603, auto_overlay , global , 0 ), | |||
REC_c( 604, stick_ball_color , ostate , "-1" ), | REC_c( 604, stick_ball_color , ostate , "-1" ), | |||
REC_f( 605, stick_h_scale , ostate , 1.0F ), | REC_f( 605, stick_h_scale , ostate , 0.4F ), | |||
REC_f( 606, sculpt_pyra_inv_weight , ostate , 10.0F ), | REC_f( 606, sculpt_pyra_inv_weight , ostate , 10.0F ), | |||
REC_b( 607, keep_alive , global , 0 ), | REC_b( 607, keep_alive , global , 0 ), | |||
REC_i( 608, fit_kabsch , global , 0 ), | REC_i( 608, fit_kabsch , global , 0 ), | |||
REC_f( 609, stereo_dynamic_strength , global , 0.5F ), | REC_f( 609, stereo_dynamic_strength , global , 0.5F ), | |||
REC_b( 610, dynamic_width , global , 1 ), | REC_b( 610, dynamic_width , global , 1 ), | |||
REC_f( 611, dynamic_width_factor , global , 0.06f ), | REC_f( 611, dynamic_width_factor , global , 0.06f ), | |||
REC_f( 612, dynamic_width_min , global , 0.75f ), | REC_f( 612, dynamic_width_min , global , 0.75f ), | |||
REC_f( 613, dynamic_width_max , global , 2.5f ), | REC_f( 613, dynamic_width_max , global , 2.5f ), | |||
REC_i( 614, draw_mode , global , 0 ), | REC_i( 614, draw_mode , global , 0 ), | |||
REC_i( 615, clean_electro_mode , global , 1 ), | REC_i( 615, clean_electro_mode , global , 1 ), | |||
skipping to change at line 852 | skipping to change at line 852 | |||
REC_b( 734, ray_label_connector_flat , astate , 1 ), | REC_b( 734, ray_label_connector_flat , astate , 1 ), | |||
REC_f( 735, dash_transparency , ostate , 0.0f ), | REC_f( 735, dash_transparency , ostate , 0.0f ), | |||
REC_i( 736, pick_labels , ostate , 1 ), | REC_i( 736, pick_labels , ostate , 1 ), | |||
REC_i( 737, label_z_target , astate , 0 ), | REC_i( 737, label_z_target , astate , 0 ), | |||
REC_b( 738, session_embeds_data , global , 1 ), | REC_b( 738, session_embeds_data , global , 1 ), | |||
REC_i( 739, volume_mode , global , 1 ), | REC_i( 739, volume_mode , global , 1 ), | |||
REC_b( 740, trilines , global , 0 ), | REC_b( 740, trilines , global , 0 ), | |||
REC_i( 741, collada_export_lighting , global , 0 ), | REC_i( 741, collada_export_lighting , global , 0 ), | |||
REC_i( 742, collada_geometry_mode , global , 0 ), | REC_i( 742, collada_geometry_mode , global , 0 ), | |||
REC_b( 743, precomputed_lighting , global , 0 ), | REC_b( 743, precomputed_lighting , global , 0 ), | |||
REC_b( 744, chromadepth , global , 0 ), | REC_i( 744, chromadepth , global , 0 ), | |||
REC_f( 745, pse_export_version , global , 0.f ), | REC_f( 745, pse_export_version , global , 0.f ), | |||
REC_b( 746, cif_use_auth , global , 1 ), | REC_b( 746, cif_use_auth , global , 1 ), | |||
REC_s( 747, assembly , global , "" ), | REC_s( 747, assembly , global , "" ), | |||
REC_b( 748, cif_keepinmemory , global , 0 ), | REC_b( 748, cif_keepinmemory , global , 0 ), | |||
REC_b( 749, pse_binary_dump , global , 0 ), | REC_b( 749, pse_binary_dump , global , 0 ), | |||
REC_i( 750, cartoon_gap_cutoff , ostate , 0 ), | REC_i( 750, cartoon_gap_cutoff , ostate , 10 ), | |||
REC_b( 751, ignore_case_chain , global , 0 ), | REC_b( 751, ignore_case_chain , global , 0 ), | |||
REC_f( 752, valence_zero_scale , ostate , 0.2f ), | REC_f( 752, valence_zero_scale , ostate , 0.2f ), | |||
REC_i( 753, valence_zero_mode , ostate , 1, 0, 2 ), / / 0: skip, 1: dashed, 2: solid | REC_i( 753, valence_zero_mode , ostate , 1, 0, 2 ), / / 0: skip, 1: dashed, 2: solid | |||
REC_i( 754, auto_show_classified , global , 0, -1, 3 ), // -1: auto, 0: off, 1: as, 2: show, 3: simple | REC_i( 754, auto_show_classified , global , -1, -1, 3 ), // -1: auto, 0: off, 1: as, 2: show, 3: simple | |||
REC_b( 755, collada_background_box , global , 0 ), | REC_b( 755, collada_background_box , global , 0 ), | |||
REC_b( 756, pick32bit , unused , 1 ), | REC_b( 756, pick32bit , unused , 1 ), | |||
REC_b( 757, cartoon_all_alt , ostate , 0 ), | REC_b( 757, cartoon_all_alt , ostate , 0 ), | |||
REC_i( 758, display_scale_factor , unused , 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 , 0 ), | REC_b( 762, surface_smooth_edges , ostate , 1 ), | |||
REC_i( 763, chem_comp_cartn_use , global , 0 ), | ||||
REC_b( 764, colored_feedback , global , 0 ), | ||||
#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. 8 change blocks. | ||||
8 lines changed or deleted | 10 lines changed or added |