Skip to content

Commit

Permalink
build version 1.2.6
Browse files Browse the repository at this point in the history
  • Loading branch information
raphywink committed Mar 25, 2020
1 parent 93be61f commit 48df52f
Show file tree
Hide file tree
Showing 7 changed files with 1,472 additions and 1,359 deletions.
3 changes: 2 additions & 1 deletion app/NEWS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# What's New

## Version 1.2.6.9000
## Version 1.2.6

### bug fixes

Expand All @@ -10,6 +10,7 @@
- fixed help if comMode ist GITLAB
- fixed requestAnimationFrame binding of this
- D3 hierarchy SVG now a component
- emuhierarchy directive now a component


## Version 1.2.5
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/components/emuhierarchy.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ let EmuHierarchyComponent = {
//////////////////////
// helper functions

private checkLink(event) {
public checkLink(event) {
if (event.shiftKey && !this.shiftMode) {
if (this.ViewStateService.hierarchyState.newLinkFromID === undefined) {
this.ViewStateService.hierarchyState.newLinkFromID = this.ViewStateService.hierarchyState.selectedItemID;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -451,34 +451,36 @@ function generateUUID() {
var _this = this;
childLevel.items.forEach(function (item) {
var parentIds = _this.linkHashMap.get(item.id);
parentIds.forEach(function (parentId) {
var parentItem = _this.idHashMap.get(parentId);
// console.log(parentId);
// console.log(parentItem);
if (typeof parentItem !== 'undefined') { // as only levels in path are in idHashMap
if (parentItem.labels[0].name === parentLevel.name) {
// append link
annotation.links.push({
fromID: parentId,
toID: item.id
});
// add time info
if (typeof parentItem.sampleStart === 'undefined') {
parentItem.sampleStart = item.sampleStart;
parentItem.sampleDur = item.sampleDur;
if (typeof parentIds !== 'undefined') {
parentIds.forEach(function (parentId) {
var parentItem = _this.idHashMap.get(parentId);
// console.log(parentId);
// console.log(parentItem);
if (typeof parentItem !== 'undefined') { // as only levels in path are in idHashMap
if (parentItem.labels[0].name === parentLevel.name) {
// append link
annotation.links.push({
fromID: parentId,
toID: item.id
});
// add time info
if (typeof parentItem.sampleStart === 'undefined') {
parentItem.sampleStart = item.sampleStart;
parentItem.sampleDur = item.sampleDur;
}
else if (item.sampleStart < parentItem.sampleStart) {
parentItem.sampleStart = item.sampleStart;
}
else if (item.sampleStart + item.sampleDur > parentItem.sampleStart + parentItem.sampleDur) {
parentItem.sampleDur = item.sampleStart + item.sampleDur - parentItem.sampleStart;
}
// append item
parentLevel.items.push(parentItem);
}
else if (item.sampleStart < parentItem.sampleStart) {
parentItem.sampleStart = item.sampleStart;
}
else if (item.sampleStart + item.sampleDur > parentItem.sampleStart + parentItem.sampleDur) {
parentItem.sampleDur = item.sampleStart + item.sampleDur - parentItem.sampleStart;
}
// append item
parentLevel.items.push(parentItem);
}
}
// check if parent is on right level
});
// check if parent is on right level
});
}
});
};
HierarchyWorker.prototype.giveTimeToParents = function (levelName, annotation, subLevelWithTime) {
Expand Down
13 changes: 13 additions & 0 deletions dist/NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# What's New

## Version 1.2.6

### bug fixes


### new features / performance tweaks / improvements

- fixed help if comMode ist GITLAB
- fixed requestAnimationFrame binding of this
- D3 hierarchy SVG now a component
- emuhierarchy directive now a component


## Version 1.2.5

### bug fixes
Expand Down
Loading

0 comments on commit 48df52f

Please sign in to comment.