Skip to content

Reworked connector annotation control #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BasicPrimitives merged 1 commit into from
Jun 15, 2025
Merged

Reworked connector annotation control #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "basicprimitives",
"sideEffects": false,
"homepage": "https://www.basicprimitives.com/",
"version": "6.6.0",
"version": "6.6.1",
"author": "Basic Primitives Inc. <support@basicprimitives.com> (https://www.basicprimitives.com)",
"description": "Basic Primitives Diagrams for JavaScript - data visualization components library that implements organizational chart and multi-parent dependency diagrams, contains implementations of JavaScript Controls and PDF rendering plugins.",
"repository": {
Expand Down
132 changes: 9 additions & 123 deletions src/ConnectorAnnotationControl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
import Rect from './graphics/structs/Rect';
import PaletteItem from './graphics/structs/PaletteItem';
import { ConnectorPlacementType } from './enums';
import createGraphics from './graphics/createGraphics';
import { getFixOfPixelAlignment, getInnerSize, getElementOffset } from './graphics/dom';
import { getFixOfPixelAlignment, getInnerSize } from './graphics/dom';
import JsonML from './common/jsonml-html';
import Transform from './graphics/Transform';
import PolylinesBuffer from './graphics/structs/PolylinesBuffer';
import ConnectorAnnotationOffsetResolver from './tasks/renders/offsetResolver/ConnectorAnnotationOffsetResolver';
import ConnectorOffbeat from './graphics/shapes/ConnectorOffbeat';
import ConnectorStraight from './graphics/shapes/ConnectorStraight';
import ConnectorAnnotation from './graphics/annotations/ConnectorAnnotation';
import AnnotationLabelTemplate from './templates/html/AnnotationLabelTemplate';
import { isNullOrEmpty } from './common';
import RenderEventArgs from './events/RenderEventArgs';

/**
* Creates JavaScript Connector Annotation Control
Expand All @@ -30,7 +22,8 @@ export default function ConnectorAnnotationControl(element, options) {
placeholder: null,
panelSize: null,
graphics: null,
labelTemplate: null
labelTemplate: null,
connector: null
};

if(!element) {
Expand Down Expand Up @@ -70,6 +63,7 @@ export default function ConnectorAnnotationControl(element, options) {
);

_data.graphics = createGraphics(_data.element);
_data.connector = new ConnectorAnnotation();
};

function cleanLayout() {
Expand Down Expand Up @@ -106,127 +100,19 @@ export default function ConnectorAnnotationControl(element, options) {
_data.labelTemplate = AnnotationLabelTemplate(_data.options);
cleanLayout();
createLayout();
redraw();
_data.graphics.begin();
_data.connector.draw(_data.options, _data.graphics, _data.panelSize, _data.labelTemplate);
_data.graphics.end();
}
else {
updateLayout();
_data.graphics.resize("placeholder", _data.panelSize.width, _data.panelSize.height);
_data.graphics.begin();
redraw();
_data.connector.draw(_data.options, _data.graphics, _data.panelSize, _data.labelTemplate);
_data.graphics.end();
}
}

function redraw() {
var annotationConfig = _data.options,
shape,
uiHash,
transform = new Transform(),
panel = _data.graphics.activate("placeholder"),
buffer = new PolylinesBuffer(),
connectorAnnotationOffsetResolver = ConnectorAnnotationOffsetResolver();

transform.size = new Size(_data.panelSize.width, _data.panelSize.height);
transform.setOrientation(annotationConfig.orientationType);

if (annotationConfig.fromRectangle != null && annotationConfig.toRectangle != null) {
var fromRect = annotationConfig.fromRectangle,
toRect = annotationConfig.toRectangle;

/* translate rectangles to Top orientation */
/* from rectangle */
transform.transformRect(fromRect.x, fromRect.y, fromRect.width, fromRect.height, false,
this, function (x, y, width, height) {
fromRect = new Rect(x, y, width, height);
});

/* to rectangle */
transform.transformRect(toRect.x, toRect.y, toRect.width, toRect.height, false,
this, function (x, y, width, height) {
toRect = new Rect(x, y, width, height);
});

switch (annotationConfig.connectorPlacementType) {
case ConnectorPlacementType.Offbeat:
shape = new ConnectorOffbeat();
break;
case ConnectorPlacementType.Straight:
shape = new ConnectorStraight();
break;
}

/* rotate label size to user orientation */
var labelSize;
transform.transformRect(0, 0, annotationConfig.labelSize.width, annotationConfig.labelSize.height, false,
this, function (x, y, width, height) {
labelSize = new Size(width, height);
});

/* rotate panel size to user orientation */
var panelSize = null;
transform.transformRect(0, 0, panel.size.width, panel.size.height, false,
this, function (x, y, width, height) {
panelSize = new Size(width, height);
});

var linePaletteItem = new PaletteItem({
lineColor: annotationConfig.color,
lineWidth: annotationConfig.lineWidth,
lineType: annotationConfig.lineType
});

var hasLabel = !isNullOrEmpty(annotationConfig.label);

/* offset rectangles */
fromRect = new Rect(fromRect).offset(annotationConfig.offset);
toRect = new Rect(toRect).offset(annotationConfig.offset);

var linesOffset = annotationConfig.lineWidth * 6;

/* create connection lines */
shape.draw(buffer, linePaletteItem, fromRect, toRect, linesOffset, 0, labelSize, panelSize,
annotationConfig.connectorShapeType, annotationConfig.labelOffset, annotationConfig.labelPlacementType, hasLabel,
connectorAnnotationOffsetResolver, function (labelPlacement, labelConfig) {
var hasLabel = !isNullOrEmpty(labelConfig.label);
if (hasLabel && labelPlacement != null) {
/* translate result label placement back to users orientation */
transform.transformRect(labelPlacement.x, labelPlacement.y, labelPlacement.width, labelPlacement.height, true,
self, function (x, y, width, height) {
labelPlacement = new Rect(x, y, width, height);
});

uiHash = new RenderEventArgs();
uiHash.context = labelConfig;

/* draw label */
_data.graphics.template(
labelPlacement.x
, labelPlacement.y
, 0
, 0
, 0
, 0
, labelPlacement.width
, labelPlacement.height
, _data.labelTemplate.template()
, _data.labelTemplate.getHashCode()
, _data.labelTemplate.render
, uiHash
, null
);
}
}, annotationConfig);
connectorAnnotationOffsetResolver.resolve();
}

