Merge pull request #47 from jku-vds-lab/jakob/prototype-presentation-…

…1.0.0 Change publish name to general names
jku-vds-lab · Mar 7, 2022 · 79757ba · 79757ba
2 parents ac2e82b + ab317e7
commit 79757ba
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 90 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 node_modules
 .tmp
-*.statistics.dev.html
+*.statistics.dev.html
+*.statistics.prod.html
diff --git a/dist/multistackedcharts3A8101158FC14988B45B304F265A2202.1.0.0.pbiviz b/dist/multistackedcharts3A8101158FC14988B45B304F265A2202.1.0.0.pbiviz
diff --git a/dist/package.json b/dist/package.json
@@ -1,29 +1,17 @@
 {
-    "version": "1.0.1",
-    "author": {
-        "name": "Jakob Zethofer",
-        "email": "[email protected]"
-    },
+    "version": "1.0.0",
+    "author": {"name":"Jakob Zethofer","email":"[email protected]"},
     "resources": [
         {
             "resourceId": "rId0",
             "sourceType": 5,
-            "file": "resources/slabprojection3A8101158FC14988B45B304F265A2202.pbiviz.json"
+            "file": "resources/multistackedcharts3A8101158FC14988B45B304F265A2202.pbiviz.json"
         }
     ],
-    "visual": {
-        "name": "slabprojection",
-        "displayName": "Defect Projection on Slab",
-        "guid": "slabprojection3A8101158FC14988B45B304F265A2202",
-        "visualClassName": "Visual",
-        "version": "1.0.1",
-        "description": "Custom Visual for displaying multiple stacked charts for defect projection on slab",
-        "supportUrl": "https://github.com/jku-vds-lab/pro2future-voest-multiple-stacked-charts",
-        "gitHubUrl": "https://github.com/jku-vds-lab/pro2future-voest-multiple-stacked-charts"
-    },
+    "visual": {"name":"multistackedcharts","displayName":"Multiple Stacked Charts","guid":"multistackedcharts3A8101158FC14988B45B304F265A2202","visualClassName":"Visual","version":"1.0.0","description":"Custom Visual for displaying multiple stacked charts","supportUrl":"https://github.com/jku-vds-lab/pro2future-voest-multiple-stacked-charts","gitHubUrl":"https://github.com/jku-vds-lab/pro2future-voest-multiple-stacked-charts"},
     "metadata": {
         "pbivizjson": {
             "resourceId": "rId0"
         }
-    }
+    }  
 }
diff --git a/dist/slabprojection3A8101158FC14988B45B304F265A2202.1.0.0.pbiviz b/dist/slabprojection3A8101158FC14988B45B304F265A2202.1.0.0.pbiviz
diff --git a/dist/slabprojection3A8101158FC14988B45B304F265A2202.1.0.1.pbiviz b/dist/slabprojection3A8101158FC14988B45B304F265A2202.1.0.1.pbiviz
diff --git a/pbiviz.json b/pbiviz.json
@@ -1,11 +1,11 @@
 {
     "visual": {
-        "name": "slabprojection",
-        "displayName": "Defect Projection on Slab",
-        "guid": "slabprojection3A8101158FC14988B45B304F265A2202",
+        "name": "multistackedcharts",
+        "displayName": "Multiple Stacked Charts",
+        "guid": "multistackedcharts3A8101158FC14988B45B304F265A2202",
         "visualClassName": "Visual",
         "version": "1.0.0",
-        "description": "Custom Visual for displaying multiple stacked charts for defect projection on slab",
+        "description": "Custom Visual for displaying multiple stacked charts",
         "supportUrl": "https://github.com/jku-vds-lab/pro2future-voest-multiple-stacked-charts",
         "gitHubUrl": "https://github.com/jku-vds-lab/pro2future-voest-multiple-stacked-charts"
     },

diff --git a/src/marginSettings.ts b/src/marginSettings.ts
@@ -2,7 +2,7 @@ import { Margins } from './plotInterface';
 
 export class MarginSettings {
     static readonly svgTopPadding = 0;
-    static readonly svgBottomPadding = 0;
+    static readonly svgBottomPadding = 15;
     static readonly plotTitleHeight = 18;
     static readonly legendHeight = 20;
     static readonly dotMargin = 4;

diff --git a/src/visual.ts b/src/visual.ts
@@ -72,7 +72,7 @@ export class Visual implements IVisual {
 
     private drawLegend() {
         const margins = this.viewModel.generalPlotSettings;
-        const yPosition = margins.legendYPostion;
+        const yPosition = margins.legendYPostion+10;
         const legendData = this.viewModel.legend.legendValues;
         let widths = [];
         let width = margins.margins.left;
@@ -755,31 +755,31 @@ export class Visual implements IVisual {
                     });
                     break;
                 case Settings.legendSettings:
-                    objectEnumeration.push({
-                        objectName: objectName,
-                        properties: {
-                            legendTitle: <string>getValue(objects, Settings.legendSettings, LegendSettingsNames.legendTitle, "Legend"),
-                        },
-                        selector: null
-                    });
-                    objectEnumeration.push({
-                        objectName: objectName,
-                        displayName: "testing",
-                        properties: {
-                            legendColor: <string>getValue(objects, Settings.legendSettings, LegendSettingsNames.legendColor, "Lnd"),
-
-                        },
-                        selector: dataViewWildcard.createDataViewWildcardSelector(dataViewWildcard.DataViewWildcardMatchingOption.InstancesAndTotals)
-                    });
-                    objectEnumeration.push({
-                        objectName: objectName,
-                        displayName: "testi2ng",
-                        properties: {
-                            legendColor: <string>getValue(objects, Settings.legendSettings, LegendSettingsNames.legendColor, "Lnd"),
-
-                        },
-                        selector: dataViewWildcard.createDataViewWildcardSelector(dataViewWildcard.DataViewWildcardMatchingOption.InstancesAndTotals)
-                    });
+                    // objectEnumeration.push({
+                    //     objectName: objectName,
+                    //     properties: {
+                    //         legendTitle: <string>getValue(objects, Settings.legendSettings, LegendSettingsNames.legendTitle, "Legend"),
+                    //     },
+                    //     selector: null
+                    // });
+                    // objectEnumeration.push({
+                    //     objectName: objectName,
+                    //     displayName: "testing",
+                    //     properties: {
+                    //         legendColor: <string>getValue(objects, Settings.legendSettings, LegendSettingsNames.legendColor, "Lnd"),
+
+                    //     },
+                    //     selector: dataViewWildcard.createDataViewWildcardSelector(dataViewWildcard.DataViewWildcardMatchingOption.InstancesAndTotals)
+                    // });
+                    // objectEnumeration.push({
+                    //     objectName: objectName,
+                    //     displayName: "testi2ng",
+                    //     properties: {
+                    //         legendColor: <string>getValue(objects, Settings.legendSettings, LegendSettingsNames.legendColor, "Lnd"),
+
+                    //     },
+                    //     selector: dataViewWildcard.createDataViewWildcardSelector(dataViewWildcard.DataViewWildcardMatchingOption.InstancesAndTotals)
+                    // });
                     break;
                 case Settings.zoomingSettings:
 

diff --git a/webpack.statistics.prod.html b/webpack.statistics.prod.html