Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-24 12:54:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

new round of hound fixes

Browse source
This commit is contained in:
Ondřej Samohel 2020-10-27 18:16:59 +01:00
parent 953df90e66
commit 9ee8db1393
No known key found for this signature in database
GPG key ID: 8A29C663C672C2B7
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pype/hosts/harmony/js/PypeHarmony.js
View file

@ -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
);
}
};

6
pype/hosts/harmony/js/loaders/ImageSequenceLoader.js
View file

@ -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 {