fix placement of new pluses and arrows following zoom-out or zoom-in

kemia · Jan 13, 2011 · d227ec2 · d227ec2
1 parent ee51e88
commit d227ec2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/kemia/controller/plugins/arrow_plus_edit.js b/kemia/controller/plugins/arrow_plus_edit.js
@@ -87,25 +87,25 @@ kemia.controller.plugins.ArrowPlusEdit.prototype.handleMouseDown = function(e) {
 
 	if (this.activeCommand[kemia.controller.plugins.ArrowPlusEdit.COMMAND.EDIT_ARROW]) {
 		this.editorObject.dispatchBeforeChange();
-		var trans = this.editorObject.reactionRenderer.moleculeRenderer.transform
-				.createInverse();
-		var coords = trans.transformCoords([new goog.math.Coordinate(
-				e.offsetX, e.offsetY)]);
+		var pos = kemia.controller.ReactionEditor
+				.getMouseCoords(e);
+		var coord = this.editorObject.reactionRenderer.transform.createInverse()
+						.transformCoords([pos])[0];
 		var model = this.editorObject.getModels()[0];
 		if (model instanceof kemia.model.Reaction){
 			model.setArrow(new kemia.model.Arrow(
-				coords[0]));
+				coord));
 		}
 		this.editorObject.setModelsSilently(this.editorObject.getModels());
 		this.editorObject.dispatchChange();
 	} else if (this.activeCommand[kemia.controller.plugins.ArrowPlusEdit.COMMAND.EDIT_PLUS]) {
 		this.editorObject.dispatchBeforeChange();
-		var trans = this.editorObject.reactionRenderer.moleculeRenderer.transform
-				.createInverse();
-		var coords = trans.transformCoords([new goog.math.Coordinate(
-				e.offsetX, e.offsetY)]);
+		var pos = kemia.controller.ReactionEditor
+				.getMouseCoords(e);
+		var coord = this.editorObject.reactionRenderer.transform.createInverse()
+						.transformCoords([pos])[0];
 		this.editorObject.getModels()[0]
-				.addPlus(new kemia.model.Plus(coords[0]));
+				.addPlus(new kemia.model.Plus(coord));
 		this.editorObject.setModelsSilently(this.editorObject.getModels());
 		this.editorObject.dispatchChange();
 	}

diff --git a/kemia/controller/reaction_editor_demo.html b/kemia/controller/reaction_editor_demo.html
@@ -5,7 +5,7 @@
 <title >
 kemia.controller.ReactionEditor
 </title>
-		<script src="http://192.168.1.104:9810/compile?id=controller_reaction_editor_demo" ></script>
+		<script src="http://localhost:9810/compile?id=controller_reaction_editor_demo" ></script>
 		<script>
 		(function() {
 			window.onload = function() {

diff --git a/kemia/io/json.js b/kemia/io/json.js
@@ -351,7 +351,7 @@ kemia.io.json.readReaction = function(arg, opt_permit_overlap) {
         rxn.centerArrow();
     }
 
-    if (rxn.pluses.length == 0) {
+    if (rxn.pluses.length == 0 && !opt_permit_overlap) {
         rxn.generatePluses(rxn.getReactants());
         rxn.generatePluses(rxn.getProducts());
     }