add accessors for oDrawing and oElement to get the synched elements/synched drawings with current drawing/element

Author: mchaptel

openHarmony/openHarmony_column.js

@@ -213,7 +213,7 @@ Object.defineProperty($.oColumn.prototype, 'subColumns', {
 
 /**
  * The type of easing used by the column
- * @name $.oColumn#subColumns
+ * @name $.oColumn#easeType
  * @readonly
  * @type {object}
  */
@@ -498,8 +498,6 @@ $.oColumn.prototype.interpolateValueAtFrame = function(percentage, frameNumber){
   if (typeof frameNumber === 'undefined') var frameNumber = this.$.scn.currentFrame;
   if (typeof percentage === 'undefined') var percentage = 50;
 
-  $.log(frameNumber)
-  $.log(this.frames[frameNumber])
   var _frame = this.frames[frameNumber];
   var _leftKey = _frame.keyframeLeft;
   var _rightKey = _frame.keyframeRight;
@@ -578,7 +576,12 @@ $.oDrawingColumn.prototype.constructor = $.oColumn;
  */
 Object.defineProperty($.oDrawingColumn.prototype, 'element', {
     get : function(){
-        return new this.$.oElement(column.getElementIdOfDrawing( this.uniqueName), this);
+      // get info about synched layer if the column is fetched from the attribute (which is the case most of the time)
+      var _synchedLayer = null;
+      if (this.attributeObject){
+        _synchedLayer = this.attributeObject.layer.getValue();
+      }
+      return new this.$.oElement(column.getElementIdOfDrawing( this.uniqueName), _synchedLayer, this);
     },
 
     set : function(oElementObject){

openHarmony/openHarmony_drawing.js

@@ -74,7 +74,7 @@ $.oDrawing = function (name, synchedLayer, oElementObject) {
     this._key = Drawing.Key({
       elementId: oElementObject.id,
       exposure: name
-    });  
+    });
   }
 
   this._overlay = new this.$.oArtLayer(3, this);
@@ -430,6 +430,26 @@ Object.defineProperty($.oDrawing.prototype, 'drawingData', {
 })
 
 
+/**
+ * The drawings of the same name in other elements synched with this one.
+ * @name $.oDrawing#synchedDrawing
+ * @type {$.oDrawing[]}
+ * @readonly
+ * @private
+ */
+Object.defineProperty($.oDrawing.prototype, 'synchedDrawings', {
+  get: function () {
+    var _syncedElements = this.element.synchedElements;
+    var _syncedDrawings = []
+    for (e in _syncedElements){
+      // skip this element
+      if (_syncedElements[e]._synchedLayer == this.element._synchedLayer) continue;
+      _syncedDrawings.push(_syncedElements[e].getDrawingByName(this.name));
+    }
+    return _syncedDrawings;
+  }
+})
+
 
 
 // $.oDrawing Class methods
@@ -575,11 +595,24 @@ $.oDrawing.prototype.setAsActiveDrawing = function (artLayer) {
  * @param {string}   [newName]   A new name for the drawing. By default, the name will be the number of the frame.
  * @returns {$.oDrawing}   the newly created drawing
  */
-$.oDrawing.prototype.duplicate = function(frame, newName){
+$.oDrawing.prototype.duplicate = function(frame, newName, duplicateSynchedDrawings){
   var _element = this.element
+  if (typeof duplicateSynchedDrawings === 'undefined') duplicateSynchedDrawings = true; // hidden parameter used to avoid recursion bomb
   if (typeof frame ==='undefined') var frame = this.$.scn.currentFrame;
   if (typeof newName === 'undefined') var newName = frame;
-  var newDrawing = _element.addDrawing(frame, newName, this.path)
+  var newDrawing = _element.addDrawing(frame, newName, this.path);
+
+  // also duplicate synched drawings
+  if (duplicateSynchedDrawings){
+    var _syncedDrawings = newDrawing.synchedDrawings;
+    for (var i in _syncedDrawings){
+      var _originalDrawing = _syncedDrawings[i].element.getDrawingByName(this.name);
+      var _file = new this.$.oFile(_originalDrawing.path);
+      var _path = new this.$.oFile(_syncedDrawings[i].path);
+      return _file.copy(_path.folder, _path.name, true);
+    }
+  }
+
   return newDrawing;
 }
 

openHarmony/openHarmony_element.js

@@ -54,13 +54,14 @@
  * @constructor
  * @classdesc  $.oElement Class
  * @param   {int}                   id                          The element ID.
+ * @param   {str}                   synchedLayer                The value of the Drawing Node drawing.element.layer attribute for synched layers
  * @param   {$.oColumn}             oColumnObject               The column object associated to the element.
  *
  * @property {int}                  id                          The element ID.
  * @property {$.oColumn}            oColumnObject               The column object associated to the element.
  */
 $.oElement = function( id, synchedLayer, oColumnObject){
-  if (typeof synchedLayer === 'undefined') synchedLayer = null;
+  if (typeof synchedLayer === 'undefined' || !synchedLayer) synchedLayer = null;
   this._type = "element";
 
   this._synchedLayer = synchedLayer;
@@ -147,6 +148,20 @@ Object.defineProperty($.oElement.prototype, 'palettes', {
 })
 
 
+/**
+ * A list of the other elements synched with this one.
+ * @name $.oElement#synchedElements
+ * @readonly
+ * @type {$.oDrawing[]}
+ */
+Object.defineProperty($.oElement.prototype, 'synchedElements', {
+  get : function(){
+    var _id = this.id;
+    return $.scene.elements.filter(function(e){return e.id == _id});
+  }
+})
+
+
 // $.oElement Class methods
 
 /**

openHarmony/openHarmony_node.js

@@ -1978,9 +1978,7 @@ $.oDrawingNode.prototype.constructor = $.oDrawingNode;
  */
 Object.defineProperty($.oDrawingNode.prototype, "element", {
   get : function(){
-    var _column = this.attributes.drawing.element.column;
-    var _synchedLayer = this.attributes.drawing.element.layer;
-    return ( new this.$.oElement( node.getElementId(this.path), _synchedLayer.getValue(), _column ) );
+    return this.timingColumn.element;
   },
 
   set : function( oElementObject ){
@@ -1997,8 +1995,7 @@ Object.defineProperty($.oDrawingNode.prototype, "element", {
  */
 Object.defineProperty($.oDrawingNode.prototype, "timingColumn", {
   get : function(){
-    var _column = this.attributes.drawing.element.column;
-    return _column;
+    return this.attributes.drawing.element.column;
   },
 
   set : function (oColumnObject){

openHarmony/openHarmony_scene.js

@@ -527,7 +527,10 @@ Object.defineProperty($.oScene.prototype, 'columns', {
     get : function(){
         var _columns = [];
         for (var i=0; i<column.numberOf(); i++){
-            _columns.push( this.$column(column.getName(i)) );
+          // no attribute can be passed to the constructor
+          // since a column can be linked to several attributes.
+          // access it from the node to get the missing information.
+          _columns.push( this.$getColumnByName(column.getName(i)) );
         }
         return _columns;
     }
@@ -562,30 +565,53 @@ Object.defineProperty($.oScene.prototype, 'palettes', {
 Object.defineProperty($.oScene.prototype, 'elements', {
   get : function(){
     var _elements = [];
-    var _columns = this.columns;
-    var _ids = [];
-    for (var i in _columns){
-      if (_columns.type != "DRAWING") continue;
-      var _element = _columns[i].element
-      _elements.push(_element);
-      if (_ids.indexOf(_element.id) == -1) _ids.push (_element.id);
+    var _ids = {};
+
+    // fetching the elements from the nodes to get the synched drawing attribute value
+    var _nodes = $.scene.getNodesByType("READ");
+    for (var n in _nodes) {
+      var _element = _nodes[n].element;
+      var _layer = _element._synchedLayer;
+      var _foundDuplicate = false;
+      // store ids and layer info (synced drawings) to avoid duplicates
+
+      function isInKeys(value, object){
+        // for some reason we can't use Object.keys(_ids).indexOf(_element.id), so we fake it
+        var _keys = Object.keys(object);
+        var _exists = false;
+        for (var i in _keys)
+          if (_keys[i] == value) _exists = true;
+        return _exists;
+      }
+
+      if (!isInKeys(_element.id, _ids)){
+        _ids[_element.id] = [];
+      }
+      if (_ids[_element.id].indexOf(_layer) == -1){
+        _ids[_element.id].push(_layer);
+      }else{
+        _foundDuplicate = true;
+      }
+
+      if(!_foundDuplicate){
+        _elements.push(_nodes[n].element);
+      }
     }
 
     // adding the elements not linked to columns
     var _elementNum = element.numberOf();
     for (var i = 0; i<_elementNum; i++){
       var _id = element.id(i);
-      if (_ids.indexOf(_id) == -1) {
-        _elements.push(new this.$.oElement(_id));
-        _ids.push (_id)
+      if (!isInKeys(_id, _ids)) {
+        _elements.push(new this.$.oElement(_id)); // these elements have no column and no attribute
+        _ids[_id] = [];
       }
     }
     return _elements;
   }
 });
 
 
-
 /**
  * The length of the scene.
  * @name $.oScene#length
@@ -820,8 +846,8 @@ $.oScene.prototype.getNodeByPath = function(fullPath){
 }
 
 /**
- * Returns the nodes of a certain type in the entire scene.
- * @param   {string}      typeName       The name of the node.
+ * Returns the nodes of a certain type in the entire scene (includes group contents).
+ * @param   {string}        typeName       The type of node.
  *
  * @return  {$.oNode[]}     The nodes found.
  */