new build v1.3.5

dist/NEWS.md

@@ -1,5 +1,13 @@
 # What's New
 
+## Version 1.3.5
+
+### new features / performance tweaks / improvements
+
+### bug fixes
+
+- fixed border causing negative mouse x pos values
+
 ## Version 1.3.4
 
 ### new features / performance tweaks / improvements

dist/dist/emuwebapp.bundle.js

@@ -51605,7 +51605,7 @@ webpackEmptyAsyncContext.id = 203;
 /* 204 */
 /***/ (function(module) {
 
-module.exports = JSON.parse("{\"a\":\"1.3.4\"}");
+module.exports = JSON.parse("{\"a\":\"1.3.5\"}");
 
 /***/ }),
 /* 205 */
@@ -103423,7 +103423,7 @@ function generateUUID() {
 /***/ (function(module, exports, __webpack_require__) {
 
 module.exports = function() {
-  return new Worker(__webpack_require__.p + "61d5f68cfa2c42c81cc6.worker.js");
+  return new Worker(__webpack_require__.p + "ac8b07c34d8b47ca3d70.worker.js");
 };
 
 /***/ }),
@@ -111916,7 +111916,7 @@ module.exports = exported;
 var ___CSS_LOADER_API_IMPORT___ = __webpack_require__(15);
 exports = ___CSS_LOADER_API_IMPORT___(false);
 // Module
-exports.push([module.i, ".emuwebapp-timeline{position:absolute;padding:0;margin:0;top:0;bottom:0;height:100%;width:100%}.emuwebapp-timeline .emuwebapp-timelineCanvasContainer{position:relative;float:left;height:100%;width:calc(100% - 10px);padding-left:5px;padding-right:5px;padding-top:0px;padding-bottom:0px}.emuwebapp-timeline .emuwebapp-timelineCanvasContainer div{width:100%}.emuwebapp-timeline .emuwebapp-timelineCanvasContainer canvas{float:left;margin:0px;z-index:1;width:100%;height:100%}.emuwebapp-timeline .emuwebapp-timelineCanvasContainer .emuwebapp-timelineCanvasMain{top:0;left:5px;background:#000;border:1px solid #424242}.emuwebapp-timeline .emuwebapp-timelineCanvasContainer .emuwebapp-timelineCanvasSSFF{position:absolute;top:0;left:5px;width:calc(100% - 10px) !important;z-index:2;border:1px solid #424242}.emuwebapp-timeline .emuwebapp-timelineCanvasContainer .emuwebapp-timelineCanvasMarkup{position:absolute;top:0px;left:5px;background-color:transparent;z-index:2;width:calc(100% - 10px) !important;border:1px solid #424242}.emuwebapp-timeline .emuwebapp-timelineCanvasButtons{float:left;width:10px;min-height:20px}\n", ""]);
+exports.push([module.i, ".emuwebapp-timeline{position:absolute;padding:0;margin:0;top:0;bottom:0;height:100%;width:100%}.emuwebapp-timeline .emuwebapp-timelineCanvasContainer{position:relative;float:left;height:100%;width:calc(100% - 10px);padding-left:5px;padding-right:5px;padding-top:0px;padding-bottom:0px}.emuwebapp-timeline .emuwebapp-timelineCanvasContainer div{width:100%}.emuwebapp-timeline .emuwebapp-timelineCanvasContainer canvas{float:left;margin:0px;z-index:1;width:100%;height:100%}.emuwebapp-timeline .emuwebapp-timelineCanvasContainer .emuwebapp-timelineCanvasMain{top:0;left:5px;background:#000}.emuwebapp-timeline .emuwebapp-timelineCanvasContainer .emuwebapp-timelineCanvasSSFF{position:absolute;top:0;left:5px;width:calc(100% - 10px) !important;z-index:2}.emuwebapp-timeline .emuwebapp-timelineCanvasContainer .emuwebapp-timelineCanvasMarkup{position:absolute;top:0px;left:5px;background-color:transparent;z-index:2;width:calc(100% - 10px) !important}.emuwebapp-timeline .emuwebapp-timelineCanvasButtons{float:left;width:10px;min-height:20px}\n", ""]);
 // Exports
 exports.locals = {
 	"colorBlack": "#000",
@@ -112052,7 +112052,7 @@ module.exports = exported;
 var ___CSS_LOADER_API_IMPORT___ = __webpack_require__(15);
 exports = ___CSS_LOADER_API_IMPORT___(false);
 // Module
-exports.push([module.i, ".emuwebapp-level{width:100%;height:64px}.emuwebapp-level .emuwebapp-level-container{position:relative;float:left;width:calc(100% - 10px);height:100%;padding:5px}.emuwebapp-level .emuwebapp-level-canvas{float:left;margin:0;border:1px solid #424242;width:100%;height:100%;z-index:1}.emuwebapp-level .emuwebapp-level-markup{position:absolute;top:5px;left:5px;background-color:transparent;border:1px solid #424242;width:calc(100% - 10px);height:calc(100% - 10px);z-index:2}.emuwebapp-level .emuwebapp-level-buttons{float:left;width:10px;height:100%}@-webkit-keyframes rotate-the-object{0%{-webkit-transform:rotateX(0deg);-ms-transform:rotateX(0deg);-moz-transform:rotateX(0deg);-o-transform:rotateX(0deg);transform:rotateX(0deg)}100%{-webkit-transform:rotateX(180deg);-ms-transform:rotateX(180deg);-moz-transform:rotateX(180deg);-o-transform:rotateX(180deg);transform:rotateX(180deg)}}@-moz-keyframes rotate-the-object{0%{-webkit-transform:rotateX(0deg);-ms-transform:rotateX(0deg);-moz-transform:rotateX(0deg);-o-transform:rotateX(0deg);transform:rotateX(0deg)}100%{-webkit-transform:rotateX(180deg);-ms-transform:rotateX(180deg);-moz-transform:rotateX(180deg);-o-transform:rotateX(180deg);transform:rotateX(180deg)}}@-ms-keyframes rotate-the-object{0%{-webkit-transform:rotateX(0deg);-ms-transform:rotateX(0deg);-moz-transform:rotateX(0deg);-o-transform:rotateX(0deg);transform:rotateX(0deg)}100%{-webkit-transform:rotateX(180deg);-ms-transform:rotateX(180deg);-moz-transform:rotateX(180deg);-o-transform:rotateX(180deg);transform:rotateX(180deg)}}@-o-keyframes rotate-the-object{0%{-webkit-transform:rotateX(0deg);-ms-transform:rotateX(0deg);-moz-transform:rotateX(0deg);-o-transform:rotateX(0deg);transform:rotateX(0deg)}100%{-webkit-transform:rotateX(180deg);-ms-transform:rotateX(180deg);-moz-transform:rotateX(180deg);-o-transform:rotateX(180deg);transform:rotateX(180deg)}}@keyframes rotate-the-object{0%{-webkit-transform:rotateX(0deg);-ms-transform:rotateX(0deg);-moz-transform:rotateX(0deg);-o-transform:rotateX(0deg);transform:rotateX(0deg)}100%{-webkit-transform:rotateX(180deg);-ms-transform:rotateX(180deg);-moz-transform:rotateX(180deg);-o-transform:rotateX(180deg);transform:rotateX(180deg)}}.emuwebapp-level-animation{-webkit-animation:rotate-the-object .2s 1;-moz-animation:rotate-the-object .2s 1;-o-animation:rotate-the-object .2s 1;animation:rotate-the-object .2s 1}.emuwebapp-level-button{float:left;width:20px;height:calc(100% / 3);background-color:#fff}.emuwebapp-level-button img{width:20px;height:20px;border-radius:10px;vertical-align:middle}.emuwebapp-level-button img:hover{background-color:#0DC5FF}.emuwebapp-canvasSelectors{width:calc(100% - 40px);text-align:center;padding:0;margin-left:5px}.emuwebapp-canvasSelectors div{display:inline-block;padding-left:5px;padding-right:5px}.emuwebapp-canvasSelectors ul{list-style:none;padding:0;margin:0 0 0 0}.emuwebapp-canvasSelectors ul li{display:inline;margin:0 0 0 0}.emuwebapp-canvasSelectors button{padding:0;height:8px;width:8px;border-radius:50%;border:1px solid #424242}.emuwebapp-canvasSelectors button:hover{border:1px solid #0DC5FF}.emuwebapp-canvasSelectors button:focus{outline:none}\n", ""]);
+exports.push([module.i, ".emuwebapp-level{width:100%;height:64px}.emuwebapp-level .emuwebapp-level-container{position:relative;float:left;width:calc(100% - 10px);height:100%;padding:5px}.emuwebapp-level .emuwebapp-level-canvas{float:left;margin:0;width:100%;height:100%;z-index:1}.emuwebapp-level .emuwebapp-level-markup{position:absolute;top:5px;left:5px;background-color:transparent;width:calc(100% - 10px);height:calc(100% - 10px);z-index:2}.emuwebapp-level .emuwebapp-level-buttons{float:left;width:10px;height:100%}@-webkit-keyframes rotate-the-object{0%{-webkit-transform:rotateX(0deg);-ms-transform:rotateX(0deg);-moz-transform:rotateX(0deg);-o-transform:rotateX(0deg);transform:rotateX(0deg)}100%{-webkit-transform:rotateX(180deg);-ms-transform:rotateX(180deg);-moz-transform:rotateX(180deg);-o-transform:rotateX(180deg);transform:rotateX(180deg)}}@-moz-keyframes rotate-the-object{0%{-webkit-transform:rotateX(0deg);-ms-transform:rotateX(0deg);-moz-transform:rotateX(0deg);-o-transform:rotateX(0deg);transform:rotateX(0deg)}100%{-webkit-transform:rotateX(180deg);-ms-transform:rotateX(180deg);-moz-transform:rotateX(180deg);-o-transform:rotateX(180deg);transform:rotateX(180deg)}}@-ms-keyframes rotate-the-object{0%{-webkit-transform:rotateX(0deg);-ms-transform:rotateX(0deg);-moz-transform:rotateX(0deg);-o-transform:rotateX(0deg);transform:rotateX(0deg)}100%{-webkit-transform:rotateX(180deg);-ms-transform:rotateX(180deg);-moz-transform:rotateX(180deg);-o-transform:rotateX(180deg);transform:rotateX(180deg)}}@-o-keyframes rotate-the-object{0%{-webkit-transform:rotateX(0deg);-ms-transform:rotateX(0deg);-moz-transform:rotateX(0deg);-o-transform:rotateX(0deg);transform:rotateX(0deg)}100%{-webkit-transform:rotateX(180deg);-ms-transform:rotateX(180deg);-moz-transform:rotateX(180deg);-o-transform:rotateX(180deg);transform:rotateX(180deg)}}@keyframes rotate-the-object{0%{-webkit-transform:rotateX(0deg);-ms-transform:rotateX(0deg);-moz-transform:rotateX(0deg);-o-transform:rotateX(0deg);transform:rotateX(0deg)}100%{-webkit-transform:rotateX(180deg);-ms-transform:rotateX(180deg);-moz-transform:rotateX(180deg);-o-transform:rotateX(180deg);transform:rotateX(180deg)}}.emuwebapp-level-animation{-webkit-animation:rotate-the-object .2s 1;-moz-animation:rotate-the-object .2s 1;-o-animation:rotate-the-object .2s 1;animation:rotate-the-object .2s 1}.emuwebapp-level-button{float:left;width:20px;height:calc(100% / 3);background-color:#fff}.emuwebapp-level-button img{width:20px;height:20px;border-radius:10px;vertical-align:middle}.emuwebapp-level-button img:hover{background-color:#0DC5FF}.emuwebapp-canvasSelectors{width:calc(100% - 40px);text-align:center;padding:0;margin-left:5px}.emuwebapp-canvasSelectors div{display:inline-block;padding-left:5px;padding-right:5px}.emuwebapp-canvasSelectors ul{list-style:none;padding:0;margin:0 0 0 0}.emuwebapp-canvasSelectors ul li{display:inline;margin:0 0 0 0}.emuwebapp-canvasSelectors button{padding:0;height:8px;width:8px;border-radius:50%;border:1px solid #424242}.emuwebapp-canvasSelectors button:hover{border:1px solid #0DC5FF}.emuwebapp-canvasSelectors button:focus{outline:none}\n", ""]);
 // Exports
 exports.locals = {
 	"colorBlack": "#000",
@@ -137435,6 +137435,9 @@ var DotsCanvasComponent = {
             // frame nr
             var xsRaSt = this.SsffDataService.getSampleRateAndStartTimeOfTrack(dD.dots[0].xSsffTrack); // use first track for sample numbers
             var ysRaSt = this.SsffDataService.getSampleRateAndStartTimeOfTrack(dD.dots[0].ySsffTrack);
+            if (typeof (xsRaSt) === 'undefined' || typeof (ysRaSt) === 'undefined') {
+                return (1);
+            }
             //var sInterv = (1 / xsRaSt.sampleRate);
             var curMousePosTime = this.ViewStateService.curMousePosSample / this.SoundHandlerService.audioBuffer.sampleRate;
             var curFrame;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "emuwebapp",
-  "version": "1.3.4",
+  "version": "1.3.5",
   "description": "The EMU-webApp is an online and offline Web-App for labeling, visualizing and correcting speech and derived speech data.",
   "main": "app/scripts/app.js",
   "author": "Raphael Winkelmann, Georg Raess",
@@ -75,7 +75,7 @@
     "resolve-url-loader": "^3.1.1",
     "rimraf": "^3.0.2",
     "sass-loader": "^8.0.2",
-    "serve": "^11.3.0",
+    "serve": "^11.3.2",
     "serve-static": "^1.11.1",
     "style-loader": "^1.1.3",
     "time-grunt": "^1.0.0",

src/NEWS.md

@@ -1,5 +1,13 @@
 # What's New
 
+## Version 1.3.5
+
+### new features / performance tweaks / improvements
+
+### bug fixes
+
+- fixed border causing negative mouse x pos values
+
 ## Version 1.3.4
 
 ### new features / performance tweaks / improvements

src/app/components/dots-canvas.component.ts

@@ -271,6 +271,10 @@ let DotsCanvasComponent = {
             // frame nr
             var xsRaSt = this.SsffDataService.getSampleRateAndStartTimeOfTrack(dD.dots[0].xSsffTrack); // use first track for sample numbers
             var ysRaSt = this.SsffDataService.getSampleRateAndStartTimeOfTrack(dD.dots[0].ySsffTrack);
+
+            if(typeof(xsRaSt) === 'undefined' || typeof(ysRaSt) === 'undefined'){
+                return(1)
+            }
 
             //var sInterv = (1 / xsRaSt.sampleRate);
             var curMousePosTime = this.ViewStateService.curMousePosSample / this.SoundHandlerService.audioBuffer.sampleRate;

src/styles/levels.scss

@@ -10,31 +10,6 @@
 .emuwebapp-level {
     width: 100%;
     height: 64px;
-    // .emuwebapp-hierarchy-container {
-    //     position: relative;
-    //     float:left;
-    //     width: calc(100% - 30px);
-    //     height: 100%;
-    //     padding: 5px;
-    // }
-    // .emuwebapp-hierarchy-canvas {
-    //     float: left;
-    //     margin: 0;
-    //     border: 1px solid $color-grey;
-    //     width: 100%;
-    //     height: 100%;
-    //     z-index: 1;
-    // }
-    // .emuwebapp-hierarchy-markup {
-    //     position: absolute;
-    //     top: 5px;
-    //     left: 5px;
-    //     background-color: transparent;
-    //     border: 1px solid $color-grey;
-    //     width:calc(100% - 10px);
-    //     height: calc(100% - 10px);
-    //     z-index: 2;
-    // }
 
     .emuwebapp-level-container {
         position: relative;
@@ -46,7 +21,7 @@
     .emuwebapp-level-canvas {
         float: left;
         margin: 0;
-        border: 1px solid $color-grey;
+        // border: 1px solid $color-grey;
         width: 100%;
         height: 100%;
         z-index: 1;
@@ -56,7 +31,7 @@
         top: 5px;
         left: 5px;
         background-color: transparent;
-        border: 1px solid $color-grey;
+        // border: 1px solid $color-grey;
         width:calc(100% - 10px);
         height: calc(100% - 10px);
         z-index: 2;

src/styles/timeline.scss

@@ -40,15 +40,15 @@
             top: 0; 
             left: 5px;
             background: $color-black;
-            border: 1px solid $color-grey;
+            // border: 1px solid $color-grey;
         }
         .emuwebapp-timelineCanvasSSFF {
             position: absolute;
             top: 0; 
             left: 5px;
             width: calc(100% - 10px) !important;
             z-index: 2;
-            border: 1px solid $color-grey;
+            // border: 1px solid $color-grey;
         }
         .emuwebapp-timelineCanvasMarkup {
             position: absolute;
@@ -57,7 +57,7 @@
             background-color: transparent;
             z-index: 2; 
             width: calc(100% - 10px) !important;   
-            border: 1px solid $color-grey;
+            // border: 1px solid $color-grey;
         }
     }
     .emuwebapp-timelineCanvasButtons {