Fix some issues on the decay chain diagram.

The double-clicking on a nuclide to show its decay products no longer worked, so this was replaced with a link that can be clicked - its a bit cleaner anyway.
Fixed decay chart options layout being a bit messed up.
Fixed sending translated string to the JS - before the strings were not properly escaped, so would cause JS errors if they had a single quote character.
Improved translating the decay diagram string to better take into account translations having the nuclide name at different locations within the sentence than in English.

Author: wcjohns

InterSpec_resources/DecayChainChart.css

@@ -104,6 +104,16 @@ rect.DecayChartNuc.MousedOver
   cursor: pointer;
 }
 
+.ShowDecayProductsTxt
+{
+  cursor: pointer;
+}
+
+.ShowDecayProductsRect
+{
+  cursor: pointer;
+}
+
 .DecayChainDnldBtn
 {
   position: absolute;

InterSpec_resources/DecayChainChart.js

@@ -53,22 +53,23 @@ DecayChainChart = function(elem, options) {
 
   if( (typeof this.options.clickNucTxt) !== 'string' ) 
     this.options.clickNucTxt = "Click nuclide for more information.";
-  if( (typeof this.options.clickNucMoreInfoTxt1) !== 'string' )
-    this.options.clickNucMoreInfoTxt1 = "Double-click nuclide for particles it gives off.";
   if( (typeof this.options.clickNucMoreInfoTxt2) !== 'string' )
     this.options.clickNucMoreInfoTxt2 = "Click a different source nuclide above to";
   if( (typeof this.options.clickNucMoreInfoTxt3) !== 'string' )
     this.options.clickNucMoreInfoTxt3 = "change displayed decay chain.";
 
   if( (typeof this.options.clickNucMblTxt) !== 'string' ) 
     this.options.clickNucMblTxt = "Tap nuclide for more information.";
-  if( (typeof this.options.clickNucMblMoreInfoTxt1) !== 'string' ) 
-    this.options.clickNucMblMoreInfoTxt1 = "Touch nuclide for 1 second for particles it gives off.";
   if( (typeof this.options.clickNucMblMoreInfoTxt2) !== 'string' ) 
     this.options.clickNucMblMoreInfoTxt2 = "Click a different source nuclide above to";
-  if( (typeof this.options.clickNucMblMoreInfoTxt3) !== 'string' ) 
+  if( (typeof this.options.clickNucMblMoreInfoTxt3) !== 'string' )
     this.options.clickNucMblMoreInfoTxt3 = "change displayed decay chain.";
-  
+
+  if( (typeof this.options.showDecayProductsTxt) !== 'string' )
+    this.options.showDecayProductsTxt = "Show {nuclide} decay products";
+  if( (typeof this.options.showDecaysThroughTxt) !== 'string' )
+    this.options.showDecaysThroughTxt = "Show decays through {nuclide}";
+
   this.svg = d3.select(this.area).append("svg");
 
   this.chartbackground = this.svg.append("rect")
@@ -262,16 +263,14 @@ DecayChainChart.prototype.setDecayData = function( data, decayFrom ){
   {
     this.instructions.html(
       '<tspan x="0">' + this.options.clickNucMblTxt + '</tspan>'
-      + (decayFrom ? '<tspan x="0" dy="1em">' + this.options.clickNucMblMoreInfoTxt1 + '</tspan>'
-      + '<tspan x="0" dy="1em">' + this.options.clickNucMblMoreInfoTxt2 + '</tspan>'
+      + (decayFrom ? '<tspan x="0" dy="1em">' + this.options.clickNucMblMoreInfoTxt2 + '</tspan>'
       + '<tspan x="0" dy="1em">' + this.options.clickNucMblMoreInfoTxt3 + '</tspan>': '')
     );
   }else
   {
     this.instructions.html(
       '<tspan x="0" dy="1em">' + this.options.clickNucTxt + '</tspan>'
-      + (decayFrom ? '<tspan x="0" dy="1em">' + this.options.clickNucMoreInfoTxt1 + '</tspan>'
-      + '<tspan x="0" dy="1em">' + this.options.clickNucMoreInfoTxt2 + '</tspan>'
+      + (decayFrom ? '<tspan x="0" dy="1em">' + this.options.clickNucMoreInfoTxt2 + '</tspan>'
       + '<tspan x="0" dy="1em">' + this.options.clickNucMoreInfoTxt3 + '</tspan>': '')
     );
   }//if( no data ) / else mobile / else
@@ -501,7 +500,6 @@ DecayChainChart.prototype.redraw = function() {
     self.decays.selectAll('.DecayChartNuc').classed('MousedOver',false);
   } )
   .on("click", function(d){ self.nuclideClicked(d); } )
-  .on("dblclick", function(d){ self.nuclideDoubleClicked(d); } )
   ;
 
   rects.exit().remove();
@@ -667,7 +665,6 @@ DecayChainChart.prototype.redraw = function() {
          self.decays.selectAll('.DecayChartNuc').classed('MousedOver',false);
        } )
        .on("click", function(d){ self.nuclideClicked(d); } )
-       .on("dblclick", function(d){ self.nuclideDoubleClicked(d); } )
        .html( function(d){ return labelTxtFcn(d,txtXPos); } )
        .attr("font-family", "sans-serif")
        .attr("font-size", function(){ return font_size + "px";} )
@@ -759,12 +756,19 @@ DecayChainChart.prototype.redraw = function() {
   //I cant decide if its better to underline the "Show Decays Through ..." text,
   //  or draw a box around it; currently underlineing, but I left the box
   //  implementation commented out in the various lines below.
-  
+
   if( !this.selectedNuclide && this.showParentsTxt ){
     self.showParentsTxt.remove();
     self.showParentsRect.remove();
     self.showParentsTxt = null;
     self.showParentsRect = null;
+
+    if( self.showDecayProductsTxt ){
+      self.showDecayProductsTxt.remove();
+      self.showDecayProductsRect.remove();
+      self.showDecayProductsTxt = null;
+      self.showDecayProductsRect = null;
+    }
   }else if( this.selectedNuclide && this.options.isDecayChain ){
     if( !self.showParentsTxt ) {
       self.showParentsRect = this.chart.append("rect")
@@ -776,33 +780,76 @@ DecayChainChart.prototype.redraw = function() {
         .attr("stroke", "none")
         .attr("class", "ShowDecaysThroughRect" )
         .on("click", function(){ self.emitShowDecaysThrough(); } );
-      
+
       self.showParentsTxt = this.chart.append("text")
         .attr("class", "ShowDecaysThroughTxt")
         .attr("x",0)
         .attr("y","0")
         .attr("fill", self.options.linkColor)
         .on("click", function(){ self.emitShowDecaysThrough(); } );
+
+      self.showDecayProductsRect = this.chart.append("rect")
+        .attr("x", 0 )
+        .attr("y", 0 )
+        .attr("fill", "#ffffff")  //add fill so mouse over will be active for entire rect area
+        .attr("fill-opacity", "0")
+        .attr("stroke", "none")
+        .attr("class", "ShowDecayProductsRect" )
+        .on("click", function(){ self.showNuclideDecayProducts( self.selectedNuclide ); } );
+
+      self.showDecayProductsTxt = this.chart.append("text")
+        .attr("class", "ShowDecayProductsTxt")
+        .attr("x",0)
+        .attr("y","0")
+        .attr("fill", self.options.linkColor)
+        .on("click", function(){ self.showNuclideDecayProducts( self.selectedNuclide ); } );
     }
-    
+
+    // Position the "Show decay products" text first, below the instructions
+    const decayProductsText = self.options.showDecayProductsTxt.replace( '{nuclide}', self.selectedNuclide.nuclide );
+    self.showDecayProductsTxt
+        .html( decayProductsText )
+        .attr("font-size", 0.9*inst_font_size )
+        .attr("text-decoration", "underline" )
+        ;
+
+    const decayprodtxtbb = self.showDecayProductsTxt.node().getBoundingClientRect();
+    const decayprod_txt_h = decayprodtxtbb.height;
+    const decayprod_txt_w = decayprodtxtbb.width;
+    const box_x = chartwidth - txtbb.width - 4;
+
+    // Position below the instructions text
+    const decayprod_box_y = txtbb.height + 4 + 0.15*decayprod_txt_h;
+
+    self.showDecayProductsTxt.attr("transform", "translate(" + box_x + "," + (decayprod_box_y + 0.9*decayprod_txt_h) + ")")
+
+    self.showDecayProductsRect
+        .attr("height", 1.2*decayprod_txt_h )
+        .attr("width", decayprod_txt_w + 0.75*decayprod_txt_h )
+        .attr("rx", 0.08*1.2*decayprod_txt_h )
+        .attr("transform", "translate(" + (box_x - 0.375*decayprod_txt_h) + "," + decayprod_box_y + ")")
+        ;
+
+    // Position the "Show Decays Through" text below the decay products text
+    const decaysThroughText = self.options.showDecaysThroughTxt.replace( '{nuclide}', self.selectedNuclide.nuclide );
     self.showParentsTxt
-        .html( 'Show Decays Through ' + self.selectedNuclide.nuclide )
+        .html( decaysThroughText )
         //.attr("font-size", 0.8*inst_font_size )
         .attr("font-size", 0.9*inst_font_size )
         .attr("text-decoration", "underline" )
         ;
-        
+
     const showtxtpbb = self.showParentsTxt.node().getBoundingClientRect();
     const txt_h = showtxtpbb.height;
     const txt_w = showtxtpbb.width;
-    const box_x = chartwidth - txtbb.width - 4;
-    //const box_y = txtbb.height + 4 + 0.25*txt_h;
-    const box_y = txtbb.height + 4 + 0.15*txt_h;
-    
+
+    // Position below the decay products text, with some spacing
+    const box_y = decayprod_box_y + decayprod_txt_h + 0.3*txt_h;
+
     //self.showParentsTxt.attr("transform", "translate(" + (box_x + 0.375*txt_h) + "," + (box_y + 0.90*txt_h) + ")");
     self.showParentsTxt.attr("transform", "translate(" + box_x + "," + (box_y + 0.9*txt_h) + ")")
-    
-    
+
+
     self.showParentsRect
         .attr("height", 1.2*txt_h )
         .attr("width", txt_w + 0.75*txt_h )
@@ -849,12 +896,12 @@ DecayChainChart.prototype.nuclideClicked = function( d ) {
 
 
 
-DecayChainChart.prototype.nuclideDoubleClicked = function( d ) {
+DecayChainChart.prototype.showNuclideDecayProducts = function( d ) {
   let nucstr = (d && d.nuclide) ? d.nuclide : '';
   ((d && d.additionalIsos) ? d.additionalIsos :  []).forEach( function(nuc){
     nucstr += "," + nuc.nuclide;
   } );
-  
+
   this.WtEmit(this.area.id, {name: 'ShowDecayParticleInfo'}, nucstr );
 }
 

InterSpec_resources/NuclideDecayInfo.css

@@ -94,6 +94,18 @@ cursor: default;
   border-radius: 8px;
 }
 
+.displayOptionsDiv .LowerOptions
+{
+  display: flex;
+  align-items: center;
+}
+
+.displayOptionsDiv .LowerOptions .LowerOptionsSpacer
+{
+  flex-grow: 1;
+  flex-shrink: 1;
+}
+
 .m_parentNuclidesDiv
 {
   border: 1px solid #888888;

InterSpec_resources/app_text/DecayActivity.xml

@@ -76,15 +76,15 @@
   <message id="dcc-xAxisTitle">Decreasing Atomic Mass</message>
   <message id="dcc-yAxisTitle">Increasing Atomic Number</message>
   <message id="dcc-clickNucTxt">Click nuclide for more information.</message>
-  <message id="dcc-clickNucMoreInfoTxt1">Double-click nuclide for particles it gives off.</message>
   <message id="dcc-clickNucMoreInfoTxt2">Click a different source nuclide above to</message>
   <message id="dcc-clickNucMoreInfoTxt3">change displayed decay chain.</message>
   <message id="dcc-clickNucMblTxt">Tap nuclide for more information.</message>
-  <message id="dcc-clickNucMblMoreInfoTxt1">Touch nuclide for 1 second for particles it gives off.</message>
   <message id="dcc-clickNucMblMoreInfoTxt2">Click a different source nuclide above to</message>
   <message id="dcc-clickNucMblMoreInfoTxt3">change displayed decay chain.</message>
+  <message id="dcc-show-decay-products">Show {nuclide} decay products</message>
+  <message id="dcc-show-decays-through">Show decays through {nuclide}</message>
 
 
   <message id="dcn-initial-age">Initial Age: </message>
 
-</messages>
+</messages>

InterSpec_resources/app_text/DecayActivity_ar.xml

@@ -76,13 +76,13 @@
   <message id="dcc-xAxisTitle">تناقص الكتلة الذرية</message>
   <message id="dcc-yAxisTitle">تزايد العدد الذري</message>
   <message id="dcc-clickNucTxt">انقر على النواة للمزيد من المعلومات.</message>
-  <message id="dcc-clickNucMoreInfoTxt1">انقر مرتين على النواة للجسيمات التي تطلقها.</message>
   <message id="dcc-clickNucMoreInfoTxt2">انقر على نواة مصدر مختلفة أعلاه لـ</message>
   <message id="dcc-clickNucMoreInfoTxt3">تغيير سلسلة التحلل المعروضة.</message>
   <message id="dcc-clickNucMblTxt">اضغط على النواة للمزيد من المعلومات.</message>
-  <message id="dcc-clickNucMblMoreInfoTxt1">المس النواة لثانية واحدة للجسيمات التي تطلقها.</message>
   <message id="dcc-clickNucMblMoreInfoTxt2">انقر على نواة مصدر مختلفة أعلاه لـ</message>
   <message id="dcc-clickNucMblMoreInfoTxt3">تغيير سلسلة التحلل المعروضة.</message>
+  <message id="dcc-show-decay-products">إظهار منتجات تحلل {nuclide}</message>
+  <message id="dcc-show-decays-through">إظهار التحللات عبر {nuclide}</message>
 
 
   <message id="dcn-initial-age">العمر الأولي: </message>

InterSpec_resources/app_text/DecayActivity_bn.xml

@@ -76,13 +76,13 @@
   <message id="dcc-xAxisTitle">হ্রাসকারী পরমাণু ভর</message>
   <message id="dcc-yAxisTitle">বর্ধমান পরমাণু সংখ্যা</message>
   <message id="dcc-clickNucTxt">আরও তথ্যের জন্য নিউক্লাইড ক্লিক করুন।</message>
-  <message id="dcc-clickNucMoreInfoTxt1">যে কণা ছেড়ে দেয় তার জন্য নিউক্লাইড ডাবল-ক্লিক করুন।</message>
   <message id="dcc-clickNucMoreInfoTxt2">প্রদর্শিত ক্ষয় চেইন পরিবর্তন করতে</message>
   <message id="dcc-clickNucMoreInfoTxt3">উপরে একটি ভিন্ন উৎস নিউক্লাইড ক্লিক করুন।</message>
   <message id="dcc-clickNucMblTxt">আরও তথ্যের জন্য নিউক্লাইড ট্যাপ করুন।</message>
-  <message id="dcc-clickNucMblMoreInfoTxt1">যে কণা ছেড়ে দেয় তার জন্য নিউক্লাইড 1 সেকেন্ডের জন্য স্পর্শ করুন।</message>
   <message id="dcc-clickNucMblMoreInfoTxt2">প্রদর্শিত ক্ষয় চেইন পরিবর্তন করতে</message>
   <message id="dcc-clickNucMblMoreInfoTxt3">উপরে একটি ভিন্ন উৎস নিউক্লাইড ক্লিক করুন।</message>
+  <message id="dcc-show-decay-products">{nuclide} ক্ষয় পণ্য দেখান</message>
+  <message id="dcc-show-decays-through">{nuclide} এর মাধ্যমে ক্ষয় দেখান</message>
 
 
   <message id="dcn-initial-age">প্রাথমিক বয়স: </message>

InterSpec_resources/app_text/DecayActivity_es.xml

@@ -76,13 +76,13 @@
   <message id="dcc-xAxisTitle">Masa atómica decreciente</message>
   <message id="dcc-yAxisTitle">Número atómico creciente</message>
   <message id="dcc-clickNucTxt">Hacer clic en nucleído para más información.</message>
-  <message id="dcc-clickNucMoreInfoTxt1">Doble clic en nucleído para partículas que emite.</message>
   <message id="dcc-clickNucMoreInfoTxt2">Hacer clic en un nucleído fuente diferente arriba para</message>
   <message id="dcc-clickNucMoreInfoTxt3">cambiar cadena de desintegración mostrada.</message>
   <message id="dcc-clickNucMblTxt">Tocar nucleído para más información.</message>
-  <message id="dcc-clickNucMblMoreInfoTxt1">Tocar nucleído por 1 segundo para partículas que emite.</message>
   <message id="dcc-clickNucMblMoreInfoTxt2">Hacer clic en un nucleído fuente diferente arriba para</message>
   <message id="dcc-clickNucMblMoreInfoTxt3">cambiar cadena de desintegración mostrada.</message>
+  <message id="dcc-show-decay-products">Mostrar productos de desintegración de {nuclide}</message>
+  <message id="dcc-show-decays-through">Mostrar desintegraciones a través de {nuclide}</message>
 
 
   <message id="dcn-initial-age">Edad inicial: </message>

InterSpec_resources/app_text/DecayActivity_fr.xml

@@ -70,15 +70,15 @@
   <message id="dcc-xAxisTitle">Masse atomique décroissante</message>
   <message id="dcc-yAxisTitle">Numéro atomique croissant</message>
   <message id="dcc-clickNucTxt">Cliquez sur le nucléide pour plus d'informations.</message>
-  <message id="dcc-clickNucMoreInfoTxt1">Double-cliquez sur le nucléide pour les particules qu'il émet.</message>
   <message id="dcc-clickNucMoreInfoTxt2">Cliquez sur un nucléide source différent ci-dessus pour</message>
   <message id="dcc-clickNucMoreInfoTxt3">changer la chaîne de désintégration affichée.</message>
   <message id="dcc-clickNucMblTxt">Appuyez sur le nucléide pour plus d'informations.</message>
-  <message id="dcc-clickNucMblMoreInfoTxt1">Touchez le nucléide pendant 1 seconde pour les particules qu'il émet.</message>
   <message id="dcc-clickNucMblMoreInfoTxt2">Cliquez sur un nucléide source différent ci-dessus pour</message>
   <message id="dcc-clickNucMblMoreInfoTxt3">changer la chaîne de désintégration affichée.</message>
+  <message id="dcc-show-decay-products">Afficher les produits de désintégration de {nuclide}</message>
+  <message id="dcc-show-decays-through">Afficher les désintégrations via {nuclide}</message>
 
 
   <message id="dcn-initial-age">Âge initial : </message>
 
-</messages>
+</messages>

InterSpec_resources/app_text/DecayActivity_hi.xml

@@ -76,13 +76,13 @@
   <message id="dcc-xAxisTitle">घटता परमाणु द्रव्यमान</message>
   <message id="dcc-yAxisTitle">बढ़ता परमाणु क्रमांक</message>
   <message id="dcc-clickNucTxt">अधिक जानकारी के लिए न्यूक्लाइड पर क्लिक करें।</message>
-  <message id="dcc-clickNucMoreInfoTxt1">इसके द्वारा छोड़े गए कणों के लिए न्यूक्लाइड पर डबल-क्लिक करें।</message>
   <message id="dcc-clickNucMoreInfoTxt2">प्रदर्शित क्षय श्रृंखला को बदलने के लिए</message>
   <message id="dcc-clickNucMoreInfoTxt3">ऊपर एक अलग स्रोत न्यूक्लाइड पर क्लिक करें।</message>
   <message id="dcc-clickNucMblTxt">अधिक जानकारी के लिए न्यूक्लाइड पर टैप करें।</message>
-  <message id="dcc-clickNucMblMoreInfoTxt1">इसके द्वारा छोड़े गए कणों के लिए न्यूक्लाइड को 1 सेकंड के लिए स्पर्श करें।</message>
   <message id="dcc-clickNucMblMoreInfoTxt2">प्रदर्शित क्षय श्रृंखला को बदलने के लिए</message>
   <message id="dcc-clickNucMblMoreInfoTxt3">ऊपर एक अलग स्रोत न्यूक्लाइड पर क्लिक करें।</message>
+  <message id="dcc-show-decay-products">{nuclide} क्षय उत्पाद दिखाएं</message>
+  <message id="dcc-show-decays-through">{nuclide} के माध्यम से क्षय दिखाएं</message>
 
 
   <message id="dcn-initial-age">प्रारंभिक आयु: </message>

InterSpec_resources/app_text/DecayActivity_hu.xml

@@ -75,15 +75,15 @@
   <message id="dcc-xAxisTitle">Csökkenő atomtömeg</message>
   <message id="dcc-yAxisTitle">Növekvő atomszám</message>
   <message id="dcc-clickNucTxt">Kattintson a nuklidra további információért.</message>
-  <message id="dcc-clickNucMoreInfoTxt1">Dupla kattintás a nuklidon az általa kibocsátott részecskesért.</message>
   <message id="dcc-clickNucMoreInfoTxt2">Kattintson egy másik forrás nuklidra fent a</message>
   <message id="dcc-clickNucMoreInfoTxt3">megjelenített bomlási lánc megváltoztatásához.</message>
   <message id="dcc-clickNucMblTxt">Koppintson a nuklidra további információért.</message>
-  <message id="dcc-clickNucMblMoreInfoTxt1">Érintse meg a nuklidot 1 másodpercig az általa kibocsátott részecskesért.</message>
   <message id="dcc-clickNucMblMoreInfoTxt2">Kattintson egy másik forrás nuklidra fent a</message>
   <message id="dcc-clickNucMblMoreInfoTxt3">megjelenített bomlási lánc megváltoztatásához.</message>
+  <message id="dcc-show-decay-products">{nuclide} bomlási termékek megjelenítése</message>
+  <message id="dcc-show-decays-through">Bomlások megjelenítése {nuclide} keresztül</message>
 
 
   <message id="dcn-initial-age">Kezdeti életkor: </message>
 
-</messages>
+</messages>