Merge pull request #73 from glycojones/change_svg_colours_to_original

change colour of glycans to original SNFG colours
glycojones · Nov 29, 2023 · b5020e7 · b5020e7
2 parents acb39ce + 7de4f9b
commit b5020e7
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 154 deletions.
diff --git a/emsdk b/emsdk
diff --git a/privateer_webserver_dependencies b/privateer_webserver_dependencies
diff --git a/src/privateer/cpp/privateer-bind.cpp b/src/privateer/cpp/privateer-bind.cpp
@@ -63,7 +63,7 @@ extern "C" std::vector<std::string> read_file(const std::string &file, const std
       wurcs_string = list_of_glycans[i].generate_wurcs();
       // std::cout << wurcs_string << std::endl;
 
-      privateer::glycanbuilderplot::Plot plot(true, false, list_of_glycans[i].get_root_by_name());
+      privateer::glycanbuilderplot::Plot plot(true, true, list_of_glycans[i].get_root_by_name());
       // std::vector<int> viewbox = {0,0,300,300};
       // plot.set_viewbox(viewbox);
       plot.plot_glycan(list_of_glycans[i]);
@@ -168,7 +168,7 @@ extern "C" std::vector<TableEntry> read_file_to_table(const std::string &file, c
 
       privateer::glycanbuilderplot::GlycanErrorCount* err = new privateer::glycanbuilderplot::GlycanErrorCount; 
 
-      privateer::glycanbuilderplot::Plot plot(true, false, list_of_glycans[i].get_root_by_name());
+      privateer::glycanbuilderplot::Plot plot(true, true, list_of_glycans[i].get_root_by_name());
       plot.plot_glycan(list_of_glycans[i], err);
 
       std::ostringstream os;

diff --git a/src/privateer/cpp/privateer-lib.h b/src/privateer/cpp/privateer-lib.h
@@ -801,8 +801,8 @@ namespace privateer
     {
         inline std::string carbname_of ( std::string name ) { return clipper::data::carbname_of ( name ); }
         inline bool found_in_database ( std::string name ) { return clipper::data::found_in_database ( name ); }
-        std::string get_annotated_glycans ( std::string pdb_filename, bool original_colour_scheme = false, std::string expression_system = "undefined" );
-        std::string get_annotated_glycans_hierarchical ( std::string pdb_filename, bool original_colour_scheme = false, std::string expression_system = "undefined"  );
+        std::string get_annotated_glycans ( std::string pdb_filename, bool original_colour_scheme = true, std::string expression_system = "undefined" );
+        std::string get_annotated_glycans_hierarchical ( std::string pdb_filename, bool original_colour_scheme = true, std::string expression_system = "undefined"  );
         std::string print_wurcs ( std::string pdb_filename, std::string expression_system = "undefined");
         std::string print_node ( const clipper::MiniMol& mmol, const clipper::MGlycan& mg, const clipper::MGlycan::Node& node, const std::string chain, const clipper::MGlycan::Linkage& connection );
         void svg_graphics_demo ( bool original_colour_scheme, bool inverted_background = false );

diff --git a/src/privateer/cpp/pybind11/privateer-ccp4mg.cpp b/src/privateer/cpp/pybind11/privateer-ccp4mg.cpp
diff --git a/webserver/src/wasm/privateer.js b/webserver/src/wasm/privateer.js
diff --git a/webserver/src/wasm/privateer.wasm b/webserver/src/wasm/privateer.wasm