Explicitly turn off PyMOL fancy/cylinder helices

UCLOrengoGroup · Nov 21, 2017 · 9438677 · 9438677
1 parent 3ee80f7
commit 9438677
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 6 deletions.
diff --git a/build-test-data/multi_ssap_superpose_3.90.400.10/3.90.400.10.pml b/build-test-data/multi_ssap_superpose_3.90.400.10/3.90.400.10.pml
@@ -2443,6 +2443,8 @@ set cartoon_oval_length  = 1.02294
 set cartoon_oval_width   = 0.189433
 set cartoon_loop_radius  = 0.182988
 set cartoon_helix_radius = 1.51546
+set cartoon_cylindrical_helices, 0
+set cartoon_fancy_helices, 0
 bg_color white
 color    black
 color black

diff --git a/build-test-data/residue_ids/B4DXN4.single_gradient_colour.pml b/build-test-data/residue_ids/B4DXN4.single_gradient_colour.pml
@@ -1011,6 +1011,8 @@ set cartoon_oval_length  = 1.60688
 set cartoon_oval_width   = 0.297571
 set cartoon_loop_radius  = 0.20975
 set cartoon_helix_radius = 2.38057
+set cartoon_cylindrical_helices, 0
+set cartoon_fancy_helices, 0
 bg_color white
 color    black
 color black

diff --git a/build-test-data/residue_ids/E9PB15.multiple_superposed_models.pml b/build-test-data/residue_ids/E9PB15.multiple_superposed_models.pml
@@ -2712,6 +2712,8 @@ set cartoon_oval_length  = 1.16393
 set cartoon_oval_width   = 0.215543
 set cartoon_loop_radius  = 0.191116
 set cartoon_helix_radius = 1.72434
+set cartoon_cylindrical_helices, 0
+set cartoon_fancy_helices, 0
 bg_color white
 color    black
 color black

diff --git a/build-test-data/residue_ids/Q9HAU8.multiple_superposed_models.pml b/build-test-data/residue_ids/Q9HAU8.multiple_superposed_models.pml
@@ -10082,6 +10082,8 @@ set cartoon_oval_length  = 1.02294
 set cartoon_oval_width   = 0.189433
 set cartoon_loop_radius  = 0.182988
 set cartoon_helix_radius = 1.51546
+set cartoon_cylindrical_helices, 0
+set cartoon_fancy_helices, 0
 bg_color white
 color    black
 color black

diff --git a/source/uni/display/viewer/chimera_viewer.cpp b/source/uni/display/viewer/chimera_viewer.cpp
@@ -376,9 +376,12 @@ void chimera_viewer::do_write_load_pdbs(ostream             &arg_os,
 	arg_os << "set cartoon_oval_length  = " << pymol_tools::pymol_size( 2, 1.35,  100, 0.081,  num_pdbs ) << "\n";
 	arg_os << "set cartoon_oval_width   = " << pymol_tools::pymol_size( 2, 0.25,  100, 0.015,  num_pdbs ) << "\n";
 	arg_os << "set cartoon_loop_radius  = " << pymol_tools::pymol_size( 2, 0.20,  100, 0.036,  num_pdbs ) << "\n";
-	arg_os << "set cartoon_helix_radius = " << pymol_tools::pymol_size( 2, 2.00,  100, 0.120,  num_pdbs ) << "\n";
-	arg_os << "bg_color white\n";
-	arg_os << "color    black\n";
+	arg_os << "set cartoon_helix_radius = " << pymol_tools::pymol_size( 2, 2.00,  100, 0.120,  num_pdbs ) << R"(
+set cartoon_cylindrical_helices, 0
+set cartoon_fancy_helices, 0
+bg_color white
+color    black
+)";
 }
 
 /// \brief TODOCUMENT

diff --git a/source/uni/display/viewer/pymol_viewer.cpp b/source/uni/display/viewer/pymol_viewer.cpp
@@ -380,9 +380,12 @@ void pymol_viewer::do_write_load_pdbs(ostream             &arg_os,            //
 	arg_os << "set cartoon_oval_length  = " << pymol_tools::pymol_size(2, 1.35,  100, 0.081,  num_pdbs) << "\n";
 	arg_os << "set cartoon_oval_width   = " << pymol_tools::pymol_size(2, 0.25,  100, 0.015,  num_pdbs) << "\n";
 	arg_os << "set cartoon_loop_radius  = " << pymol_tools::pymol_size(2, 0.20,  100, 0.036,  num_pdbs) << "\n";
-	arg_os << "set cartoon_helix_radius = " << pymol_tools::pymol_size(2, 2.00,  100, 0.120,  num_pdbs) << "\n";
-	arg_os << "bg_color white\n";
-	arg_os << "color    black\n";
+	arg_os << "set cartoon_helix_radius = " << pymol_tools::pymol_size(2, 2.00,  100, 0.120,  num_pdbs) << R"(
+set cartoon_cylindrical_helices, 0
+set cartoon_fancy_helices, 0
+bg_color white
+color    black
+)";
 }
 
 /// \brief TODOCUMENT