scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 23:16:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #52 from biosistemika/bb_canvas_fixes

Browse source 
Bb canvas fixes
This commit is contained in:
scibb 2016-08-11 09:29:21 +02:00 committed by GitHub
parent e83566799c 5dd5f1cc28
commit 32699578ed
3 changed files with 44 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
app/assets/javascripts/projects/canvas.js
View file

@ -46,8 +46,12 @@ var DEFAULT_CONNECTOR_STYLE_2 =
};
// Zoom-level specific variables
var GRID_DIST_EDIT_X = 300;
var GRID_DIST_EDIT_Y = 135;
//var GRID_DIST_EDIT_X = 300;
//var GRID_DIST_EDIT_Y = 140; //135
var GRID_DIST_EDIT_X = 10;
var GRID_DIST_EDIT_Y = 10;
var GRID_DIST_EDIT_STEP_X = 10;
var GRID_DIST_EDIT_STEP_Y = 10;
var EDIT_ENDPOINT_STYLE =
[ "Dot", {
radius: 4,
@ -61,12 +65,25 @@ var EDIT_CONNECTOR_STYLE_2 =
outlineColor: "transparent",
outlineWidth: 0
};
/*
var GRID_DIST_FULL_X = 340;
var GRID_DIST_FULL_Y = 201;
var GRID_DIST_MEDIUM_X = 250;
var GRID_DIST_MEDIUM_Y = 88;
var GRID_DIST_SMALL_X = 100;
var GRID_DIST_SMALL_Y = 100;
*/
/*
Migrations: multiply my_modules (x by 32, y by 16)
UPDATE my_modules SET x=x*32, y=y*16
themodel.connection.execute("UPDATE my_modules SET x=x*32, y=y*16")
*/
var GRID_DIST_FULL_X = 12;
var GRID_DIST_FULL_Y = 12;
var GRID_DIST_MEDIUM_X = 8;
var GRID_DIST_MEDIUM_Y = 8;
var GRID_DIST_SMALL_X = 5;
var GRID_DIST_SMALL_Y = 5;
var SUBMIT_FORM_NAME_SEPARATOR = "|";
//************************************
@ -168,8 +185,8 @@ function initializeEdit() {
"div.module",
{
scrollEnabled: true,
gridDistX: GRID_DIST_EDIT_X,
gridDistY: GRID_DIST_EDIT_Y,
gridDistX: GRID_DIST_EDIT_STEP_X,
gridDistY: GRID_DIST_EDIT_STEP_Y,
endpointStyle: EDIT_ENDPOINT_STYLE,
connectorStyle2: EDIT_CONNECTOR_STYLE_2,
zoomEnabled: true,
@ -2850,6 +2867,10 @@ function initJsPlumb(containerSel, containerChildSel, modulesSel, params) {
// this listener sets the connection's internal
// id as the label overlay's text.
instance.bind("connection", function (info) {
_.each(instance.getAllConnections(), function(conn) {
conn.endpoints[0].setEnabled(false);
conn.endpoints[1].setEnabled(false);
});
});
// Bind a click listener to each connection
@ -2901,11 +2922,16 @@ function initJsPlumb(containerSel, containerChildSel, modulesSel, params) {
}
// Enable/disable connection endpoints
/*
_.each(instance.getAllConnections(), function(conn) {
conn.endpoints[0].setEnabled(connectionsEditable);
conn.endpoints[1].setEnabled(connectionsEditable);
});
*/
_.each(instance.getAllConnections(), function(conn) {
conn.endpoints[0].setEnabled(false);
conn.endpoints[1].setEnabled(false);
});
// Update style on existing connections
if (connectionsEditable) {
_.each(instance.getAllConnections(), function(conn) {

12
db/migrate/20160809074757_update_my_module_coordinate.rb Normal file
View file

@ -0,0 +1,12 @@
class UpdateMyModuleCoordinate < ActiveRecord::Migration
def change
MyModule.all.each do |my_module|
x = my_module.x
y = my_module.y
x *= 32
y *= 16
my_module.update(x: x)
my_module.update(y: y)
end
end
end

2
db/schema.rb
View file

@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20160704110900) do
ActiveRecord::Schema.define(version: 20160809074757) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"