Impl. Boxplots #5

src-modules/module/viz/schluesseltabellen/viz_property.unl

@@ -36,7 +36,7 @@
 73^Maß 2^viz_measure2^^ ^1^ ^0^1^6^ ^608^^^string^
 76^Serien-Dimension^stroke^^ ^1^ ^0^1^5^ ^608^^^string^
 78^Legende^legend^^ ^1^true|false^0^2^20^ ^303^^^boolean^
-79^Textbeschriftung^text_horizontal^^ ^1^ ^0^1^5^ ^608^^^string^
+79^Textbeschriftung^text^^ ^1^ ^0^1^5^ ^608^^^string^
 80^Serienfarbe^fill^^ ^1^ ^0^1^5^Füllfarbe (nur) von Diagrammelementen (Flächen, Balken, Säulen, Streifen, Punkte)^305^^^string^
 81^Y: Label-Abstand^labelOffset_y^^px^1^ ^0^1^21^Label-Abstand von Achse^602^^^integer^
 82^Y: Label-Ausrichtung^labelAnchor_y^^ ^1^left|center|right^0^2^21^Label-Position^601^^^string^

src-modules/module/viz/schluesseltabellen/viz_property_renderer.unl

@@ -22,3 +22,4 @@
 23^2^86^label^
 25^2^87^label^
 26^2^84^tickRotate^
+27^2^79^text^

src-modules/module/viz/schluesseltabellen/viz_type.unl

@@ -3,3 +3,7 @@
 3^line^Linien (vertikal)^2^/superx/xml/js/viz/viz_functions.js^makeLine^
 5^area_y^Flächen (vertikal)^2^^^
 6^dot^Punkte (vertikal)^2^^^
+7^box_x^Boxplot (horizontal)^2^ ^ ^
+8^area_x^Flächen (horizontal)^2^^^
+9^box_y^Boxplot (vertikal)^2^ ^ ^
+10^text^Wertelabel^2^ ^ ^

src-modules/module/viz/schluesseltabellen/viz_type_property.unl

@@ -20,3 +20,14 @@
 30^5^89^0^
 31^2^89^0^
 32^1^89^0^
+33^7^70^1^
+34^7^72^0^
+35^9^70^0^
+36^9^72^1^
+37^8^8^0^
+38^8^72^1^
+39^8^70^1^
+40^8^89^0^
+41^10^70^1^
+42^10^72^1^
+43^10^79^1^

superx/xml/js/viz/viz_functions.js

@@ -69,7 +69,7 @@ function chartModel(id,name,renderer,datasources)
 		//first empty marks:
 		for(var k=0;k< this.options["marks"].length;k++)
 		{
-			delete this.options["marks"][k];
+			this.options["marks"][k].pop();
 		}
 		//copy ChartElements to marks:
 		for(var k=0;k< this.chartElements.length;k++)
@@ -561,7 +561,6 @@ function removeChartElementConfig()
 
 		/*var filtered=myChartModel.chartElements.filter(obj => obj.nr !== propertyCounter-1);
 		myChartModel.chartElements=filtered;*/
-		//delete myChartModel.chartElements[propertyCounter-1];
 		myChartModel.chartElements.pop();
 		elemID--;
 		if(document.getElementById("chartElementID"))
@@ -1400,15 +1399,18 @@ switch (chartType)
 	case "bar_x":
 		plotMark=Plot.barX(myDatasourceRs,markOptions);
 	    break;
-	case "bar_x_stacked":
+/*	case "bar_x_stacked":
 		plotMark=Plot.barX(myDatasourceRs,markOptions);
-	break;
+	break;*/
 	case "bar_x_alt":
 		makeBarX(svg,data);
         break;
 	case "bar_y":
 		plotMark=Plot.barY(myDatasourceRs,markOptions);
         break;
+	case "area_x":
+		plotMark=Plot.areaX(myDatasourceRs,markOptions);
+	break;
 	case "area_y":
 		plotMark=Plot.areaY(myDatasourceRs,markOptions);
 	break;
@@ -1418,8 +1420,17 @@ switch (chartType)
 	case "line":
 		plotMark=Plot.line(myDatasourceRs,markOptions);
 		break;
+	case "box_x":
+		plotMark=Plot.boxX(myDatasourceRs,markOptions);
+		break;
+	case "box_y":
+		plotMark=Plot.boxY(myDatasourceRs,markOptions);
+		break;
+	case "text":
+		plotMark=Plot.text(myDatasourceRs,markOptions);
+		break;
 	default:
-		alert("Please select a chart type");
+		alert("Unknown chart type");
 	break;
 }
 }

superx/xml/viz_html_chart.xsl

@@ -1375,7 +1375,7 @@ rsTableMetaData.push(new tableMetaData(
 <xsl:text>,'</xsl:text>
 <xsl:value-of select="$tableId"/>
 <xsl:text>','</xsl:text>
-<xsl:value-of select="$tableId"/>
+<xsl:value-of select="concat('Tab. ',$tableId+1)"/>
 <xsl:text>',
 </xsl:text>
 <xsl:choose>