Commit b38b99d9 authored by Fintan Mc Gee's avatar Fintan Mc Gee

added glyphs fr removingtmeporal layer definition and moving graphs oin aspects combination

parent 361a7c86
......@@ -31,8 +31,12 @@
<div class="row">
<div class="centeredDiv" id = "graphPanel" style = "height: 100%; white-space: nowrap; overflow-x: scroll; overflow-y: hidden;">
<div ng-repeat = "cGraph in model.displayGraphs" style = "display: inline-block; width: 50%; height: 60%;">
<div class="centeredDiv">{{cGraph.graphDisplayName}}</div>
<div ng-repeat = "cGraph in model.displayGraphs track by $index" style = "display: inline-block; width: 50%; height: 60%;">
<div class="centeredDiv">
<button class="btn btn-default" id="leftButton_{{$index}}" title="Remove bounds" ng-click="shiftGraph(false, $index)"><span class="glyphicon glyphicon-arrow-left"></span></button>
{{cGraph.graphDisplayName}}
<button class="btn btn-default" id="rifhtButton_{{$index}}" title="Remove bounds" ng-click="shiftGraph(true,$index)"><span class="glyphicon glyphicon-arrow-right"></span></button>
</div>
<!--<svg-directive class= "bordered-graph-custom_size" givenId="{{cGraph.tagName}}" graphname="{{cGraph.graph}}" combinationName = "{{model.combinationName}}" width=0.45 height = 0.8 selectacrossalllayers = "true"></svg-directive>-->
<svg-labels-directive class= "bordered-graph-custom_size" givenId="{{cGraph.tagName}}" graphname="{{cGraph.graph}}" combinationName = "{{model.combinationName}}" crossgraphmouseover = "true" width=0.45 height = 0.8 selectacrossalllayers = "true"></svg-labels-directive >
</div>
......
......@@ -48,6 +48,7 @@
{{bounds.start}}
</td>
<td>{{bounds.end}} </td>
<td><button class="btn btn-default" id="RemoveButton_{{$index}}" title="Remove bounds" ng-click="clickRemove($index)"><span class="glyphicon glyphicon-remove"></span></button> </td>
</tr>
</table>
......
......@@ -179,7 +179,7 @@ angular.module('blizaarModule.controllers')
//check if a valid name has been selected
var nameSearch = binarySearchTextArray($scope.model.inputName,$scope.model.availableNames),
//first label must be the type of the entity we are querying on
otherTargetLabels = [$scope.model.inputType,"audio","collection","comment","create","date","diagram","epublication","inquiry","institution","location","map","observation","organization","person","photo","place","resource","social_group","table","text","type"],
otherTargetLabels = [$scope.model.inputType,"audio","comment","create","date","diagram","inquiry","institution","location","map","observation","organization","person","photo","place","resource","social_group","table","text","type"],
targetLabels = [],
relationshipTypes = [],
merge = false;
......
......@@ -168,7 +168,7 @@ angular.module('blizaarModule.controllers')
$scope.model.displayGraphs.push({graphDisplayName: combinationLayer.name, graph: combinationLayer.name, tagName:"graph_" + ($scope.model.displayGraphs.length + 1) })
dataService.doServerLayout("Fruchterman-Reingold", combinationLayer.name).then(function() {
layoutCompleteCount++;
console.log("layoutCompleteCount == " + layoutCompleteCount);
//console.log("layoutCompleteCount == " + layoutCompleteCount);
if( layoutCompleteCount === masterGraph.aspectCombinations.length ) {
$scope.refreshGraph();
......@@ -189,6 +189,7 @@ angular.module('blizaarModule.controllers')
}
$scope.clearHighlight = function(clickSelect) {
if(!clickSelect) {
$scope.$broadcast("highlightNodeSet");
......@@ -197,6 +198,25 @@ angular.module('blizaarModule.controllers')
}
}
$scope.shiftGraph = function(shiftRight, index) {
var targetGraph = $scope.model.displayGraphs[index];
if( shiftRight ) {
if( (index +1) <= $scope.model.displayGraphs.length) {
$scope.model.displayGraphs.splice(index,1);
$scope.model.displayGraphs.splice(index + 1, 0, targetGraph);
}
} else {
if( (index - 1) >= 0) {
$scope.model.displayGraphs.splice(index,1);
$scope.model.displayGraphs.splice(index -1, 0,targetGraph);
}
}
$scope.refreshGraph();
}
$scope.$watch('model.selectedLayerLocal', function(newData, oldData){
// layer has changged need to refresh the graph
if(newData !== oldData) {
......
......@@ -261,11 +261,11 @@ angular.module('blizaarModule.controllers')
// createChart();
})
// $scope.$watch('model.selectedLayer', function() {
// $scope.init();
//
// });
//
$scope.clickRemove = function(index) {
console.log("Remove Button Index " + index + "pressed." )
$scope.model.definedLayerBounds.splice(index,1);
}
}]);
\ No newline at end of file
......@@ -29,7 +29,7 @@ angular.module('blizaarModule.directives')
*/
template: '<div class ="centeredDiv"></div>',
link: function (scope, element, params) {
console.log("svg-Labels Directive installed");
//console.log("svg-Labels Directive installed");
scope.setRenderType('SVG');
......@@ -313,9 +313,9 @@ angular.module('blizaarModule.directives')
if(doInititialScaleGraph) {
scope.scaleGraph(graphData, width, height);
doInititialScaleGraph = false;
console.log("Draw count for " + id + ": " + (++drawCount))
// console.log("Draw count for " + id + ": " + (++drawCount))
} else{
console.log("Draw count for " + id + ": " + (++drawCount));
//console.log("Draw count for " + id + ": " + (++drawCount));
}
if(scaleGraph){
scope.scaleGraph(graphData, width, height);
......
......@@ -906,7 +906,7 @@ angular.module('blizaarModule.services')
}
})// Success case
.then(function (response) {
console.log("Updated Node Data of " + response.data.updatedNodeCount + " nodes on the server");
// console.log("Updated Node Data of " + response.data.updatedNodeCount + " nodes on the server");
},
// Error handling
function (err) {
......@@ -1112,7 +1112,7 @@ angular.module('blizaarModule.services')
}
})// Success case
.then(function () {
console.log("Updated Layer successfully ");
// console.log("Updated Layer successfully ");
return true;
},
// Error handling
......@@ -1144,7 +1144,7 @@ angular.module('blizaarModule.services')
}
})// Success case
.then(function () {
console.log("Updated Aspect successfully ");
// console.log("Updated Aspect successfully ");
return true;
},
// Error handling
......
......@@ -320,7 +320,7 @@ angular.module('blizaarModule.services')
tooltipService.clearNodeAttributes()
tooltipService.addNodeAttribute("name");
tooltipService.addNodeAttribute("description");
tooltipService.addNodeAttribute("abstract_en");
//tooltipService.addNodeAttribute("abstract_en");
tooltipService.addNodeAttribute("caption_en");
multiLayerGraphService.getGraph().buildAdjacencyList();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment