Merge branch 'master' into dataServiceRef

CHANGELOG.md

@@ -6,15 +6,27 @@ and this project adheres to [Semantic Versioning](http://semver.org/)
 
 ## [Unreleased]
 ### Added
+
+### Changed
+
+### Removed
+
+### Fixed
+
+## [1.5.0] - 2017-10-24
+### Added
 - experimental delta functionality
 - loading multiple maps
 - experimental margin slider
 
 ### Changed
+- faster rendering
 
 ### Removed
+- nwjs packages and native apps due to a bug
 
 ### Fixed
+- using color metric instead of height metric for color range slider ceil
 
 ## [1.4.0] - 2017-09-14
 ### Added

analysis/gradle.properties

@@ -1,6 +1,6 @@
 # Project-wide Gradle settings.
 
-currentVersion=1.4.0
+currentVersion=1.5.0
 
 # The Gradle daemon aims to improve the startup and execution time of Gradle.
 # When set to true the Gradle daemon is to run the build.

visualization/Gruntfile.js

@@ -125,7 +125,7 @@ module.exports = function (grunt) {
     grunt.registerTask("default", ["build"]);
     grunt.registerTask("build", ["clean:webpack", "webpack:prod"]);
     grunt.registerTask("serve", ["clean:webpack", "webpack:dev"]);
-    grunt.registerTask("package", ["clean:package", "nwjs", "force:compress", "clean:packageTmp"]);
+    grunt.registerTask("package", ["clean:package", /*"nwjs",*/ "compress:web", "clean:packageTmp"]);
     grunt.registerTask("doc", ["clean:doc", "exec:doc"]);
     grunt.registerTask("test", ["clean:coverage", "clean:reports", "exec:karmaSingle"]);
     grunt.registerTask("test:auto", ["clean:coverage", "clean:reports", "exec:karmaAuto"]);

visualization/app/codeCharta/codeChartaController.js

@@ -41,6 +41,7 @@ class CodeChartaController {
                 // set loaded data
                 dataLoadingService.loadMapFromFileContent(urlService.getParam("file"), data, 0).then(
                     () => {
+                        ctx.loadingFinished();
                         settingsService.updateSettingsFromUrl();
                     },
                     (r) => {

visualization/app/codeCharta/codeChartaController.spec.js

@@ -78,8 +78,14 @@ describe("app.codeCharta.codeChartaController", function() {
             .respond(200, "someData");
 
         dataService.setFileData = sinon.spy();
+        dataService.setReferenceMap = sinon.spy();
+        dataService.setComparisonMap = sinon.spy();
+        settingsService.applySettings = sinon.spy();
         codeChartaController = $controller("codeChartaController", {dataService: dataService, urlService: urlService, settingsService:settingsService, scenarioService:scenarioService});
         expect(dataService.setFileData.calledWithExactly("someData"));
+        expect(dataService.setComparisonMap.called);
+        expect(dataService.setReferenceMap.called);
+        expect(settingsService.applySettings.called);
 
     });
 
@@ -95,10 +101,18 @@ describe("app.codeCharta.codeChartaController", function() {
             .respond(200, "someData");
 
         settingsService.onSettingsChanged = sinon.spy();
+        dataService.setFileData = sinon.spy();
+        dataService.setReferenceMap = sinon.spy();
+        dataService.setComparisonMap = sinon.spy();
+        settingsService.applySettings = sinon.spy();
 
         codeChartaController = $controller("codeChartaController", {dataService: dataService, urlService: urlService, settingsService:settingsService, scenarioService:scenarioService});
 
+        expect(dataService.setFileData.calledWithExactly("someData"));
         expect(settingsService.onSettingsChanged.calledOnce);
+        expect(dataService.setComparisonMap.called);
+        expect(dataService.setReferenceMap.called);
+        expect(settingsService.applySettings.called);
 
     });
 

visualization/app/codeCharta/codeMap/codeMap.js

@@ -8,7 +8,7 @@ import "../core/core.js";
 import {CodeMapDirective} from "./codeMapDirective.js";
 import {CodeMapService} from "./codeMapService.js";
 import {CodeMapAssetService} from "./codeMapAssetService.js";
-import {CodeMapController} from "./codeMapController";
+import {CodeMapController} from "./codeMapController.js";
 
 angular.module("app.codeCharta.codeMap",["app.codeCharta.codeMap.threeViewer", "app.codeCharta.core"]);
 

visualization/app/codeCharta/codeMap/codeMapController.js

@@ -1,7 +1,5 @@
 "use strict";
 
-import * as THREE from "three";
-
 /**
  * Controls the codeMapDirective
  */
@@ -57,12 +55,6 @@ class CodeMapController {
          */
         this.$rootScope = $rootScope;
 
-        /**
-         *
-         * @type {Raycaster}
-         */
-        this.raycaster = new THREE.Raycaster();
-
         /**
          * current mouse position
          * @type {{x: number, y: number}}
@@ -73,7 +65,6 @@ class CodeMapController {
         document.addEventListener("click", this.onDocumentMouseDown.bind(this), false);
 
         threeUpdateCycleService.updatables.push(this.update.bind(this));
-
     }
 
     /**
@@ -82,27 +73,27 @@ class CodeMapController {
     update() {
         this.cameraService.camera.updateMatrixWorld();
 
-        this.raycaster.setFromCamera(this.mouse, this.cameraService.camera);
-
-        var intersects = this.raycaster.intersectObjects(this.sceneService.scene.children, true);
+        if (this.sceneService.getMapMesh() != null)
+        {
+            let intersectionResult = this.sceneService.getMapMesh().checkMouseRayMeshIntersection(this.mouse, this.cameraService.camera);
 
-        var from = this.hovered;
+            let from = this.hovered;
+            let to = null;
 
-        if ( intersects.length > 0 ) {
+            if (intersectionResult.intersectionFound == true)
+            {
+                to = intersectionResult.building;
+            }
+            else
+            {
+                to = null;
+            }
 
-            if ( this.hovered !== intersects[ 0 ].object) {
-                this.hovered =intersects[ 0 ].object;
-                this.onBuildingHovered(from, this.hovered);
-                /**
-                 * a lock to prevent event spamming
-                 * @type {boolean}
-                 */
-                this.lock = false;
+            if (from != to)
+            {
+                this.onBuildingHovered(from, to);
+                this.hovered = to;
             }
-        } else if(!this.lock){
-            this.hovered = null;
-            this.onBuildingHovered(from, null);
-            this.lock = true;
         }
     }
 
@@ -119,7 +110,6 @@ class CodeMapController {
      * updates {CodeMapController} on mouse down
      */
     onDocumentMouseDown() {
-
         var from = this.selected;
 
         if (this.hovered) {
@@ -141,7 +131,6 @@ class CodeMapController {
      * @emits {building-hovered} on hover
      */
     onBuildingHovered(from, to){
-
         /*
         if the hovered node does not have useful data, then we should look at its parent. If the parent has useful data
         then this parent is a delta node which is made of two seperate, data-free nodes. This quick fix helps us to
@@ -156,103 +145,14 @@ class CodeMapController {
 
         this.$rootScope.$broadcast("building-hovered", {to: to, from: from});
 
-        this.unhoverGroup(from);
-        this.hoverGroup(to);
-
-    }
-
-    /**
-     * Unhovers a group
-     * @param {object} mesh
-     */
-    unhoverGroup(mesh) {
-
-        let ctx = this;
-
-        if(mesh && mesh.parent) {
-            // buildings are grouped in parent meshes, therefore we should look only at these
-
-            mesh.parent.children.forEach((c)=> {
-                if (c && c.material && c.material.emissive){
-                    c.material.emissive.setHex(0x000000);
-                }
-            });
-
+        if (to !== null)
+        {
+            this.sceneService.getMapMesh().setHighlighted([to]);
         }
-
-    }
-
-    /**
-     * Checks if the given mesh is in meshes array. Ignores itself in meshes array
-     * @param {object} meshes
-     * @param {object} mesh
-     * @param {object} current
-     * @return {boolean} true if found, false if not
-     */
-    meshIsInMeshesWithoutCurrent(meshes, mesh, current){
-        meshes.forEach((m)=>{
-            if (m===mesh && m!==current){
-                return true;
-            }
-        });
-        return false;
-    }
-
-    /**
-     * Hovers a group.
-     * @param {object} mesh
-     */
-    hoverGroup(mesh) {
-
-        if(mesh && mesh.parent){
-            // buildings are grouped in parent meshes, therefore we should look only at these
-            mesh.parent.children.forEach((c)=>{
-                if (c && c.material && c.material.emissive) {
-                    c.material.emissive.setHex(0x666666);
-                }
-            });
-
-        }
-
-    }
-
-    /**
-     * unselects a group
-     * @param {object} mesh
-     */
-    unselectGroup(mesh) {
-
-        if (mesh && mesh.parent) {
-
-            // buildings are grouped in parent meshes, therefore we should look only at these
-            mesh.parent.children.forEach((c)=> {
-                if (c && c.originalMaterial) {
-                    c.material = c.originalMaterial.clone();
-                }
-            });
-
+        else
+        {
+            this.sceneService.getMapMesh().clearHighlight();
         }
-
-    }
-
-    /**
-     * selects a group
-     * @param {object} mesh
-     */
-    selectGroup(mesh) {
-
-        // the floors parent is root and floors do not have deltacubes.
-        if(mesh && mesh.parent) {
-
-            // buildings are grouped in parent meshes, therefore we should look only at these
-            mesh.parent.children.forEach((c)=> {
-                if (c && c.selectedMaterial) {
-                    c.material = c.selectedMaterial.clone();
-                }
-            });
-
-        }
-
     }
 
     /**
@@ -262,12 +162,16 @@ class CodeMapController {
      * @emits {building-selected} when building is selected
      */
     onBuildingSelected(from, to){
-
         this.$rootScope.$broadcast("building-selected", {to: to, from:from});
 
-        this.unselectGroup(from);
-        this.selectGroup(to);
-
+        if (to !== null)
+        {
+            this.sceneService.getMapMesh().setSelected([to]);
+        }
+        else
+        {
+            this.sceneService.getMapMesh().clearSelected();
+        }
     }
 
 }