From fb6d70a965da58ac4ecccc32204ed6b06fba97e4 Mon Sep 17 00:00:00 2001 From: yolain Date: Thu, 28 Dec 2023 18:12:35 +0800 Subject: [PATCH] fix:easy xyplot fontfile path error --- README.en.md | 1 + README.md | 1 + py/easyNodes.py | 2 +- py/server.py | 7 ++++--- web/js/easy/easyInterface.js | 4 ++-- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/README.en.md b/README.en.md index 041213d..43d7ba2 100644 --- a/README.en.md +++ b/README.en.md @@ -31,6 +31,7 @@ After installing the node package, the UI interface will be automatically switch **2023-12-27** +- Fixed `easy xyplot` font file path error - Fixed seed that cannot be fixed when you convert `seed_num` to `easy seed` - Fixed `easy pipeIn` inputs bug - `easy preDetailerFix` have added a new parameter `optional_image` diff --git a/README.md b/README.md index 92c9dd0..5043ef7 100644 --- a/README.md +++ b/README.md @@ -38,6 +38,7 @@ **2023-12-27** +- 修复 `easy xyplot` 的字体文件路径读取错误 - 修复 convert 到 `easy seed` 随机种无法固定的问题 - 修复 `easy pipeIn` 值传入的报错问题 - `easy preDetailerFix` 新增了 `optional_image` 传入图像可选，如未传默认取值为pipe里的图像 diff --git a/py/easyNodes.py b/py/easyNodes.py index 376d9b8..b0d8d0a 100644 --- a/py/easyNodes.py +++ b/py/easyNodes.py @@ -491,7 +491,7 @@ class easyXYPlot: @staticmethod def get_font(font_size): - return ImageFont.truetype(str(Path(os.path.join(Path(__file__).parent.parent, '/resources/arial.ttf'))), font_size) + return ImageFont.truetype(str(Path(os.path.join(Path(__file__).parent.parent, 'resources/arial.ttf'))), font_size) @staticmethod def update_label(label, value, num_items): diff --git a/py/server.py b/py/server.py index 2dceecd..8423e4d 100644 --- a/py/server.py +++ b/py/server.py @@ -135,9 +135,10 @@ def prompt_seed_update(json_data): inputs = extra_data.get('inputs') widgets_value = extra_data.get('widgets_values') widgets_length = len(widgets_value) - seed_num_input = next((x for x in inputs if x['name'] == 'seed_num' and x['type'] == 'INT'), None) - if seed_num_input: - action = 'fixed' + if inputs is not None: + seed_num_input = next((x for x in inputs if x['name'] == 'seed_num' and x['type'] == 'INT'), None) + if seed_num_input is not None: + action = 'fixed' else: action = widgets_value[widgets_length - 1] node = k, v diff --git a/web/js/easy/easyInterface.js b/web/js/easy/easyInterface.js index c9b43d8..3445b3d 100644 --- a/web/js/easy/easyInterface.js +++ b/web/js/easy/easyInterface.js @@ -41,8 +41,8 @@ const ui = { "TAESD": "#DCC274" }, "litegraph_base": { - "BACKGROUND_IMAGE": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAIAAAD/gAIDAAAACXBIWXMAAAsTAAALEwEAmpwYAAAGlmlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgOS4xLWMwMDEgNzkuMTQ2Mjg5OSwgMjAyMy8wNi8yNS0yMDowMTo1NSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iIHhtbG5zOnBob3Rvc2hvcD0iaHR0cDovL25zLmFkb2JlLmNvbS9waG90b3Nob3AvMS4wLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0RXZ0PSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VFdmVudCMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDI1LjEgKFdpbmRvd3MpIiB4bXA6Q3JlYXRlRGF0ZT0iMjAyMy0xMS0xM1QwMDoxODowMiswMTowMCIgeG1wOk1vZGlmeURhdGU9IjIwMjMtMTEtMTVUMDI6MDQ6NTkrMDE6MDAiIHhtcDpNZXRhZGF0YURhdGU9IjIwMjMtMTEtMTVUMDI6MDQ6NTkrMDE6MDAiIGRjOmZvcm1hdD0iaW1hZ2UvcG5nIiBwaG90b3Nob3A6Q29sb3JNb2RlPSIzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOmIyYzRhNjA5LWJmYTctYTg0MC1iOGFlLTk3MzE2ZjM1ZGIyNyIgeG1wTU06RG9jdW1lbnRJRD0iYWRvYmU6ZG9jaWQ6cGhvdG9zaG9wOjk0ZmNlZGU4LTE1MTctZmQ0MC04ZGU3LWYzOTgxM2E3ODk5ZiIgeG1wTU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjIzMWIxMGIwLWI0ZmItMDI0ZS1iMTJlLTMwNTMwM2NkMDdjOCI+IDx4bXBNTTpIaXN0b3J5PiA8cmRmOlNlcT4gPHJkZjpsaSBzdEV2dDphY3Rpb249ImNyZWF0ZWQiIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6MjMxYjEwYjAtYjRmYi0wMjRlLWIxMmUtMzA1MzAzY2QwN2M4IiBzdEV2dDp3aGVuPSIyMDIzLTExLTEzVDAwOjE4OjAyKzAxOjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgMjUuMSAoV2luZG93cykiLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOjQ4OWY1NzlmLTJkNjUtZWQ0Zi04OTg0LTA4NGE2MGE1ZTMzNSIgc3RFdnQ6d2hlbj0iMjAyMy0xMS0xNVQwMjowNDo1OSswMTowMCIgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWRvYmUgUGhvdG9zaG9wIDI1LjEgKFdpbmRvd3MpIiBzdEV2dDpjaGFuZ2VkPSIvIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJzYXZlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDpiMmM0YTYwOS1iZmE3LWE4NDAtYjhhZS05NzMxNmYzNWRiMjciIHN0RXZ0OndoZW49IjIwMjMtMTEtMTVUMDI6MDQ6NTkrMDE6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCAyNS4xIChXaW5kb3dzKSIgc3RFdnQ6Y2hhbmdlZD0iLyIvPiA8L3JkZjpTZXE+IDwveG1wTU06SGlzdG9yeT4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4OTe6GAAAAx0lEQVR42u3WMQoAIQxFwRzJys77X8vSLiRgITif7bYbgrwYc/mKXyBoY4VVBgsWLFiwYFmOlTv+9jfDOjHmr8u6eVkGCxYsWLBgmc5S8ApewXvgYRksWLBgKXidpeBdloL3wMOCBctgwVLwCl7BuyyDBQsWLFiwTGcpeAWv4D3wsAwWLFiwFLzOUvAuS8F74GHBgmWwYCl4Ba/gXZbBggULFixYprMUvIJX8B54WAYLFixYCl5nKXiXpeA98LBgwTJYsGC9tg1o8f4TTtqzNQAAAABJRU5ErkJggg==", - // "BACKGROUND_IMAGE": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABjCAAAAABIjPowAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QA/4ePzL8AAAQjSURBVGje7VpdTxwxDPQE2lL1har9/7+QtyK1VZGmD5vEE2c/vHBCJyBC6G43sdfjj+TGix+g1QG2fz4+P36+sb0B+/V1vEADzWBN0N1DMZoZYGbLVU5CjgaAsIJmRvrqYmZm5IYsTErnQdLM0B6HumL5XLCoW5MFMyYsaeK2H6dUGxCQ6YqPLdnGsSupj8Bwj4ZZ80kFHYbiQlpcUeZlfCJP7cKooooLCc4nd3EW+YhCaxA4XPAvqyF2DNccmgzBVNQZPWWgIo6RIkxiuK1yBAvcAgL1ubrZLU93LbEaOhxV97t2q6E1ADtVmHNDdZY9FAaVOxMnz2HALipRWEOI7KqhqkJ0ZFAiVa16MlG7jBVaOgIVaoxKJMFbUtbClxob6bYEWZGvobzE1dkRdiUOcC0uwPD9WZWr5gB67oiSHsBwaDOlfowPzzIPzjIIgfuv23uIl05vBbWnt5mNZWW9hpxBDNTa3Y0qoeiMwpGrXWoUR7yaT9ijDj2SzWdnalf8GvaVotgRLZJTzkjo1WQETSNvA4xjuDa0FUMohacNoBmmbWhQX6QmP/PMYGZc4sPPifU00g4SIn2ou7rpnIAL1E2pHSQ8mjFIzKMmXl5q/oRImVN7FJ/eHmE01v/Bxg6XPoCmzUm4qDW2O/vLvoT733/TuG2O259HM+5vX67k38F9Pu1PAB+/7c/49FDsFcY7UvL8WnNCCS+g5diSlxyIs0ouMa5DyQXQupLousR4R3C9iiWXGNeh5COEr8+Sjzw5peTtwPV2LLnEeDtwvaEfQX86adgaQfXTYugne9oHDPZ4ZyunWb9w91ACDU4zjtxezinrtKKSBY2ghpL7W6vX5Dtvh0hNdSXtNju7dZJ/HLiAmU13NnV6fnbl+yP8jm+sCVx9meeN3FrGDGU5QRVvwgszrKp/OYYbYFiJ3iVB5IVb72Qy68iSidWv9AoZGW40v1AD+AyJvkGbcaTRXV9/skyerDSbBBizTj6HCKGTX8e/fimRMrByDUcr9HAL7YKsT1rf2Mnx2Eku5jlYWTcIZEmXQNRFKt1i14GVGu4BkmowK68sldGBLqpBcGokeg4ubbZ6ZaQogWvwktCnHnP1lNUTB9u5+sZvd7lVBYXnTbmmQRSXFNM4GBqSNUhObPJSFQeTlHyOC5wfP/KJQ0C9NjQEOOmBEYHk3UPJpsIwEP9FCnN/pNbhONECXFGseUIMb3vEcpXwCVY+mSZDWaSuV6hcFxsc3Yx4tyUj/LZITQfWfPTwN0x8PxHnDc1YpDRhvuARw8OzMFOeH9rSCMvizmi9NAjM2dc96hJ/vcdfuyleCuvRa3q/4NCO1loaWjyUMC3S4qVXyfkUeITW3hZadKLn5WqwJXStz5b9ZKM0pN6Paf884VTbdfwIuvl+kxK0N/4D5hWoRYiuxvAAAAAASUVORK5CYII=", + // "BACKGROUND_IMAGE": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAIAAAD/gAIDAAAACXBIWXMAAAsTAAALEwEAmpwYAAAGlmlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgOS4xLWMwMDEgNzkuMTQ2Mjg5OSwgMjAyMy8wNi8yNS0yMDowMTo1NSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iIHhtbG5zOnBob3Rvc2hvcD0iaHR0cDovL25zLmFkb2JlLmNvbS9waG90b3Nob3AvMS4wLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0RXZ0PSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VFdmVudCMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDI1LjEgKFdpbmRvd3MpIiB4bXA6Q3JlYXRlRGF0ZT0iMjAyMy0xMS0xM1QwMDoxODowMiswMTowMCIgeG1wOk1vZGlmeURhdGU9IjIwMjMtMTEtMTVUMDI6MDQ6NTkrMDE6MDAiIHhtcDpNZXRhZGF0YURhdGU9IjIwMjMtMTEtMTVUMDI6MDQ6NTkrMDE6MDAiIGRjOmZvcm1hdD0iaW1hZ2UvcG5nIiBwaG90b3Nob3A6Q29sb3JNb2RlPSIzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOmIyYzRhNjA5LWJmYTctYTg0MC1iOGFlLTk3MzE2ZjM1ZGIyNyIgeG1wTU06RG9jdW1lbnRJRD0iYWRvYmU6ZG9jaWQ6cGhvdG9zaG9wOjk0ZmNlZGU4LTE1MTctZmQ0MC04ZGU3LWYzOTgxM2E3ODk5ZiIgeG1wTU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjIzMWIxMGIwLWI0ZmItMDI0ZS1iMTJlLTMwNTMwM2NkMDdjOCI+IDx4bXBNTTpIaXN0b3J5PiA8cmRmOlNlcT4gPHJkZjpsaSBzdEV2dDphY3Rpb249ImNyZWF0ZWQiIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6MjMxYjEwYjAtYjRmYi0wMjRlLWIxMmUtMzA1MzAzY2QwN2M4IiBzdEV2dDp3aGVuPSIyMDIzLTExLTEzVDAwOjE4OjAyKzAxOjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgMjUuMSAoV2luZG93cykiLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOjQ4OWY1NzlmLTJkNjUtZWQ0Zi04OTg0LTA4NGE2MGE1ZTMzNSIgc3RFdnQ6d2hlbj0iMjAyMy0xMS0xNVQwMjowNDo1OSswMTowMCIgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWRvYmUgUGhvdG9zaG9wIDI1LjEgKFdpbmRvd3MpIiBzdEV2dDpjaGFuZ2VkPSIvIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJzYXZlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDpiMmM0YTYwOS1iZmE3LWE4NDAtYjhhZS05NzMxNmYzNWRiMjciIHN0RXZ0OndoZW49IjIwMjMtMTEtMTVUMDI6MDQ6NTkrMDE6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCAyNS4xIChXaW5kb3dzKSIgc3RFdnQ6Y2hhbmdlZD0iLyIvPiA8L3JkZjpTZXE+IDwveG1wTU06SGlzdG9yeT4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4OTe6GAAAAx0lEQVR42u3WMQoAIQxFwRzJys77X8vSLiRgITif7bYbgrwYc/mKXyBoY4VVBgsWLFiwYFmOlTv+9jfDOjHmr8u6eVkGCxYsWLBgmc5S8ApewXvgYRksWLBgKXidpeBdloL3wMOCBctgwVLwCl7BuyyDBQsWLFiwTGcpeAWv4D3wsAwWLFiwFLzOUvAuS8F74GHBgmWwYCl4Ba/gXZbBggULFixYprMUvIJX8B54WAYLFixYCl5nKXiXpeA98LBgwTJYsGC9tg1o8f4TTtqzNQAAAABJRU5ErkJggg==", + "BACKGROUND_IMAGE": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABjCAAAAABIjPowAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QA/4ePzL8AAAQjSURBVGje7VpdTxwxDPQE2lL1har9/7+QtyK1VZGmD5vEE2c/vHBCJyBC6G43sdfjj+TGix+g1QG2fz4+P36+sb0B+/V1vEADzWBN0N1DMZoZYGbLVU5CjgaAsIJmRvrqYmZm5IYsTErnQdLM0B6HumL5XLCoW5MFMyYsaeK2H6dUGxCQ6YqPLdnGsSupj8Bwj4ZZ80kFHYbiQlpcUeZlfCJP7cKooooLCc4nd3EW+YhCaxA4XPAvqyF2DNccmgzBVNQZPWWgIo6RIkxiuK1yBAvcAgL1ubrZLU93LbEaOhxV97t2q6E1ADtVmHNDdZY9FAaVOxMnz2HALipRWEOI7KqhqkJ0ZFAiVa16MlG7jBVaOgIVaoxKJMFbUtbClxob6bYEWZGvobzE1dkRdiUOcC0uwPD9WZWr5gB67oiSHsBwaDOlfowPzzIPzjIIgfuv23uIl05vBbWnt5mNZWW9hpxBDNTa3Y0qoeiMwpGrXWoUR7yaT9ijDj2SzWdnalf8GvaVotgRLZJTzkjo1WQETSNvA4xjuDa0FUMohacNoBmmbWhQX6QmP/PMYGZc4sPPifU00g4SIn2ou7rpnIAL1E2pHSQ8mjFIzKMmXl5q/oRImVN7FJ/eHmE01v/Bxg6XPoCmzUm4qDW2O/vLvoT733/TuG2O259HM+5vX67k38F9Pu1PAB+/7c/49FDsFcY7UvL8WnNCCS+g5diSlxyIs0ouMa5DyQXQupLousR4R3C9iiWXGNeh5COEr8+Sjzw5peTtwPV2LLnEeDtwvaEfQX86adgaQfXTYugne9oHDPZ4ZyunWb9w91ACDU4zjtxezinrtKKSBY2ghpL7W6vX5Dtvh0hNdSXtNju7dZJ/HLiAmU13NnV6fnbl+yP8jm+sCVx9meeN3FrGDGU5QRVvwgszrKp/OYYbYFiJ3iVB5IVb72Qy68iSidWv9AoZGW40v1AD+AyJvkGbcaTRXV9/skyerDSbBBizTj6HCKGTX8e/fimRMrByDUcr9HAL7YKsT1rf2Mnx2Eku5jlYWTcIZEmXQNRFKt1i14GVGu4BkmowK68sldGBLqpBcGokeg4ubbZ6ZaQogWvwktCnHnP1lNUTB9u5+sZvd7lVBYXnTbmmQRSXFNM4GBqSNUhObPJSFQeTlHyOC5wfP/KJQ0C9NjQEOOmBEYHk3UPJpsIwEP9FCnN/pNbhONECXFGseUIMb3vEcpXwCVY+mSZDWaSuV6hcFxsc3Yx4tyUj/LZITQfWfPTwN0x8PxHnDc1YpDRhvuARw8OzMFOeH9rSCMvizmi9NAjM2dc96hJ/vcdfuyleCuvRa3q/4NCO1loaWjyUMC3S4qVXyfkUeITW3hZadKLn5WqwJXStz5b9ZKM0pN6Paf884VTbdfwIuvl+kxK0N/4D5hWoRYiuxvAAAAAASUVORK5CYII=", "CLEAR_BACKGROUND_COLOR": "#101010", "NODE_TITLE_COLOR": "rgba(255,255,255,.75)", "NODE_SELECTED_TITLE_COLOR": "#FFF",