16mm
/
mcopy
1
0
Fork 0
Code Issues 14 Pull Requests Projects 2 Releases 13 Wiki Activity

Mscript update #1

Merged
sixteenmillimeter merged 21 commits from mscript into master 2018-06-17 03:25:21 +00:00
Conversation 0 Commits 21 Files Changed 18 +12 -9
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fc73859f8f - Show all commits

2
app/lib/ui/light.js
View File

@ -124,8 +124,6 @@ light.set = function (rgb, callback) { //rgb = [0,0,0]
rgb : rgb,
id : uuid.v4()
};
console.log(rgb)
console.log(obj)
ipcRenderer.sendSync('light', obj);
if (typeof callback !== 'undefined') {

19
app/lib/ui/mscript.js
View File

@ -60,11 +60,16 @@ mse.mscript.toGUI = function () {
for (let i = 0; i < mse.mscript.data.arr.length; i++) {
c = mse.mscript.data.arr[i];
mcopy.state.sequence.arr[i] = c;
//if (c === 'CF' || c === 'CB') {
mcopy.state.sequence.light[i] = light.color.join(',');
//} else {
//mcopy.state.sequence.light[i] = '';
//}
console.dir(mse.mscript.data);
if (c === 'CF' || c === 'CB') {
if (typeof mse.mscript.data.light[i] !== 'undefined' && mse.mscript.data.light[i] !== '') {
mcopy.state.sequence.light[i] = mse.mscript.data.light[i];
} else {
mcopy.state.sequence.light[i] = light.color.join(',');
}
} else {
mcopy.state.sequence.light[i] = '';
}
gui.grid.state(i);
}
};
@ -114,11 +119,11 @@ mse.mscript.prepare = function () {
obj = {
cmd : mse.mscript.data.arr[i]
};
/*if (mse.mscript.data.light[i] !== '') {
if (typeof mse.mscript.data.light[i] !== 'undefined' && mse.mscript.data.light[i] !== '') {
obj.light = mse.mscript.data.light[i];
} else {
obj.light = light.color.join(',');
}*/
}
arr.push(obj);
}
return arr;