select tiepoints on create.

fixes a bug initializing QuadraticTransform2 objects
geocam · Oct 17, 2012 · 95f53ee · 95f53ee
1 parent 8ae9c61
commit 95f53ee
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/geocamTiePoint/static/geocamTiePoint/js/backbone/views.js b/geocamTiePoint/static/geocamTiePoint/js/backbone/views.js
@@ -171,6 +171,12 @@ $(function($) {
             assert(false, "Override me in a subclass!");
         },
 
+        selectMarker: function(idx) {
+            _.each(this.markers, function(marker, i) {
+                marker.set('selected', i === idx);
+            });
+        },
+
         handleClick: function(event) {
             if (!_.isUndefined(window.draggingG) && draggingG) return;
             assert(!_.isUndefined(window.actionPerformed), "Missing global actionPerformed().  Check for undo.js");
@@ -184,7 +190,7 @@ $(function($) {
 
             this.markers.push(marker);
             this.updateTiepointFromMarker(index, marker);
-            //imageCoordsG.push(coord);
+            this.selectMarker(index);
         },
 
         initGmapUIHandlers: function(){

diff --git a/geocamTiePoint/static/geocamTiePoint/js/transform.js b/geocamTiePoint/static/geocamTiePoint/js/transform.js
@@ -418,9 +418,13 @@ $(function($) {
             'quadratic': QuadraticTransform,
             'quadratic2': QuadraticTransform2,
         }
-        if (! transformJSON in classmap) throw "Unexpected transform type";
+        if (! transformJSON.type in classmap) throw "Unexpected transform type";
         var transformClass = classmap[transformJSON.type];
-        return new transformClass( matrixFromNestedList(transformJSON.matrix) )
+        if ( transformClass === QuadraticTransform2 ) {
+            return new transformClass( matrixFromNestedList(transformJSON.matrix), transformJSON.quadraticTerms);
+        } else {
+            return new transformClass( matrixFromNestedList(transformJSON.matrix) );
+        }
     }
 
     /**********************************************************************