From 2078bfa96afaef40acb4edac99848ba55e808ef1 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Thu, 3 May 2012 15:15:21 -0700
Subject: Refactor creating elements. Removed makeNJElement and separated the
model creation
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
js/tools/PenTool.js | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
(limited to 'js/tools/PenTool.js')
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js
index 8ecc9f79..16990ca7 100755
--- a/js/tools/PenTool.js
+++ b/js/tools/PenTool.js
@@ -557,17 +557,16 @@ exports.PenTool = Montage.create(ShapeTool, {
return;
}
- w= Math.round(w);
+ w = Math.round(w);
h = Math.round(h);
var left = Math.round(midPt[0] - 0.5 * w);
var top = Math.round(midPt[1] - 0.5 * h);
if (!canvas) {
- var newCanvas = null;
- newCanvas = NJUtils.makeNJElement("canvas", "Subpath", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true);
- var elementModel = TagTool.makeElement(parseInt(w), parseInt(h), planeMat, midPt, newCanvas, true);
- //note that we set the notify event to false because we send the event separately at end of this code block
- ElementMediator.addElements(newCanvas, elementModel.data, false);
+ var newCanvas = document.application.njUtils.make("canvas", {"data-RDGE-id": NJUtils.generateRandom()}, this.application.ninja.currentDocument);
+ document.application.njUtils.createModelWithShape(newCanvas, "Subpath");
+ var styles = document.application.njUtils.stylesFromDraw(newCanvas, parseInt(w), parseInt(h), {midPt: midPt, planeMat: planeMat});
+ this.application.ninja.elementMediator.addElements(newCanvas, styles, false);
// create all the GL stuff
var world = this.getGLWorld(newCanvas, this._useWebGL);//this.options.use3D);//this.CreateGLWorld(planeMat, midPt, newCanvas, this._useWebGL);//fillMaterial, strokeMaterial);
--
cgit v1.2.3