Skip to content
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

Drag & replace blocks #198

Merged
merged 12 commits into from
Jan 21, 2018
Merged

Drag & replace blocks #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
bb87916
Add drag&replace for new blocks and existing blocks
Jesus89 Jan 18, 2018
21ee186
Detect "replace block" situation
Jesus89 Jan 19, 2018
009b0a4
Disable replaced block
Jesus89 Jan 20, 2018
139a481
Improve "disable replace" effect in svg layer
Jesus89 Jan 20, 2018
39ff593
Add wires replacement in block replacement
Jesus89 Jan 20, 2018
a06aba5
Replace wires by position if there are ports with the same name
Jesus89 Jan 20, 2018
5f78575
Merge branch 'develop' into 191-drag-replace
Jesus89 Jan 20, 2018
0021681
Add particular case for reconnecting wires: match length and size
Jesus89 Jan 20, 2018
36ac298
Update wires on obstacles after undo/redo
Jesus89 Jan 20, 2018
cd3c397
Update particular case: use min length
Jesus89 Jan 20, 2018
100603e
Update min size for code blocks
Jesus89 Jan 20, 2018
00898a0
Remove console.log
Jesus89 Jan 21, 2018
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
1 change: 1 addition & 0 deletions app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"glob": "^7.1.2",
"is-online": "^5.2.0",
"jquery": "^3.2.1",
"lodash.debounce": "^4.0.8",
"marked": "^0.3.12",
"node-emoji": "^1.8.1",
"node-lang-info": "^0.2.1",
Expand Down
3 changes: 3 additions & 0 deletions app/scripts/factories/node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ angular.module('icestudio')
.factory('nodeTemp', function() {
return require('temporary');
})
.factory('nodeDebounce', function() {
return require('lodash.debounce');
})
.factory('SVGO', function() {
var config = {
full: true,
Expand Down
36 changes: 19 additions & 17 deletions app/scripts/graphics/joint.command.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ joint.dia.CommandManager = Backbone.Model.extend({

initBatchCommand: function() {

//console.log('initBatchCommand', this.batchCommand);
// console.log('initBatchCommand', this.batchCommand);

if (!this.batchCommand) {

Expand All @@ -198,30 +198,30 @@ joint.dia.CommandManager = Backbone.Model.extend({

storeBatchCommand: function() {

//console.log('storeBatchCommand', this.batchCommand, this.batchLevel);
// console.log('storeBatchCommand', this.batchCommand, this.batchLevel);

// In order to store batch command it is necesary to run storeBatchCommand as many times as
// initBatchCommand was executed
if (this.batchCommand && this.batchLevel <= 0) {

// checking if there is any valid command in batch
// for example: calling `initBatchCommand` immediately followed by `storeBatchCommand`
if (this.lastCmdIndex >= 0) {
// checking if there is any valid command in batch
// for example: calling `initBatchCommand` immediately followed by `storeBatchCommand`
if (this.lastCmdIndex >= 0) {

this.redoStack = [];
this.redoStack = [];

this.undoStack.push(this.batchCommand);
if (this.batchCommand && this.batchCommand[0] && this.batchCommand[0].action !== 'lang') {
// Do not store lang in changesStack
this.changesStack.push(this.batchCommand);
this.triggerChange();
this.undoStack.push(this.batchCommand);
if (this.batchCommand && this.batchCommand[0] && this.batchCommand[0].action !== 'lang') {
// Do not store lang in changesStack
this.changesStack.push(this.batchCommand);
this.triggerChange();
}
this.trigger('add', this.batchCommand);
}
this.trigger('add', this.batchCommand);
}

delete this.batchCommand;
delete this.lastCmdIndex;
delete this.batchLevel;
delete this.batchCommand;
delete this.lastCmdIndex;
delete this.batchLevel;

} else if (this.batchCommand && this.batchLevel > 0) {

Expand Down Expand Up @@ -249,7 +249,9 @@ joint.dia.CommandManager = Backbone.Model.extend({
switch (cmd.action) {

case 'add':
cell.remove();
if (cell) {
cell.remove();
}
break;

case 'remove':
Expand Down
26 changes: 18 additions & 8 deletions app/scripts/graphics/joint.selection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,18 +103,16 @@ joint.ui.SelectionView = Backbone.View.extend({
}
},

startTranslatingSelection: function(evt, noBatch) {
startTranslatingSelection: function(evt) {

if (evt.which === 1 || noBatch) {
if (this._action !== 'adding' && evt.which === 1) {
// Mouse left button

if (!evt.shiftKey) {
this._action = 'translating';

if (!noBatch) {
this.options.graph.trigger('batch:stop');
this.options.graph.trigger('batch:start');
}
this.options.graph.trigger('batch:stop');
this.options.graph.trigger('batch:start');

var snappedClientCoords = this.options.paper.snapToGrid(g.point(evt.clientX, evt.clientY));
this._snappedClientX = snappedClientCoords.x;
Expand All @@ -125,9 +123,15 @@ joint.ui.SelectionView = Backbone.View.extend({
}
},

isTranslating: function() {
startAddingSelection: function(evt) {

this._action = 'adding';

var snappedClientCoords = this.options.paper.snapToGrid(g.point(evt.clientX, evt.clientY));
this._snappedClientX = snappedClientCoords.x;
this._snappedClientY = snappedClientCoords.y;

return this._action === 'translating';
this.trigger('selection-box:pointerdown', evt);
},

startSelecting: function(evt/*, x, y*/) {
Expand Down Expand Up @@ -179,6 +183,7 @@ joint.ui.SelectionView = Backbone.View.extend({
});
break;

case 'adding':
case 'translating':

var snappedClientCoords = this.options.paper.snapToGrid(g.point(evt.clientX, evt.clientY));
Expand Down Expand Up @@ -233,6 +238,8 @@ joint.ui.SelectionView = Backbone.View.extend({
this._snappedClientY = snappedClientY;
}

this.trigger('selection-box:pointermove', evt);

break;
}
},
Expand Down Expand Up @@ -281,6 +288,9 @@ joint.ui.SelectionView = Backbone.View.extend({
// Everything else is done during the translation.
break;

case 'adding':
break;

case 'cherry-picking':
// noop; All is done in the `createSelectionBox()` function.
// This is here to avoid removing selection boxes as a reaction on mouseup event and
Expand Down
14 changes: 9 additions & 5 deletions app/scripts/graphics/joint.shapes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ joint.shapes.ice.Model = joint.shapes.basic.Generic.extend({
attrs[portLabelSelector]['y'] = -5-offset;
attrs[portLabelSelector]['text-anchor'] = 'end';
attrs[portWireSelector]['y'] = position;
attrs[portWireSelector]['d'] = 'M 0 0 L 16 0';
attrs[portWireSelector]['d'] = 'M 0 0 L 8 0';
break;
case 'right':
attrs[portSelector]['ref-dx'] = 8;
Expand All @@ -199,7 +199,7 @@ joint.shapes.ice.Model = joint.shapes.basic.Generic.extend({
attrs[portLabelSelector]['y'] = -5-offset;
attrs[portLabelSelector]['text-anchor'] = 'start';
attrs[portWireSelector]['y'] = position;
attrs[portWireSelector]['d'] = 'M 0 0 L -16 0';
attrs[portWireSelector]['d'] = 'M 0 0 L -8 0';
break;
case 'top':
attrs[portSelector]['ref-y'] = -8;
Expand All @@ -208,7 +208,7 @@ joint.shapes.ice.Model = joint.shapes.basic.Generic.extend({
attrs[portLabelSelector]['y'] = 2;
attrs[portLabelSelector]['text-anchor'] = 'start';
attrs[portWireSelector]['x'] = position;
attrs[portWireSelector]['d'] = 'M 0 0 L 0 16';
attrs[portWireSelector]['d'] = 'M 0 0 L 0 8';
break;
case 'bottom':
attrs[portSelector]['ref-dy'] = 8;
Expand All @@ -217,7 +217,7 @@ joint.shapes.ice.Model = joint.shapes.basic.Generic.extend({
attrs[portLabelSelector]['y'] = -2;
attrs[portLabelSelector]['text-anchor'] = 'start';
attrs[portWireSelector]['x'] = position;
attrs[portWireSelector]['d'] = 'M 0 0 L 0 -16';
attrs[portWireSelector]['d'] = 'M 0 0 L 0 -8';
break;
}

Expand Down Expand Up @@ -296,10 +296,14 @@ joint.shapes.ice.ModelView = joint.dia.ElementView.extend({
return;
}

var type = self.model.get('type');
var size = self.model.get('size');
var state = self.model.get('state');
var gridstep = 8 * 2;
var minSize = { width: 64, height: 32 };
var minSize = {
width: type === 'ice.Code' ? 96 : 64,
height: type === 'ice.Code' ? 64 : 32
};

var clientCoords = snapToGrid({ x: event.clientX, y: event.clientY });
var oldClientCoords = snapToGrid({ x: self._clientX, y: self._clientY });
Expand Down
Loading