implemented multiple properties view by shavkunov · Pull Request #79 · qreal/wmp

shavkunov · 2017-04-01T18:27:12Z

No description provided.

Few fixes for requirejs config to make JointJS load properly. Also jQuery updated to 2.2.4.

…eate-modules

…3/wmp into containers

TanVD

Good. Minor fixes requested.

TanVD · 2017-04-08T16:31:37Z

editor-core/src/main/webapp/app/core/editorCore/model/DefaultDiagramNode.ts

    private imagePath: string;
-    private propertyEditElement: PropertyEditElement;
+    private propertyEditElements: PropertyEditElement[];
+    private delta = 20;


Delta of what? Not very helpful name.

TanVD · 2017-04-08T16:31:52Z

editor-core/src/main/webapp/app/core/editorCore/model/DefaultDiagramNode.ts

-    private propertyEditElement: PropertyEditElement;
+    private propertyEditElements: PropertyEditElement[];
+    private delta = 20;
+    private topIndent = 30;


This name too.

TanVD · 2017-04-08T16:37:01Z

editor-core/src/main/webapp/app/core/editorCore/model/DefaultDiagramNode.ts

+    setPropertyEditElementsPosition(x : number, y : number) : void {
+        let propertiesCount = 0;
+
+        for (let i in this.propertyEditElements) {


You can either use here for ... of construction or use i variable also as propertiesCount

TanVD · 2017-04-08T16:42:17Z

editor-core/src/main/webapp/app/core/editorCore/model/DefaultDiagramNode.ts

-        this.propertyEditElement.setPosition(propertyEditElementX, propertyEditElementY);
+        var propertyEditElementY = parentPosition.y + this.boundingBox.height - this.topIndent;
+
+        for (var propertyKey in this.changeableProperties) {


As IDEA reminds: it's better to use let instead of var cause it behaves more strictly.

TanVD · 2017-04-08T16:44:28Z

editor-core/src/main/webapp/app/core/editorCore/model/DefaultDiagramNode.ts

        var parentPosition = this.getJointObjectPagePosition(zoom);
-        this.propertyEditElement = new PropertyEditElement(this.logicalId, this.jointObject.id,
-            this.changeableProperties);
        var propertyEditElementX = parentPosition.x + (<number> (this.boundingBox.width - 50)/2);


Extract magic number to appropriate constant.

TanVD · 2017-04-08T16:46:31Z

editor-core/src/main/webapp/app/core/editorCore/model/DiagramScene.ts

-            node.getPropertyEditElement().getHtmlElement().remove();
+        if (node.getPropertyEditElements()) {
+            var editElements = node.getPropertyEditElements();
+            for (let i in editElements) {


for ... of here maybe?

And everywhere below

TanVD · 2017-04-08T16:48:02Z

editor-core/src/main/webapp/app/core/editorCore/model/DiagramScene.ts

        node.getJointObject().remove();
-        if (node.getPropertyEditElement()) {
-            node.getPropertyEditElement().getHtmlElement().remove();
+        if (node.getPropertyEditElements()) {


What does it mean? Is it check for null or what? Use explicit syntax.

TanVD · 2017-04-08T16:48:21Z

editor-core/src/main/webapp/app/core/editorCore/model/DiagramScene.ts

        node.initPropertyEditElements(this.zoom);
-        if (node.getPropertyEditElement()) {
-            node.getPropertyEditElement().getHtmlElement().insertBefore("#" + this.getId());
+        if (node.getPropertyEditElements()) {


Here also be more explicit.

…ties # Conflicts: # editor-core/src/main/webapp/app/core/editorCore/model/DefaultDiagramNode.ts # editor-core/src/main/webapp/app/core/editorCore/model/DiagramNode.ts

TanVD

Please repair:

Changing of proprerty will move it to default postion
Saving of property will move it to default position
Fixes requested.

TanVD · 2017-05-12T21:19:52Z

editor-core/src/main/webapp/app/core/editorCore/model/DefaultDiagramNode.ts

+    changeTextPosition() : void {
+        var dx =  this.getX() - this.lastPointermoveCursor.x;
+        var dy =  this.getY() - this.lastPointermoveCursor.y;
+        console.log("Diagram pos in changeTextPosition : " + this.getX() + ", " + this.getY());


We do not use log levels, so it's better to remove unnecessary logs before merge to master.

TanVD · 2017-05-12T21:21:03Z

editor-core/src/main/webapp/app/core/editorCore/model/DefaultDiagramNode.ts

    private jointObject: ImageWithPorts;
+
+    /**
+     * Name and type of diagramm.


Write one doc per one field.

TanVD · 2017-05-12T21:21:19Z

editor-core/src/main/webapp/app/core/editorCore/model/DefaultDiagramNode.ts

    private constPropertiesPack: PropertiesPack;
+
+    /**
+     * Properties, which can be changes by user.


TanVD · 2017-05-12T21:21:48Z

editor-core/src/main/webapp/app/core/editorCore/model/DefaultDiagramNode.ts

    private changeableProperties: Map<String, Property>;
+
+    /**
+     * Path to image.


Not really helpful. What kind of path? Filepath, url?

I have no idea.

TanVD · 2017-05-12T21:22:12Z

editor-core/src/main/webapp/app/core/editorCore/model/DefaultDiagramNode.ts

    private parentNode: DiagramContainer;
+
+    /**
+     * Graph, where diagram is located. Used to set new properties on the screen.


Didn't understand it.

TanVD · 2017-05-12T21:23:03Z

editor-core/src/main/webapp/app/core/editorCore/model/DefaultDiagramNode.ts

        var diffY = y - this.lastMousePosition.y;
-        this.lastPointermoveCursor.x = this.getX();
-        this.lastPointermoveCursor.y = this.getY();
+        this.lastDiagramPosition.x = this.getX();


Position of the whole diagram? Maybe lastCursorPosition?

Position of the whole diagram? -- Yes. Coordinates of underlying joint object.

anastasia143 and others added 27 commits February 23, 2017 11:25

Updates jointjs and requirejs config

6080cc2

Updates jointjs in editor-core

fe9a6a8

Changes pathes in requirejs

eba2774

Adds bacbone path to jointjs d ts

1d4ed39

Adds attrs description to jointObjectAttributes in DefaultDiagramNode.ts

393ff0a

Updates grunt and typescript in package.json

b165697

Changes diagramElementView to elementView in DiagramScene.ts

d97537b

Adds PortsModelInterface to jointjs.d.ts

adea85c

Adds empty ImageWithPorts to DefaultDiagramNode.ts

3f6098a

Removes TextAttrs from Text constructor

fc72909

Updates requirejs with new libs in []

ed60e55

Adds backbone

d89b147

Adds lodash

e2ec1f4

Fix requirejs config.

80ce591

Few fixes for requirejs config to make JointJS load properly. Also jQuery updated to 2.2.4.

Adds ports tp the ImageWithPorts

92e0c07

Merge branch 'create-modules' of https://github.com/qreal/wmp into cr…

547335d

…eate-modules

Merge branch 'create-modules' into jointjs-update-merge

462ae1d

Update joint.css

9058ba7

Change notation file format

b8a629b

Merge branch 'master' into containers

2a9ec0a

Add embedding saving and loading

082aeb3

Prepare for auto-embedding

b00aae5

Merge branch 'jointjs-update-merge' of https://github.com/anastasia14…

c4c957c

…3/wmp into containers

Implement correct saving/loading/undo-redo/linking for containers

4c88447

Diagram saving and drawing bugfix

86ee3a1

Fix resize and remove debug code

02928de

implemented multiple properties view

786929c

TanVD suggested changes Apr 8, 2017

View reviewed changes

shavkunov added 2 commits May 5, 2017 23:01

Merge remote-tracking branch 'origin/containers' into multiple-proper…

2f19905

…ties # Conflicts: # editor-core/src/main/webapp/app/core/editorCore/model/DefaultDiagramNode.ts # editor-core/src/main/webapp/app/core/editorCore/model/DiagramNode.ts

implemented text joint labels

73d9102

shavkunov added 4 commits May 9, 2017 17:03

few comments added

347eef1

replaced var into let

162c400

more cosmetic changes

2366a93

replaced magic numbers with magic variables

446702f

TanVD suggested changes May 12, 2017

View reviewed changes

shavkunov added 3 commits May 14, 2017 17:45

added center text align

2655512

fixed requested changes

bb2e3de

fixed saving properties coordinates

614fa4a

Comments

Conversation

shavkunov commented Apr 1, 2017

Uh oh!

TanVD left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

TanVD left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants