Skip to content

Commit ae923ab

Browse files
committed
1.3.0 -- ready for splitting into separate repositories
1 parent 44aa865 commit ae923ab

File tree

4 files changed

+20
-9
lines changed

4 files changed

+20
-9
lines changed

README.md

+8-1
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,21 @@ If those nodes have descriptions written in HTML or Markdown, they will be conve
8686

8787
### NODE COLORS
8888

89-
You can colorize nodes via their `title` or `body`. This can be done to the node's `category` as well, so you can quickly color groups of nodes.
89+
You can colorize nodes via their `title background`, `node body` or `title text`. This can be done to the node's `category` as well, so you can quickly color groups of nodes.
9090

9191
<div align="center">
9292
<img src="https://github.com/user-attachments/assets/8de9561a-b231-4a49-a63a-4fd5fdba64d9" alt="node color panel" width="512"/>
9393
</div>
9494

9595
## UPDATES
9696

97+
**2024/02/03** @1.3.0:
98+
* added colorizer option for `title text`
99+
* settings deprecated and removed from ComfyUI settings panel
100+
* colorizer setting migrated to ComfyUI per user settings
101+
* automatic contrast option for non-colored nodes
102+
* all tooltips migrated to ComfyUI core tooltips
103+
97104
**2024/02/02** @1.2.67:
98105
* fixed `GLSL` nodes missing from parse due to category sort
99106

__init__.py

+10-6
Original file line numberDiff line numberDiff line change
@@ -577,12 +577,12 @@ def json2html(json_dict: dict) -> str:
577577
# Generate output content
578578
output_rows = []
579579
for k, v in json_dict['output_parameters'].items():
580-
tool = Lexicon._tooltipsDB.get(k, "")
581-
# tool = '<br>'.join(textwrap.wrap(tool, 65))
580+
data = v.split('$')
581+
#desc = '<br>'.join(textwrap.wrap(data[1], 60))
582582
output_rows.append(HTML_output_row.substitute(
583583
name=html.escape(k),
584-
type=html.escape(v),
585-
description=tool
584+
type=html.escape(data[0]),
585+
description=html.escape(data[1])
586586
))
587587

588588
# Fill in the main template
@@ -656,9 +656,13 @@ def get_node_info(node_data: dict) -> Dict[str, Any]:
656656
]
657657

658658
output_parameters = {}
659+
tooltips = node_data.get('output_tooltips', [])
659660
return_names = [t.lower() for t in node_data.get('output_name', [])]
660-
for t, n in zip(return_types, return_names):
661-
output_parameters[n] = ', '.join([x.strip() for x in t.split(',')])
661+
for name, typ, tip in zip(return_names, return_types, tooltips):
662+
if tip == "":
663+
tip = Lexicon._tooltipsDB.get(name, "")
664+
output_parameters[name] = '$'.join([typ, tip])
665+
662666

663667
data = {
664668
"class": node_data['name'],

core/create_glsl.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ def INPUT_TYPES(cls) -> dict:
258258

259259
data.update(opts)
260260
original_params['optional'] = data
261-
return Lexicon._parse(original_params, cls)
261+
return Lexicon._parse(original_params)
262262

263263
def import_dynamic() -> Tuple[str,...]:
264264
ret = []

pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[project]
22
name = "jovimetrix"
33
description = "Integrates Webcam, MIDI, Spout and GLSL shader support. Animation via tick. Parameter manipulation with wave generator. Math operations with Unary and Binary support. Value conversion for all major types (int, string, list, dict, Image, Mask). Shape mask generation, image stacking and channel ops, batch splitting, merging and randomizing, load images and video from anywhere, dynamic bus routing with a single node, export support for GIPHY, save output anywhere! flatten, crop, transform; check colorblindness, make stereogram or stereoscopic images, or liner interpolate values and more."
4-
version = "1.2.67"
4+
version = "1.3.0"
55
license = { file = "LICENSE" }
66
readme = "README.md"
77
authors = [{ name = "Alexander G. Morano", email = "[email protected]" }]

0 commit comments

Comments
 (0)