Merge pull request #109 from glycojones/fix_tooltip_bug

Fix tooltip bug
glycojones · Dec 14, 2024 · 076cd61 · 076cd61
2 parents 8b5380f + 9bc0588
commit 076cd61
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 16 deletions.
diff --git a/src/privateer/cpp/privateer-lib.cpp b/src/privateer/cpp/privateer-lib.cpp
@@ -2109,7 +2109,7 @@ void privateer::glycanbuilderplot::Plot::write_svg_header_ostringstream   ( std:
        << "     version=\"1.1\"\n"
        << "     width=\"" << get_width() << "\" \n"
        << "     height=\"" << get_height() << "\" \n"
-       << "     viewBox=\"" << get_viewbox() << " \"\n"
+       << "     viewBox=\"" << get_viewbox() << " \"\n>"
 //        << "     preserveAspectRatio=\"xMinYMinXMaxYMax meet\">\n\n"
        << "  <style>\n"
        << "    .my_blue   { fill:" << get_colour ( rootblue, original_colour_scheme ) << " }\n"

diff --git a/src/privateer/cpp/privateer-lib.h b/src/privateer/cpp/privateer-lib.h
@@ -108,17 +108,20 @@ namespace privateer
                 << "<tspan>Detected type: " << sugar.type_of_sugar() << ". </tspan>";
             if ( validation )
             {
-                if ( ( glycan.get_type() == "c-glycan" ) && (sugar.type().trim() == "MAN" ) && (sugar.conformation_name() == "1c4"))
+                if ( glycan.get_type() == "c-glycan" )
                 {
-                    sugar.override_conformation_diag ( true );
-                }
-                if ( sugar.conformation_name() == "4c1" )
-                {
-                    sugar.override_conformation_diag ( false );
-                }
-                if (sugar.type().trim() == "BMA")
-                {
-                    sugar.override_anomer_diag( false );
+                    if ((sugar.type().trim() == "MAN" ) && (sugar.conformation_name() == "1c4"))
+                    {
+                        sugar.override_conformation_diag ( true );
+                    }
+                    if ( sugar.conformation_name() == "4c1" )
+                    {
+                        sugar.override_conformation_diag ( false );
+                    }
+                    if (sugar.type().trim() == "BMA")
+                    {
+                        sugar.override_anomer_diag( false );
+                    }
                 }
                 if ( sugar.ok_with_conformation() && sugar.ok_with_anomer() &&
                      sugar.ok_with_chirality() && sugar.ok_with_puckering() )

diff --git a/webapp/src/wasm/privateer.js b/webapp/src/wasm/privateer.js
diff --git a/webapp/src/wasm/privateer.wasm b/webapp/src/wasm/privateer.wasm