mirror of
https://bitbucket.org/wisemapping/wisemapping-open-source.git
synced 2024-08-20 12:30:44 +02:00
Merge branch 'images'
Conflicts: mindplot/src/main/javascript/StandaloneActionDispatcher.js
This commit is contained in:
commit
45a190bbac
@ -140,6 +140,7 @@
|
|||||||
<include>Workspace.js</include>
|
<include>Workspace.js</include>
|
||||||
<include>ShrinkConnector.js</include>
|
<include>ShrinkConnector.js</include>
|
||||||
<include>DesignerKeyboard.js</include>
|
<include>DesignerKeyboard.js</include>
|
||||||
|
<include>TopicStyle.js</include>
|
||||||
<include>NodeGraph.js</include>
|
<include>NodeGraph.js</include>
|
||||||
<include>Topic.js</include>
|
<include>Topic.js</include>
|
||||||
<include>CentralTopic.js</include>
|
<include>CentralTopic.js</include>
|
||||||
|
@ -36,29 +36,11 @@ mindplot.CentralTopic = new Class({
|
|||||||
return this.getPosition();
|
return this.getPosition();
|
||||||
},
|
},
|
||||||
|
|
||||||
_getInnerPadding:function () {
|
|
||||||
return 11;
|
|
||||||
},
|
|
||||||
|
|
||||||
getTopicType:function () {
|
|
||||||
return mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE;
|
|
||||||
},
|
|
||||||
|
|
||||||
setCursor:function (type) {
|
setCursor:function (type) {
|
||||||
type = (type == 'move') ? 'default' : type;
|
type = (type == 'move') ? 'default' : type;
|
||||||
this.parent(type);
|
this.parent(type);
|
||||||
},
|
},
|
||||||
|
|
||||||
isConnectedToCentralTopic:function () {
|
|
||||||
return false;
|
|
||||||
},
|
|
||||||
|
|
||||||
|
|
||||||
_defaultShapeType:function () {
|
|
||||||
return mindplot.model.TopicShape.ROUNDED_RECT;
|
|
||||||
},
|
|
||||||
|
|
||||||
|
|
||||||
updateTopicShape:function () {
|
updateTopicShape:function () {
|
||||||
|
|
||||||
},
|
},
|
||||||
@ -70,28 +52,6 @@ mindplot.CentralTopic = new Class({
|
|||||||
this.setPosition(zeroPoint);
|
this.setPosition(zeroPoint);
|
||||||
},
|
},
|
||||||
|
|
||||||
_defaultText:function () {
|
|
||||||
return $msg('CENTRAL_TOPIC');
|
|
||||||
},
|
|
||||||
|
|
||||||
_defaultBackgroundColor:function () {
|
|
||||||
return "rgb(80,157,192)";
|
|
||||||
},
|
|
||||||
|
|
||||||
_defaultBorderColor:function () {
|
|
||||||
return "rgb(57,113,177)";
|
|
||||||
},
|
|
||||||
|
|
||||||
_defaultFontStyle:function () {
|
|
||||||
return {
|
|
||||||
font:"Verdana",
|
|
||||||
size:10,
|
|
||||||
style:"normal",
|
|
||||||
weight:"bold",
|
|
||||||
color:"#ffffff"
|
|
||||||
};
|
|
||||||
},
|
|
||||||
|
|
||||||
getShrinkConnector:function () {
|
getShrinkConnector:function () {
|
||||||
return null;
|
return null;
|
||||||
},
|
},
|
||||||
|
@ -160,6 +160,48 @@ mindplot.Designer = new Class({
|
|||||||
}
|
}
|
||||||
}.bind(this));
|
}.bind(this));
|
||||||
|
|
||||||
|
// Register mouse drag and drop event ...
|
||||||
|
function noopHandler(evt) {
|
||||||
|
evt.stopPropagation();
|
||||||
|
evt.preventDefault();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Enable drag events ...
|
||||||
|
Element.NativeEvents.dragenter = 2;
|
||||||
|
Element.NativeEvents.dragexit = 2;
|
||||||
|
Element.NativeEvents.dragover = 2;
|
||||||
|
Element.NativeEvents.drop = 2;
|
||||||
|
|
||||||
|
screenManager.addEvent('dragenter', noopHandler);
|
||||||
|
screenManager.addEvent('dragexit', noopHandler);
|
||||||
|
screenManager.addEvent('dragover', noopHandler);
|
||||||
|
screenManager.addEvent('drop', function (evt) {
|
||||||
|
evt.stopPropagation();
|
||||||
|
evt.preventDefault();
|
||||||
|
//
|
||||||
|
var files = evt.event.dataTransfer.files;
|
||||||
|
console.log(event);
|
||||||
|
|
||||||
|
var count = files.length;
|
||||||
|
|
||||||
|
// Only call the handler if 1 or more files was dropped.
|
||||||
|
if (count > 0) {
|
||||||
|
|
||||||
|
var model = this.getMindmap().createNode();
|
||||||
|
model.setImageSize(80, 43);
|
||||||
|
model.setMetadata("{'media':'video,'url':'http://www.youtube.com/watch?v=P3FrXftyuzw&feature=g-vrec&context=G2b4ab69RVAAAAAAAAAA'}");
|
||||||
|
model.setImageUrl("images/logo-small.png");
|
||||||
|
model.setShapeType(mindplot.model.TopicShape.IMAGE);
|
||||||
|
|
||||||
|
var position = screenManager.getWorkspaceMousePosition(evt);
|
||||||
|
model.setPosition(position.x, position.y);
|
||||||
|
model.setPosition(100, 100);
|
||||||
|
|
||||||
|
this._actionDispatcher.addTopics([model]);
|
||||||
|
}
|
||||||
|
}.bind(this));
|
||||||
|
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|
||||||
_buildDragManager:function (workspace) {
|
_buildDragManager:function (workspace) {
|
||||||
@ -357,7 +399,7 @@ mindplot.Designer = new Class({
|
|||||||
|
|
||||||
// Exclude central topic ..
|
// Exclude central topic ..
|
||||||
topics = topics.filter(function (topic) {
|
topics = topics.filter(function (topic) {
|
||||||
return topic.getTopicType() != mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE
|
return !topic.isCentralTopic();
|
||||||
});
|
});
|
||||||
|
|
||||||
this._clipboard = topics.map(function (topic) {
|
this._clipboard = topics.map(function (topic) {
|
||||||
@ -684,7 +726,7 @@ mindplot.Designer = new Class({
|
|||||||
},
|
},
|
||||||
|
|
||||||
_removeTopic:function (node) {
|
_removeTopic:function (node) {
|
||||||
if (node.getTopicType() != mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE) {
|
if (!node.isCentralTopic()) {
|
||||||
var parent = node._parent;
|
var parent = node._parent;
|
||||||
node.disconnect(this._workspace);
|
node.disconnect(this._workspace);
|
||||||
|
|
||||||
@ -714,14 +756,14 @@ mindplot.Designer = new Class({
|
|||||||
// If there are more than one node selected,
|
// If there are more than one node selected,
|
||||||
$notify($msg('ENTITIES_COULD_NOT_BE_DELETED'));
|
$notify($msg('ENTITIES_COULD_NOT_BE_DELETED'));
|
||||||
return;
|
return;
|
||||||
} else if (topics.length == 1 && topics[0].getTopicType() == mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE) {
|
} else if (topics.length == 1 && topics[0].isCentralTopic()) {
|
||||||
$notify($msg('CENTRAL_TOPIC_CAN_NOT_BE_DELETED'));
|
$notify($msg('CENTRAL_TOPIC_CAN_NOT_BE_DELETED'));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// If the central topic has been selected, I must filter ir
|
// If the central topic has been selected, I must filter ir
|
||||||
var topicIds = topics.filter(function (topic) {
|
var topicIds = topics.filter(function (topic) {
|
||||||
return topic.getTopicType() != mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE
|
return !topic.isCentralTopic();
|
||||||
}).map(function (topic) {
|
}).map(function (topic) {
|
||||||
return topic.getId()
|
return topic.getId()
|
||||||
});
|
});
|
||||||
|
@ -241,7 +241,7 @@ mindplot.DesignerKeyboard = new Class({
|
|||||||
'right':function (event) {
|
'right':function (event) {
|
||||||
var node = model.selectedTopic();
|
var node = model.selectedTopic();
|
||||||
if (node) {
|
if (node) {
|
||||||
if (node.getTopicType() == mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE) {
|
if (node.isCentralTopic()) {
|
||||||
this._goToSideChild(designer, node, 'RIGHT');
|
this._goToSideChild(designer, node, 'RIGHT');
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@ -263,7 +263,7 @@ mindplot.DesignerKeyboard = new Class({
|
|||||||
'left':function (event) {
|
'left':function (event) {
|
||||||
var node = model.selectedTopic();
|
var node = model.selectedTopic();
|
||||||
if (node) {
|
if (node) {
|
||||||
if (node.getTopicType() == mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE) {
|
if (node.isCentralTopic()) {
|
||||||
this._goToSideChild(designer, node, 'LEFT');
|
this._goToSideChild(designer, node, 'LEFT');
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@ -285,7 +285,7 @@ mindplot.DesignerKeyboard = new Class({
|
|||||||
'up':function (event) {
|
'up':function (event) {
|
||||||
var node = model.selectedTopic();
|
var node = model.selectedTopic();
|
||||||
if (node) {
|
if (node) {
|
||||||
if (node.getTopicType() != mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE) {
|
if (!node.isCentralTopic()) {
|
||||||
this._goToBrother(designer, node, 'UP');
|
this._goToBrother(designer, node, 'UP');
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -299,7 +299,7 @@ mindplot.DesignerKeyboard = new Class({
|
|||||||
'down':function (event) {
|
'down':function (event) {
|
||||||
var node = model.selectedTopic();
|
var node = model.selectedTopic();
|
||||||
if (node) {
|
if (node) {
|
||||||
if (node.getTopicType() != mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE) {
|
if (!node.isCentralTopic()) {
|
||||||
this._goToBrother(designer, node, 'DOWN');
|
this._goToBrother(designer, node, 'DOWN');
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
@ -55,16 +55,11 @@ mindplot.MainTopic = new Class({
|
|||||||
return group;
|
return group;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
_defaultShapeType:function () {
|
|
||||||
return mindplot.model.TopicShape.LINE;
|
|
||||||
},
|
|
||||||
|
|
||||||
updateTopicShape:function (targetTopic, workspace) {
|
updateTopicShape:function (targetTopic, workspace) {
|
||||||
// Change figure based on the connected topic ...
|
// Change figure based on the connected topic ...
|
||||||
var model = this.getModel();
|
var model = this.getModel();
|
||||||
var shapeType = model.getShapeType();
|
var shapeType = model.getShapeType();
|
||||||
if (targetTopic.getType() != mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE) {
|
if (!targetTopic.isCentralTopic()) {
|
||||||
if (!$defined(shapeType)) {
|
if (!$defined(shapeType)) {
|
||||||
// Get the real shape type ...
|
// Get the real shape type ...
|
||||||
shapeType = this.getShapeType();
|
shapeType = this.getShapeType();
|
||||||
@ -88,10 +83,6 @@ mindplot.MainTopic = new Class({
|
|||||||
innerShape.setVisibility(true);
|
innerShape.setVisibility(true);
|
||||||
},
|
},
|
||||||
|
|
||||||
getTopicType:function () {
|
|
||||||
return "MainTopic";
|
|
||||||
},
|
|
||||||
|
|
||||||
_updatePositionOnChangeSize:function (oldSize, newSize) {
|
_updatePositionOnChangeSize:function (oldSize, newSize) {
|
||||||
|
|
||||||
var xOffset = Math.round((newSize.width - oldSize.width) / 2);
|
var xOffset = Math.round((newSize.width - oldSize.width) / 2);
|
||||||
@ -167,82 +158,6 @@ mindplot.MainTopic = new Class({
|
|||||||
result = mindplot.util.Shape.calculateRectConnectionPoint(pos, size, isAtRight, true);
|
result = mindplot.util.Shape.calculateRectConnectionPoint(pos, size, isAtRight, true);
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
},
|
|
||||||
|
|
||||||
_getInnerPadding:function () {
|
|
||||||
var result;
|
|
||||||
var parent = this.getModel().getParent();
|
|
||||||
if (parent && mindplot.model.INodeModel.MAIN_TOPIC_TYPE == parent.getType()) {
|
|
||||||
result = 3;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
result = 4;
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
},
|
|
||||||
|
|
||||||
isConnectedToCentralTopic:function () {
|
|
||||||
var model = this.getModel();
|
|
||||||
var parent = model.getParent();
|
|
||||||
|
|
||||||
return parent && parent.getType() === mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE;
|
|
||||||
},
|
|
||||||
|
|
||||||
_defaultText:function () {
|
|
||||||
var targetTopic = this.getOutgoingConnectedTopic();
|
|
||||||
var result = "";
|
|
||||||
if ($defined(targetTopic)) {
|
|
||||||
if (targetTopic.getType() == mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE) {
|
|
||||||
result = $msg('MAIN_TOPIC');
|
|
||||||
} else {
|
|
||||||
result = $msg('SUB_TOPIC');
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
result = $msg('ISOLATED_TOPIC');
|
|
||||||
;
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
},
|
|
||||||
|
|
||||||
_defaultFontStyle:function () {
|
|
||||||
var targetTopic = this.getOutgoingConnectedTopic();
|
|
||||||
var result;
|
|
||||||
if ($defined(targetTopic)) {
|
|
||||||
if (targetTopic.getType() == mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE) {
|
|
||||||
result = {
|
|
||||||
font:"Arial",
|
|
||||||
size:8,
|
|
||||||
style:"normal",
|
|
||||||
weight:"normal",
|
|
||||||
color:"rgb(82,92,97)"
|
|
||||||
};
|
|
||||||
} else {
|
|
||||||
result = {
|
|
||||||
font:"Arial",
|
|
||||||
size:6,
|
|
||||||
style:"normal",
|
|
||||||
weight:"normal",
|
|
||||||
color:"rgb(82,92,97)"
|
|
||||||
};
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
result = {
|
|
||||||
font:"Verdana",
|
|
||||||
size:8,
|
|
||||||
style:"normal",
|
|
||||||
weight:"normal",
|
|
||||||
color:"rgb(82,92,97)"
|
|
||||||
};
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
},
|
|
||||||
|
|
||||||
_defaultBackgroundColor:function () {
|
|
||||||
return "rgb(224,229,239)";
|
|
||||||
},
|
|
||||||
|
|
||||||
_defaultBorderColor:function () {
|
|
||||||
return 'rgb(2,59,185)';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
@ -29,7 +29,7 @@ mindplot.Topic = new Class({
|
|||||||
|
|
||||||
// Position a topic ....
|
// Position a topic ....
|
||||||
var pos = model.getPosition();
|
var pos = model.getPosition();
|
||||||
if (pos != null && model.getType() == mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE) {
|
if (pos != null && this.isCentralTopic()) {
|
||||||
this.setPosition(pos);
|
this.setPosition(pos);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -107,7 +107,7 @@ mindplot.Topic = new Class({
|
|||||||
var model = this.getModel();
|
var model = this.getModel();
|
||||||
var result = model.getShapeType();
|
var result = model.getShapeType();
|
||||||
if (!$defined(result)) {
|
if (!$defined(result)) {
|
||||||
result = this._defaultShapeType();
|
result = mindplot.TopicStyle.defaultShapeType(this);
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
},
|
},
|
||||||
@ -134,7 +134,7 @@ mindplot.Topic = new Class({
|
|||||||
this._setBorderColor(brColor, false);
|
this._setBorderColor(brColor, false);
|
||||||
|
|
||||||
// Define the pointer ...
|
// Define the pointer ...
|
||||||
if (this.getType() != mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE && !this.isReadOnly()) {
|
if (!this.isCentralTopic() && !this.isReadOnly()) {
|
||||||
this._innerShape.setCursor('move');
|
this._innerShape.setCursor('move');
|
||||||
} else {
|
} else {
|
||||||
this._innerShape.setCursor('default');
|
this._innerShape.setCursor('default');
|
||||||
@ -259,7 +259,7 @@ mindplot.Topic = new Class({
|
|||||||
_buildIconGroup:function () {
|
_buildIconGroup:function () {
|
||||||
var textHeight = this.getTextShape().getFontHeight();
|
var textHeight = this.getTextShape().getFontHeight();
|
||||||
var result = new mindplot.IconGroup(this.getId(), textHeight);
|
var result = new mindplot.IconGroup(this.getId(), textHeight);
|
||||||
var padding = this._getInnerPadding();
|
var padding = mindplot.TopicStyle.getInnerPadding(this);
|
||||||
result.setPosition(padding, padding);
|
result.setPosition(padding, padding);
|
||||||
|
|
||||||
// Load topic features ...
|
// Load topic features ...
|
||||||
@ -334,7 +334,7 @@ mindplot.Topic = new Class({
|
|||||||
|
|
||||||
if (!readOnly) {
|
if (!readOnly) {
|
||||||
// Propagate mouse events ...
|
// Propagate mouse events ...
|
||||||
if (this.getType() != mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE) {
|
if (!this.isCentralTopic()) {
|
||||||
result.setCursor('move');
|
result.setCursor('move');
|
||||||
} else {
|
} else {
|
||||||
result.setCursor('default');
|
result.setCursor('default');
|
||||||
@ -344,10 +344,6 @@ mindplot.Topic = new Class({
|
|||||||
return result;
|
return result;
|
||||||
},
|
},
|
||||||
|
|
||||||
_getInnerPadding:function () {
|
|
||||||
throw "this must be implemented";
|
|
||||||
},
|
|
||||||
|
|
||||||
setFontFamily:function (value, updateModel) {
|
setFontFamily:function (value, updateModel) {
|
||||||
var textShape = this.getTextShape();
|
var textShape = this.getTextShape();
|
||||||
textShape.setFontFamily(value);
|
textShape.setFontFamily(value);
|
||||||
@ -395,7 +391,7 @@ mindplot.Topic = new Class({
|
|||||||
var model = this.getModel();
|
var model = this.getModel();
|
||||||
var result = model.getFontWeight();
|
var result = model.getFontWeight();
|
||||||
if (!$defined(result)) {
|
if (!$defined(result)) {
|
||||||
var font = this._defaultFontStyle();
|
var font = mindplot.TopicStyle.defaultFontStyle(this);
|
||||||
result = font.weight;
|
result = font.weight;
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
@ -405,7 +401,7 @@ mindplot.Topic = new Class({
|
|||||||
var model = this.getModel();
|
var model = this.getModel();
|
||||||
var result = model.getFontFamily();
|
var result = model.getFontFamily();
|
||||||
if (!$defined(result)) {
|
if (!$defined(result)) {
|
||||||
var font = this._defaultFontStyle();
|
var font = mindplot.TopicStyle.defaultFontStyle(this);
|
||||||
result = font.font;
|
result = font.font;
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
@ -415,7 +411,7 @@ mindplot.Topic = new Class({
|
|||||||
var model = this.getModel();
|
var model = this.getModel();
|
||||||
var result = model.getFontColor();
|
var result = model.getFontColor();
|
||||||
if (!$defined(result)) {
|
if (!$defined(result)) {
|
||||||
var font = this._defaultFontStyle();
|
var font = mindplot.TopicStyle.defaultFontStyle(this);
|
||||||
result = font.color;
|
result = font.color;
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
@ -425,7 +421,7 @@ mindplot.Topic = new Class({
|
|||||||
var model = this.getModel();
|
var model = this.getModel();
|
||||||
var result = model.getFontStyle();
|
var result = model.getFontStyle();
|
||||||
if (!$defined(result)) {
|
if (!$defined(result)) {
|
||||||
var font = this._defaultFontStyle();
|
var font = mindplot.TopicStyle.defaultFontStyle(this);
|
||||||
result = font.style;
|
result = font.style;
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
@ -435,7 +431,7 @@ mindplot.Topic = new Class({
|
|||||||
var model = this.getModel();
|
var model = this.getModel();
|
||||||
var result = model.getFontSize();
|
var result = model.getFontSize();
|
||||||
if (!$defined(result)) {
|
if (!$defined(result)) {
|
||||||
var font = this._defaultFontStyle();
|
var font = mindplot.TopicStyle.defaultFontStyle(this);
|
||||||
result = font.size;
|
result = font.size;
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
@ -452,7 +448,7 @@ mindplot.Topic = new Class({
|
|||||||
|
|
||||||
_setText:function (text, updateModel) {
|
_setText:function (text, updateModel) {
|
||||||
var textShape = this.getTextShape();
|
var textShape = this.getTextShape();
|
||||||
textShape.setText(text == null ? this._defaultText() : text);
|
textShape.setText(text == null ? mindplot.TopicStyle.defaultText(this) : text);
|
||||||
|
|
||||||
if ($defined(updateModel) && updateModel) {
|
if ($defined(updateModel) && updateModel) {
|
||||||
var model = this.getModel();
|
var model = this.getModel();
|
||||||
@ -474,7 +470,7 @@ mindplot.Topic = new Class({
|
|||||||
var model = this.getModel();
|
var model = this.getModel();
|
||||||
var result = model.getText();
|
var result = model.getText();
|
||||||
if (!$defined(result)) {
|
if (!$defined(result)) {
|
||||||
result = this._defaultText();
|
result = mindplot.TopicStyle.defaultText(this);
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
},
|
},
|
||||||
@ -502,7 +498,7 @@ mindplot.Topic = new Class({
|
|||||||
var model = this.getModel();
|
var model = this.getModel();
|
||||||
var result = model.getBackgroundColor();
|
var result = model.getBackgroundColor();
|
||||||
if (!$defined(result)) {
|
if (!$defined(result)) {
|
||||||
result = this._defaultBackgroundColor();
|
result = mindplot.TopicStyle.defaultBackgroundColor(this);
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
},
|
},
|
||||||
@ -530,7 +526,7 @@ mindplot.Topic = new Class({
|
|||||||
var model = this.getModel();
|
var model = this.getModel();
|
||||||
var result = model.getBorderColor();
|
var result = model.getBorderColor();
|
||||||
if (!$defined(result)) {
|
if (!$defined(result)) {
|
||||||
result = this._defaultBorderColor();
|
result = mindplot.TopicStyle.defaultBorderColor(this);
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
},
|
},
|
||||||
@ -822,7 +818,7 @@ mindplot.Topic = new Class({
|
|||||||
setBranchVisibility:function (value) {
|
setBranchVisibility:function (value) {
|
||||||
var current = this;
|
var current = this;
|
||||||
var parent = this;
|
var parent = this;
|
||||||
while (parent != null && parent.getType() != mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE) {
|
while (parent != null && !parent.isCentralTopic()) {
|
||||||
current = parent;
|
current = parent;
|
||||||
parent = current.getParent();
|
parent = current.getParent();
|
||||||
}
|
}
|
||||||
@ -1109,7 +1105,7 @@ mindplot.Topic = new Class({
|
|||||||
var elem = this.get2DElement();
|
var elem = this.get2DElement();
|
||||||
workspace.appendChild(elem);
|
workspace.appendChild(elem);
|
||||||
if (!this.isInWorkspace()) {
|
if (!this.isInWorkspace()) {
|
||||||
if (this.getType() != mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE) {
|
if (!this.isCentralTopic()) {
|
||||||
mindplot.EventBus.instance.fireEvent(mindplot.EventBus.events.NodeAdded, this.getModel());
|
mindplot.EventBus.instance.fireEvent(mindplot.EventBus.events.NodeAdded, this.getModel());
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1152,7 +1148,7 @@ mindplot.Topic = new Class({
|
|||||||
var textHeight = textShape.getHeight();
|
var textHeight = textShape.getHeight();
|
||||||
textHeight = textHeight != 0 ? textHeight : 20;
|
textHeight = textHeight != 0 ? textHeight : 20;
|
||||||
|
|
||||||
var topicPadding = this._getInnerPadding();
|
var topicPadding = mindplot.TopicStyle.getInnerPadding(this);
|
||||||
|
|
||||||
// Adjust the icon size to the size of the text ...
|
// Adjust the icon size to the size of the text ...
|
||||||
var iconGroup = this.getOrBuildIconGroup();
|
var iconGroup = this.getOrBuildIconGroup();
|
||||||
@ -1214,7 +1210,13 @@ mindplot.Topic = new Class({
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
|
},
|
||||||
|
|
||||||
|
isCentralTopic:function () {
|
||||||
|
return this.getModel().getType() == mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
132
mindplot/src/main/javascript/TopicStyle.js
Normal file
132
mindplot/src/main/javascript/TopicStyle.js
Normal file
@ -0,0 +1,132 @@
|
|||||||
|
/*
|
||||||
|
* Copyright [2011] [wisemapping]
|
||||||
|
*
|
||||||
|
* Licensed under WiseMapping Public License, Version 1.0 (the "License").
|
||||||
|
* It is basically the Apache License, Version 2.0 (the "License") plus the
|
||||||
|
* "powered by wisemapping" text requirement on every single page;
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the license at
|
||||||
|
*
|
||||||
|
* http://www.wisemapping.org/license
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
mindplot.TopicStyle = new Class({
|
||||||
|
Static:{
|
||||||
|
_getStyles:function (topic) {
|
||||||
|
$assert(topic, "topic can not be null");
|
||||||
|
|
||||||
|
var result;
|
||||||
|
if (topic.isCentralTopic()) {
|
||||||
|
result = mindplot.TopicStyle.STYLES.CENTRAL_TOPIC;
|
||||||
|
} else {
|
||||||
|
var targetTopic = topic.getOutgoingConnectedTopic();
|
||||||
|
if ($defined(targetTopic)) {
|
||||||
|
if (targetTopic.isCentralTopic()) {
|
||||||
|
result = mindplot.TopicStyle.STYLES.MAIN_TOPIC;
|
||||||
|
} else {
|
||||||
|
result = mindplot.TopicStyle.STYLES.SUB_TOPIC;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
result = mindplot.TopicStyle.STYLES.ISOLATED_TOPIC;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
},
|
||||||
|
|
||||||
|
defaultText:function (topic) {
|
||||||
|
var msgKey = this._getStyles(topic).msgKey;
|
||||||
|
return $msg(msgKey);
|
||||||
|
},
|
||||||
|
|
||||||
|
defaultFontStyle:function (topic) {
|
||||||
|
return this._getStyles(topic).fontStyle;
|
||||||
|
},
|
||||||
|
|
||||||
|
defaultBackgroundColor:function (topic) {
|
||||||
|
return this._getStyles(topic).backgroundColor;
|
||||||
|
},
|
||||||
|
|
||||||
|
defaultBorderColor:function (topic) {
|
||||||
|
return this._getStyles(topic).borderColor;
|
||||||
|
},
|
||||||
|
|
||||||
|
getInnerPadding:function (topic) {
|
||||||
|
return this._getStyles(topic).innerPadding;
|
||||||
|
},
|
||||||
|
|
||||||
|
defaultShapeType:function (topic) {
|
||||||
|
return this._getStyles(topic).shapeType;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
mindplot.TopicStyle.STYLES =
|
||||||
|
{
|
||||||
|
CENTRAL_TOPIC:{
|
||||||
|
borderColor:'rgb(57,113,177)',
|
||||||
|
backgroundColor:'rgb(80,157,192)',
|
||||||
|
fontStyle:{
|
||||||
|
font:"Verdana",
|
||||||
|
size:10,
|
||||||
|
style:"normal",
|
||||||
|
weight:"bold",
|
||||||
|
color:"#ffffff"
|
||||||
|
},
|
||||||
|
msgKey:'CENTRAL_TOPIC',
|
||||||
|
innerPadding:11,
|
||||||
|
shapeType:mindplot.model.TopicShape.ROUNDED_RECT
|
||||||
|
},
|
||||||
|
|
||||||
|
MAIN_TOPIC:{
|
||||||
|
borderColor:'rgb(2,59,185)',
|
||||||
|
backgroundColor:'rgb(224,229,239)',
|
||||||
|
fontStyle:{
|
||||||
|
font:"Arial",
|
||||||
|
size:8,
|
||||||
|
style:"normal",
|
||||||
|
weight:"normal",
|
||||||
|
color:"rgb(82,92,97)"
|
||||||
|
},
|
||||||
|
msgKey:'MAIN_TOPIC',
|
||||||
|
innerPadding:3,
|
||||||
|
shapeType:mindplot.model.TopicShape.LINE
|
||||||
|
|
||||||
|
},
|
||||||
|
|
||||||
|
SUB_TOPIC:{
|
||||||
|
borderColor:'rgb(2,59,185)',
|
||||||
|
backgroundColor:'rgb(224,229,239)',
|
||||||
|
fontStyle:{
|
||||||
|
font:"Arial",
|
||||||
|
size:6,
|
||||||
|
style:"normal",
|
||||||
|
weight:"normal",
|
||||||
|
color:"rgb(82,92,97)"
|
||||||
|
},
|
||||||
|
msgKey:'SUB_TOPIC',
|
||||||
|
innerPadding:3,
|
||||||
|
shapeType:mindplot.model.TopicShape.LINE
|
||||||
|
},
|
||||||
|
|
||||||
|
ISOLATED_TOPIC:{
|
||||||
|
borderColor:'rgb(2,59,185)',
|
||||||
|
backgroundColor:'rgb(224,229,239)',
|
||||||
|
fontStyle:{
|
||||||
|
font:"Verdana",
|
||||||
|
size:8,
|
||||||
|
style:"normal",
|
||||||
|
weight:"normal",
|
||||||
|
color:"rgb(82,92,97)"
|
||||||
|
},
|
||||||
|
msgKey:'ISOLATED_TOPIC',
|
||||||
|
innerPadding:4,
|
||||||
|
shapeType:mindplot.model.TopicShape.LINE
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
@ -357,7 +357,7 @@ public class FreemindImporter
|
|||||||
* 3 -> 2
|
* 3 -> 2
|
||||||
* 4 -> 4
|
* 4 -> 4
|
||||||
*/
|
*/
|
||||||
private int calcFirstLevelOrder(@NotNull List<Object> freeChilden, @NotNull Node freeChild) {
|
private int calcFirstLevelOrder(@NotNull List<Object> freeChilden, @Nullable Node freeChild) {
|
||||||
final List<Node> nodes = new ArrayList<Node>();
|
final List<Node> nodes = new ArrayList<Node>();
|
||||||
int result;
|
int result;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user