Labels are now hidden

cDanowski · Aug 5, 2015 · b60cf1f · b60cf1f
1 parent f339c40
commit b60cf1f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/main/java/org/n52/v3d/worldviz/featurenet/scene/WvizConnectionMapSceneX3d.java b/src/main/java/org/n52/v3d/worldviz/featurenet/scene/WvizConnectionMapSceneX3d.java
@@ -522,7 +522,7 @@ else if ("Box".equals(symbolType)) {
                 writeLine("    <Transform translation='" + (point.getX() + displacementX) + " " + (point.getY() + displacementY) + " " + (point.getZ() + displacementZ)+ "'" 
                 			+ " scale='" + svgMap.get("font-size") + " " + svgMap.get("font-size") + " " + svgMap.get("font-size") + "'>");
                 writeLine("        <Billboard axisOfRotation='"+billboardAxis+"'>");
-                writeLine("          <Shape DEF=\"labelText\" data-class=\"information\">");
+                writeLine("          <Shape id = \"featureLabel"+indexPoint+"\" render=\"true\" DEF=\"labelText\" data-class=\"information\">");
                 writeLine("            <Appearance>");
                 writeLine("              <Material diffuseColor=\"" + svgMap.get("fill") + "\"/>");
                 writeLine("            </Appearance>");

diff --git a/src/main/resources/Javascript/script.js b/src/main/resources/Javascript/script.js
@@ -574,15 +574,22 @@
             var feature = document.getElementById(x);
 			feature.setAttribute('diffuseColor', getHighlightColor());
 			feature.setAttribute('emissiveColor', getHighlightGlow());
-        }
+
+			var y = "featureLabel" + indices[i];
+			var label = document.getElementById(y);
+			label.setAttribute('render', 'false');
+		}
         restorePreviousFeatures(indices);
     }
 
     function restoreFeatures(){
             for ( var i = 0; i < getIndexSize(); i++ ) {
-                feature_id = "feature" + (i+1);
+                var feature_id = "feature" + (i+1);
                 document.getElementById(feature_id).setAttribute('diffuseColor', getNormalColor());
                 document.getElementById(feature_id).setAttribute('emissiveColor', getNormalGlow());
+
+				var y = "featureLabel" + (i+1);
+				document.getElementById(y).setAttribute('render', 'true');
             }
     }
 
@@ -597,6 +604,10 @@
 			var feature = document.getElementById(x);
 			feature.setAttribute('diffuseColor', getNormalColor());
 			feature.setAttribute('emissiveColor', getNormalGlow());
+
+			var y = "featureLabel" + indices[i];
+			var label = document.getElementById(y);
+			label.setAttribute('render', 'false');
         }
     }