Skip to content

Commit b0d8b2a

Browse files
BasicPrimitivesBasicPrimitives
authored
Merge pull request #29 from BasicPrimitives/loops
Added loops optimization demo
2 parents f4d9397 + 9e3640d commit b0d8b2a

106 files changed

Lines changed: 1322 additions & 2040 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎api/api.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
import express from '@feathersjs/express';
22
import feathers from '@feathersjs/feathers';
3-
import socketio from '@feathersjs/socketio';
43
import morgan from 'morgan';
54
import session from 'express-session';
65
import bodyParser from 'body-parser';
76
import cookieParser from 'cookie-parser';
87
import PrettyError from 'pretty-error';
98
import config from './config';
109
import services from './services';
11-
import channels from './channels';
1210

1311
const pretty = new PrettyError();
1412

@@ -34,9 +32,7 @@ app
3432
.use(bodyParser.json())
3533
// Core
3634
.configure(express.rest())
37-
.configure(socketio({ path: '/ws' }))
3835
.configure(services)
39-
.configure(channels)
4036
// Final handlers
4137
.use(express.notFound())
4238
.use(

‎api/channels.js‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

‎api/services/custom/index.js‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎api/services/demofamilycharts/data/alignmentData.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,12 @@ export default {
55
annotations: [
66
{
77
annotationType: primitives.common.AnnotationType.Connector,
8+
connectorPlacementType: primitives.common.ConnectorPlacementType.Offbeat,
9+
labelPlacementType: primitives.common.ConnectorLabelPlacementType.Between,
10+
zOrderType: primitives.common.ZOrderType.Foreground,
811
fromItem: 2,
912
toItem: 5,
10-
label: {color:"red", badge: "1", title: "Connector annotation"},
13+
label: { color: "red", badge: "1", title: "Connector annotation" },
1114
labelSize: { width: 80, height: 30 }, // new primitives.common.Size(80, 30)
1215
connectorShapeType: primitives.common.ConnectorShapeType.OneWay,
1316
color: primitives.common.Colors.Red,

‎api/services/demofamilycharts/data/crossShape.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,12 @@ export default {
55
annotations: [
66
{
77
annotationType: primitives.common.AnnotationType.Connector,
8+
connectorPlacementType: primitives.common.ConnectorPlacementType.Offbeat,
9+
labelPlacementType: primitives.common.ConnectorLabelPlacementType.Between,
10+
zOrderType: primitives.common.ZOrderType.Foreground,
811
fromItem: 2,
912
toItem: 1,
10-
label: {color:"red", badge: "1", title: "Connector annotation"},
13+
label: { color: "red", badge: "1", title: "Connector annotation" },
1114
labelSize: { width: 80, height: 30 }, // new primitives.common.Size(80, 30)
1215
connectorShapeType: primitives.common.ConnectorShapeType.OneWay,
1316
color: primitives.common.Colors.Red,

‎api/services/demofamilycharts/data/famSpouses.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,12 @@ export default {
55
annotations: [
66
{
77
annotationType: primitives.common.AnnotationType.Connector,
8+
connectorPlacementType: primitives.common.ConnectorPlacementType.Offbeat,
9+
labelPlacementType: primitives.common.ConnectorLabelPlacementType.Between,
10+
zOrderType: primitives.common.ZOrderType.Foreground,
811
fromItem: 5,
912
toItem: 8,
10-
label: {color:"red", badge: "1", title: "Connector annotation"},
13+
label: { color: "red", badge: "1", title: "Connector annotation" },
1114
labelSize: { width: 80, height: 30 }, // new primitives.common.Size(80, 30)
1215
connectorShapeType: primitives.common.ConnectorShapeType.OneWay,
1316
color: primitives.common.Colors.Red,

‎api/services/demofamilycharts/data/famdata.js‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,12 @@ export default {
55
annotations: [
66
{
77
annotationType: primitives.common.AnnotationType.Connector,
8+
connectorPlacementType: primitives.common.ConnectorPlacementType.Offbeat,
9+
labelPlacementType: primitives.common.ConnectorLabelPlacementType.Between,
10+
zOrderType: primitives.common.ZOrderType.Foreground,
811
fromItem: 5,
912
toItem: 81,
10-
label: {color:"red", badge: "1", title: "Connector annotation"},
13+
label: { color: "red", badge: "1", title: "Connector annotation" },
1114
labelSize: { width: 80, height: 30 }, // new primitives.common.Size(80, 30)
1215
connectorShapeType: primitives.common.ConnectorShapeType.OneWay,
1316
color: primitives.common.Colors.Red,
@@ -27,7 +30,7 @@ export default {
2730
{
2831
annotationType: primitives.common.AnnotationType.Shape,
2932
items: [5],
30-
label: {color:"red", badge: "3", title: "Cross Out shape annotation"},
33+
label: { color: "red", badge: "3", title: "Cross Out shape annotation" },
3134
labelSize: { width: 120, height: 50 }, // new primitives.common.Size(120, 50)
3235
shapeType: primitives.common.ShapeType.CrossOut,
3336
borderColor: primitives.common.Colors.Red,
@@ -44,7 +47,7 @@ export default {
4447
{
4548
annotationType: primitives.common.AnnotationType.Shape,
4649
items: [81],
47-
label: {color:"red", badge: "4", title: "Oval shape annotation"},
50+
label: { color: "red", badge: "4", title: "Oval shape annotation" },
4851
labelSize: new primitives.common.Size(100, 50), // new primitives.common.Size(100, 50)
4952
shapeType: primitives.common.ShapeType.Oval,
5053
borderColor: primitives.common.Colors.Red,

‎api/services/demofamilycharts/data/famdata2.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,12 @@ export default {
55
annotations: [
66
{
77
annotationType: primitives.common.AnnotationType.Connector,
8+
connectorPlacementType: primitives.common.ConnectorPlacementType.Offbeat,
9+
labelPlacementType: primitives.common.ConnectorLabelPlacementType.Between,
10+
zOrderType: primitives.common.ZOrderType.Foreground,
811
fromItem: 1,
912
toItem: 15,
10-
label: {color:"red", badge: "1", title: "Connector annotation"},
13+
label: { color: "red", badge: "1", title: "Connector annotation" },
1114
labelSize: { width: 80, height: 30 }, // new primitives.common.Size(80, 30)
1215
connectorShapeType: primitives.common.ConnectorShapeType.OneWay,
1316
color: primitives.common.Colors.Red,

‎api/services/demofamilycharts/data/famdataCascade.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,12 @@ export default {
55
annotations: [
66
{
77
annotationType: primitives.common.AnnotationType.Connector,
8+
connectorPlacementType: primitives.common.ConnectorPlacementType.Offbeat,
9+
labelPlacementType: primitives.common.ConnectorLabelPlacementType.Between,
10+
zOrderType: primitives.common.ZOrderType.Foreground,
811
fromItem: 10,
912
toItem: 5,
10-
label: {color:"red", badge: "1", title: "Connector annotation"},
13+
label: { color: "red", badge: "1", title: "Connector annotation" },
1114
labelSize: { width: 80, height: 30 }, // new primitives.common.Size(80, 30)
1215
connectorShapeType: primitives.common.ConnectorShapeType.OneWay,
1316
color: primitives.common.Colors.Red,

‎api/services/demofamilycharts/data/famdataCharless2.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,12 @@ export default {
66
annotations: [
77
{
88
annotationType: primitives.common.AnnotationType.Connector,
9+
connectorPlacementType: primitives.common.ConnectorPlacementType.Offbeat,
10+
labelPlacementType: primitives.common.ConnectorLabelPlacementType.Between,
11+
zOrderType: primitives.common.ZOrderType.Foreground,
912
fromItem: 3,
1013
toItem: 4,
11-
label: {color:"red", badge: "1", title: ""},
14+
label: { color: "red", badge: "1", title: "" },
1215
labelSize: { width: 30, height: 30 }, // new primitives.common.Size(80, 30)
1316
connectorShapeType: primitives.common.ConnectorShapeType.OneWay,
1417
color: primitives.common.Colors.Red,

0 commit comments

Comments
 (0)