From a44e6b40fea052d9509bfa193b51dbc7a5d3bd06 Mon Sep 17 00:00:00 2001 From: Abdullah Alfaraj Date: Fri, 20 Jan 2023 15:47:50 +0300 Subject: [PATCH] add a set init image button to the viewer tab --- index.html | 1 + index.js | 35 +++++++---------------------------- psapi.js | 5 ++++- viewer.js | 4 ++-- 4 files changed, 14 insertions(+), 31 deletions(-) diff --git a/index.html b/index.html index 55509e2..f63f9ee 100644 --- a/index.html +++ b/index.html @@ -349,6 +349,7 @@
+ diff --git a/index.js b/index.js index 8984e30..1ebb659 100644 --- a/index.js +++ b/index.js @@ -99,7 +99,7 @@ const eventHandler = async (event, descriptor) => { // startSessionUI// green color const current_mode = html_manip.getMode() if(g_generation_session.isSameMode(current_mode)){ - g_ui.startSessionUI() + g_ui.startSessionUI() } } @@ -2073,34 +2073,13 @@ document } ) -// document.getElementById('bGetInitImage').addEventListener('click', () => { -// sdapi.getInitImage(g_init_image_name) -// }) -// async function setInitImage () { -// // await exportHelper.exportPng() -// try { -// const layer = await app.activeDocument.activeLayers[0] -// old_name = layer.name -// // await psapi.exportPng(random_session_id) -// image_name = psapi.layerNameToFileName(old_name,layer.id,random_session_id) -// image_name = `${image_name}.png` - - -// await psapi.newExportPng(layer,image_name) - -// // image_name = psapi.layerToFileName(layer,random_session_id) - -// g_init_image_name = image_name -// console.log(image_name) -// const image_src = await sdapi.getInitImage(g_init_image_name) -// let ini_image_element = document.getElementById('init_image') -// ini_image_element.src = image_src -// } catch (e) { -// console.error(`setInitImage error:, ${e}`) -// } -// } -// document.getElementById('bSetInitImage').addEventListener('click', setInitImage) + + document.getElementById('btnSetInitImageViewer').addEventListener('click', async ()=> { + const layer = await app.activeDocument.activeLayers[0] + psapi.setInitImage(layer, random_session_id) + }) + document.getElementById('bSetInitImage').addEventListener('click', async ()=> { const layer = await app.activeDocument.activeLayers[0] psapi.setInitImage(layer, random_session_id) diff --git a/psapi.js b/psapi.js index 405e9ca..cf4006e 100644 --- a/psapi.js +++ b/psapi.js @@ -680,15 +680,18 @@ async function setInitImage (layer, session_id) { // await exportPng(session_id) // image_name = await app.activeDocument.activeLayers[0].name - // image_name = layerNameToFileName(old_name,layer.id,random_session_id) + //convert layer name to a file name image_name = layerNameToFileName(old_name,layer.id,session_id) image_name = `${image_name}.png` + + //the width and height of the exported image const width = html_manip.getWidth() const height = html_manip.getHeight() await newExportPng(layer,image_name,width,height) g_init_image_name = image_name console.log(image_name) + const image_src = await sdapi.getInitImage(g_init_image_name) let ini_image_element = document.getElementById('init_image') ini_image_element.src = image_src diff --git a/viewer.js b/viewer.js index 1fa0e41..e9e8776 100644 --- a/viewer.js +++ b/viewer.js @@ -222,7 +222,7 @@ class InitImage extends ViewerImage { // selectLayers.push(this.solid_layer) // } - psapi.selectLayers(selectLayers) + psapi.selectLayersExe(selectLayers) // console.log(`${this.layer.id} got selected`); } @@ -316,7 +316,7 @@ class InitMaskImage extends ViewerImage { // selectLayers.push(this.solid_layer) // } - psapi.selectLayers(selectLayers) + psapi.selectLayersExe(selectLayers) // console.log(`${this.layer.id} got selected`); }