From 9ee8db13939a067379ec25b0046979300316765c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= Date: Tue, 27 Oct 2020 18:16:59 +0100 Subject: [PATCH] new round of hound fixes --- pype/hosts/harmony/js/PypeHarmony.js | 12 ++++++------ pype/hosts/harmony/js/loaders/ImageSequenceLoader.js | 6 ++++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pype/hosts/harmony/js/PypeHarmony.js b/pype/hosts/harmony/js/PypeHarmony.js index 61d09f649a..57137d98c6 100644 --- a/pype/hosts/harmony/js/PypeHarmony.js +++ b/pype/hosts/harmony/js/PypeHarmony.js @@ -33,12 +33,12 @@ PypeHarmony.message = function(message) { * @param {obj} settings Scene settings. */ PypeHarmony.setSceneSettings = function(settings) { - if (settings['fps']) { - scene.setFrameRate(settings['fps']); + if (settings.fps) { + scene.setFrameRate(settings.fps); } - if (settings['frameStart'] && settings['frameEnd']) { - var duration = settings['frameEnd'] - settings['frameStart'] + 1; + if (settings.frameStart && settings.frameEnd) { + var duration = settings.frameEnd - settings.frameStart + 1; if (frame.numberOf() > duration) { frame.remove(duration, frame.numberOf() - duration); @@ -51,9 +51,9 @@ PypeHarmony.setSceneSettings = function(settings) { scene.setStartFrame(1); scene.setStopFrame(duration); } - if (settings['resolutionWidth'] && settings['resolutionHeight']) { + if (settings.resolutionWidth && settings.resolutionHeight) { scene.setDefaultResolution( - settings['resolutionWidth'], settings['resolutionHeight'], 41.112 + settings.resolutionWidth, settings.resolutionHeight, 41.112 ); } }; diff --git a/pype/hosts/harmony/js/loaders/ImageSequenceLoader.js b/pype/hosts/harmony/js/loaders/ImageSequenceLoader.js index b888b0bd74..7801f65cdd 100644 --- a/pype/hosts/harmony/js/loaders/ImageSequenceLoader.js +++ b/pype/hosts/harmony/js/loaders/ImageSequenceLoader.js @@ -155,6 +155,7 @@ ImageSequenceLoader.prototype.importFiles = function(args) { } var drawingFilePath; + var timing; node.linkAttr(read, 'DRAWING.ELEMENT', uniqueColumnName); if (files.length === 1) { // Create a drawing drawing, 'true' indicate that the file exists. @@ -164,7 +165,7 @@ ImageSequenceLoader.prototype.importFiles = function(args) { PypeHarmony.copyFile(files[0], drawingFilePath); // Expose the image for the entire frame range. for (var i =0; i <= frame.numberOf() - 1; ++i) { - var timing = startFrame + i; + timing = startFrame + i; column.setEntry(uniqueColumnName, 1, timing, '1'); } } else { @@ -246,6 +247,7 @@ ImageSequenceLoader.prototype.replaceFiles = function(args) { } var drawingFilePath; + var timing; if (files.length == 1) { // Create a drawing drawing, 'true' indicate that the file exists. Drawing.create(elemId, 1, true); @@ -256,7 +258,7 @@ ImageSequenceLoader.prototype.replaceFiles = function(args) { MessageLog.trace(drawingFilePath); // Expose the image for the entire frame range. for (var k =0; k <= frame.numberOf() - 1; ++k) { - var timing = startFrame + k; + timing = startFrame + k; column.setEntry(_column, 1, timing, '1'); } } else {