Merge branch 'development' of git://github.com/novakps/kemia into dev…

…elopment
kemia · Jan 12, 2011 · daf9339 · daf9339
2 parents 7a669ba + ee51e88
commit daf9339
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 16 deletions.
diff --git a/kemia/controller/plugins/move.js b/kemia/controller/plugins/move.js
@@ -951,38 +951,47 @@ kemia.controller.plugins.Move.prototype.rotateMolecule = function(e, molecule) {
 
     var d = new goog.fx.Dragger(this.editorObject.getOriginalElement());
 
-    var trans;
-    if (this.editorObject.reactionRenderer.transform) {
-        trans = this.editorObject.reactionRenderer.transform;
-    } else {
-        trans = this.editorObject.reactionRenderer.moleculeRenderer.transform;
-    }
-
-    d._center = trans.transformCoords([molecule.getCenter()])[0];
+    // var trans;
+    // if (this.editorObject.reactionRenderer.transform) {
+    //     trans = this.editorObject.reactionRenderer.transform;
+    // } else {
+    //     trans = this.editorObject.reactionRenderer.moleculeRenderer.transform;
+    // }
+
+    // d._center = trans.transformCoords([molecule.getCenter()])[0];
+	d._center = molecule.getCenter();
     d._start = kemia.controller.ReactionEditor.getMouseCoords(e);
     d._start_angle = goog.math.angle(d._center.x, d._center.y, d._start.x,
     d._start.y);
     d._initDeltaX = null;
     d._initDeltaY = null;
     d._elements = molecule._elements;
-    d.molecule = molecule;
-    d.editor = this.editorObject;
+    d._molecule = molecule;
+    d._editor = this.editorObject;
+	d._renderer = this.editorObject.reactionRenderer.moleculeRenderer;
 
     d.addEventListener(goog.fx.Dragger.EventType.DRAG,
     function(e) {
         d._initDeltaX = d._initDeltaX || d.deltaX;
         d._initDeltaY = d._initDeltaY || d.deltaY;
         var deltaX = d.deltaX - d._initDeltaX;
         var deltaY = d.deltaY - d._initDeltaY;
-        var new_angle = goog.math.angle(d._center.x, d._center.y, d._start.x
-        + deltaX, d._start.y + deltaY);
+        var new_angle = goog.math.angle(
+			d._center.x, 
+			d._center.y, 
+			d._start.x + deltaX, 
+			d._start.y + deltaY);
         d._degrees = new_angle - d._start_angle;
-        d._elements.setTransformation(0, 0, d._degrees, d._center.x, d._center.y);
+        // d._elements.setTransformation(0, 0, d._degrees, d._center.x, d._center.y);
+		d._molecule.rotate( - d._degrees, d._center);
+		d._elements.clear();
+		d._renderer.render(d._molecule, d._renderer.transform);
+
     });
     d.addEventListener(goog.fx.Dragger.EventType.END,
     function(e) {
-        d.molecule.rotate( - d._degrees, d.molecule.getCenter());
-        d.editor.setModelsSilently(d.editor.getModels());
+        // d.molecule.rotate( - d._degrees, d.molecule.getCenter());
+        d._editor.setModelsSilently(d._editor.getModels());
         d.dispose();
     });
     d.startDrag(e);

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://localhost:9810/compile?id=controller_reaction_editor_demo" ></script>
+		<script src="http://192.168.1.104:9810/compile?id=controller_reaction_editor_demo" ></script>
 		<script>
 		(function() {
 			window.onload = function() {