From 833e817dc0f76a36963e9c47bc3788f34c232f95 Mon Sep 17 00:00:00 2001 From: Victor Seiji Hariki Date: Sun, 29 Jan 2023 02:15:39 -0300 Subject: [PATCH 1/2] remove useless workspaces.js Signed-off-by: Victor Seiji Hariki --- index.html | 3 - js/index.js | 25 +++----- js/lib/workspaces.d.js | 0 js/lib/workspaces.js | 142 ----------------------------------------- 4 files changed, 8 insertions(+), 162 deletions(-) delete mode 100644 js/lib/workspaces.d.js delete mode 100644 js/lib/workspaces.js diff --git a/index.html b/index.html index 4a5332b..37e1339 100644 --- a/index.html +++ b/index.html @@ -401,9 +401,6 @@ - diff --git a/js/index.js b/js/index.js index cc98705..90485d9 100644 --- a/js/index.js +++ b/js/index.js @@ -145,19 +145,6 @@ var url = "/sdapi/v1/"; const basePixelCount = 64; //64 px - ALWAYS 64 PX var focused = true; -function getSDData() { - const w = workspaces.current.settings; - w.ste; - return { - prompt: w.prompt, - negative_prompt: w.neg_prompt, - seed: w.seed, - - cfg_scale: w.cfg_scale, - steps: w.steps, - }; -} - function startup() { testHostConfiguration(); loadSettings(); @@ -587,16 +574,16 @@ const makeSlider = ( textStep = null, valuecb = null ) => { - const local = lsKey && workspaces.current.settings[lsKey]; + const local = lsKey && localStorage.getItem(`openoutpaint/${lsKey}`); const def = parseFloat(local === null ? defaultValue : local); let cb = (v) => { stableDiffusionData[lsKey] = v; - if (lsKey) workspaces.current.settings[lsKey] = v; + if (lsKey) localStorage.setItem(`openoutpaint/${lsKey}`, v); }; if (valuecb) { cb = (v) => { valuecb(v); - if (lsKey) workspaces.current.settings[lsKey] = v; + localStorage.setItem(`openoutpaint/${lsKey}`, v); }; } return createSlider(label, el, { @@ -1284,6 +1271,10 @@ function loadSettings() { localStorage.getItem("openoutpaint/mask_blur") == null ? 0 : localStorage.getItem("openoutpaint/mask_blur"); + var _seed = + localStorage.getItem("openoutpaint/seed") == null + ? -1 + : localStorage.getItem("openoutpaint/seed"); let _enable_hr = localStorage.getItem("openoutpaint/enable_hr") === null ? false @@ -1314,7 +1305,7 @@ function loadSettings() { // set the values into the UI document.getElementById("maskBlur").value = Number(_mask_blur); - document.getElementById("seed").value = workspaces.current.settings.seed; + document.getElementById("seed").value = Number(_seed); document.getElementById("cbxHRFix").checked = Boolean(_enable_hr); document.getElementById("cbxRestoreFaces").checked = Boolean(_restore_faces); document.getElementById("cbxSyncCursorSize").checked = diff --git a/js/lib/workspaces.d.js b/js/lib/workspaces.d.js deleted file mode 100644 index e69de29..0000000 diff --git a/js/lib/workspaces.js b/js/lib/workspaces.js deleted file mode 100644 index 37a2804..0000000 --- a/js/lib/workspaces.js +++ /dev/null @@ -1,142 +0,0 @@ -/** - * Workspaces (or sessions) are settings and canvas state storage structures that can be changed at will, saved, and restored. - */ - -/** - * Represents a workspace - * - * @template [S] Settings type - */ -class Workspace { - /** - * The name of the workspace - * @type {string} - */ - name = "Workspace Name"; - - /** - * Workspace default settings. - * - * @type {S} - */ - defaults = {}; - - /** - * Storage for workspace settings. - * - * @type {S} - */ - settings = new Proxy( - {}, - { - get: (t, name) => { - if (t[name] === undefined) - t[name] = - JSON.parse(localStorage.getItem(`openoutpaint/${name}`)) ?? - this.defaults[name]; - return t[name]; - }, - set: (t, name, value) => { - localStorage.setItem(`openoutpaint/${name}`, JSON.stringify(value)); - t[name] = value; - }, - } - ); - - /** - * Storage for other data - * - * @type {Record} - */ - data = new Proxy({}, {}); - - /** - * Saves the data to the workspace - * - * @param {string} key The key of the data to be saved (eg. history or layers) - * @param {any} data The data to be saved on this key. MUST BE SERIALIZABLE. - */ - save(key, data) { - this.data[key] = data; - } - - /** - * Gets saved data from the workspace - * - * @param {string} key The key of the data to be saved (eg. history or layers) - * @param {any} data The data to be saved on this key. MUST BE SERIALIZABLE. - */ - load(key) { - return this.data[key]; - } - - /** - * @param {string} name The name of the workspace - * @param {Object} options - * @param {S} options.defaults Default workspace settings - */ - constructor(name, options = {}) { - defaultOpt(options, { - defaults: { - /** Default Prompt - REQ */ - prompt: "ocean floor scientific expedition, underwater wildlife", - /** Default Negative Prompt - REQ */ - neg_prompt: - "people, person, humans, human, divers, diver, glitch, error, text, watermark, bad quality, blurry", - /** Default Stable Diffusion Seed - REQ */ - seed: -1, - /** Default CFG Scale - REQ */ - cfg_scale: 7.0, - /** Default steps - REQ */ - steps: 30, - /** Default Resolution */ - resolution: 512, - }, - }); - - this.name = name; - this.defaults = options.defaults; - } -} - -const workspaces = { - /** - * Loaded workspace - * - * @type {Workspace} - */ - _workspace: null, - - get current() { - return this._workspace; - }, - - /** - * On Workspace Changed - * - * @type {Observer<{workspace: Workspace}>} - */ - onchange: new Observer(), - - /** - * Loads a workspace - * - * @param {Workspace} workspace Workspace to load - */ - loadWorkspace(workspace) { - console.info(`[workspaces] Loading workspace: ${workspace.name}`); - - // Set current workspace - this._workspace = workspace; - - // Notify observers that the workspace has changed - this.onchange.emit({workspace}); - }, -}; - -// Creates a new workspace instance -workspaces.loadWorkspace( - new Workspace("Default", { - workspaceDefaults, - }) -); From 462b1d67133403e0a637f37345e292d32e16dc7d Mon Sep 17 00:00:00 2001 From: seijihariki Date: Sun, 29 Jan 2023 05:16:17 +0000 Subject: [PATCH 2/2] Fixed resource hashes --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 37e1339..0423be7 100644 --- a/index.html +++ b/index.html @@ -419,7 +419,7 @@ - +