/* translate result polylines back to users orientation */
buffer.transform(transform, true);
/* draw background polylines */
_data.graphics.polylinesBuffer(buffer);

_data.graphics.end();
}

function destroy() {
cleanLayout();
};
Expand Down
4 changes: 0 additions & 4 deletions src/RotatedTextControl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@ import Rect from './graphics/structs/Rect';
import createGraphics from './graphics/createGraphics';
import { getFixOfPixelAlignment, getInnerSize } from './graphics/dom';
import JsonML from './common/jsonml-html';
import Transform from './graphics/Transform';
import Shape from './graphics/shapes/Shape';
import AnnotationLabelTemplate from './templates/html/AnnotationLabelTemplate';
import { isNullOrEmpty } from './common';
import RenderEventArgs from './events/RenderEventArgs';

/**
* Creates JavaScript Rotated Text Control
Expand Down
60 changes: 6 additions & 54 deletions src/ShapeAnnotationControl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,8 @@ import Rect from './graphics/structs/Rect';
import createGraphics from './graphics/createGraphics';
import { getFixOfPixelAlignment, getInnerSize } from './graphics/dom';
import JsonML from './common/jsonml-html';
import Transform from './graphics/Transform';
import Shape from './graphics/shapes/Shape';
import ShapeAnnotation from './graphics/annotations/ShapeAnnotation';
import AnnotationLabelTemplate from './templates/html/AnnotationLabelTemplate';
import { isNullOrEmpty } from './common';
import RenderEventArgs from './events/RenderEventArgs';

/**
* Creates JavaScript Shape Annotation Control
Expand All @@ -25,7 +22,8 @@ export default function ShapeAnnotationControl(element, options) {
placeholder: null,
panelSize: null,
graphics: null,
labelTemplate: null
labelTemplate: null,
shape: null
};

if(!element) {
Expand Down Expand Up @@ -65,6 +63,7 @@ export default function ShapeAnnotationControl(element, options) {
);

_data.graphics = createGraphics(_data.element);
_data.shape = new ShapeAnnotation();
};

function cleanLayout() {
Expand Down Expand Up @@ -101,64 +100,17 @@ export default function ShapeAnnotationControl(element, options) {
_data.labelTemplate = AnnotationLabelTemplate(_data.options);
cleanLayout();
createLayout();
redraw();
_data.shape.draw(_data.options, _data.graphics, _data.panelSize, _data.labelTemplate);
}
else {
updateLayout();
_data.graphics.resize("placeholder", _data.panelSize.width, _data.panelSize.height);
_data.graphics.begin();
redraw();
_data.shape.draw(_data.options, _data.graphics, _data.panelSize, _data.labelTemplate);
_data.graphics.end();
}
}

function redraw() {
var annotationConfig = _data.options,
shape,
uiHash,
transform = new Transform(),
panel = _data.graphics.activate("placeholder");

transform.size = new Size(_data.panelSize.width, _data.panelSize.height);
transform.setOrientation(annotationConfig.orientationType);

if (annotationConfig.position != null) {
shape = new Shape(_data.graphics);
primitives.mergeObjects(shape, options);

/* rotate label size to user orientation */
transform.transformRect(0, 0, annotationConfig.labelSize.width, annotationConfig.labelSize.height, false,
this, function (x, y, width, height) {
shape.labelSize = new Size(width, height);
});

/* rotate panel size to user orientation */
transform.transformRect(0, 0, panel.size.width, panel.size.height, false,
this, function (x, y, width, height) {
shape.panelSize = new Size(width, height);
});

shape.hasLabel = !isNullOrEmpty(annotationConfig.label);

var position = annotationConfig.position;

/* translate position to Top orientation */
transform.transformRect(position.x, position.y, position.width, position.height, false,
this, function (x, y, width, height) {
position = new Rect(x, y, width, height);
});

/* offset position */
position = new Rect(annotationConfig.position).offset(annotationConfig.offset);

shape.labelTemplate = _data.labelTemplate;

uiHash = new RenderEventArgs();
uiHash.context = annotationConfig;
shape.draw(position, uiHash);
}
}

function destroy() {
cleanLayout();
};
Expand Down
2 changes: 1 addition & 1 deletion src/configs/RotatedTextControlConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {VerticalAlignmentType, TextOrientationType, HorizontalAlignmentType} from '../enums';
import {VerticalAlignmentType, TextOrientationType, HorizontalAlignmentType, Colors} from '../enums';

/**
* @class RotatedTextControlConfig
Expand Down
Loading