   ([lattice layout-function]
      (let [#^JFrame frame (JFrame. "conexp-clj Lattice")]
        (doto frame
-	 (.add (make-lattice-editor frame lattice layout-function))
+	 (.add (make-lattice-editor frame (layout-function lattice)))
 	 (.setSize (Dimension. 600 600))
 	 (.setVisible true)))))
 

;;; Constructor

(defn make-lattice-editor
  "Creates a lattice editor for lattice with initial layout."
  [frame lattice layout-function]
  (let [#^JPanel main-panel (JPanel. (BorderLayout.)),

	scn (draw-on-scene (layout-function lattice)),
	canvas (get-canvas-from-scene scn),

	#^JPanel canvas-panel (JPanel. (BorderLayout.)),

				  (do-swing
				   (with-swing-error-msg frame "An Error occured."
				     (let [[r a g i] (get-force-parameters)]
				       (improve-with-force scn i r a g))))))))

;; zoom-move

