Skip to content

Commit aeb865a

Browse files
committed
cleanup for purz stream
1 parent 79f919b commit aeb865a

File tree

5 files changed

+17
-5
lines changed

5 files changed

+17
-5
lines changed

README.md

+10
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,16 @@ You can colorize nodes via their `title background`, `node body` or `title text`
9696

9797
**IF YOU ARE USING AN OLD VERSION THAT HAS COLOR CONFIGURATIONS THAT NO LONGER WORK, I CAN HELP YOU MIGRATE THEM. JUST START A TICKET OR SEND A MESSAGE**
9898

99+
**2025/03/06** @1.7.34:
100+
* prep for Purz stream
101+
* removed security scanner failures for in-line http links
102+
* auto-size masks during mask add
103+
* fix some limits on transform node
104+
* better constraints for UNARY and BINARY OP nodes
105+
* fix inversion in pixel merge
106+
* defaults for regex colorizer entries
107+
* fall through for constant node input
108+
99109
**2025/03/02** @1.7.33:
100110
* aligned core_color to match breakout updates
101111
* fixed configuration bug when no configuration present

core/create.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ def run(self, **kw) -> Tuple[torch.Tensor, ...]:
139139
width, height = wihi
140140
sizeX, sizeY = size
141141
fill = color[:3][::-1]
142-
back = matte[:3]
142+
back = matte[:3][::-1]
143143

144144
match shape:
145145
case EnumShapes.RECTANGLE | EnumShapes.SQUARE:
@@ -276,7 +276,7 @@ def INPUT_TYPES(cls) -> Dict[str, str]:
276276
Lexicon.ALIGN: (EnumAlignment._member_names_, {"default": EnumAlignment.CENTER.name}),
277277
Lexicon.JUSTIFY: (EnumJustify._member_names_, {"default": EnumJustify.CENTER.name}),
278278
Lexicon.MARGIN: ("INT", {"default": 0, "min": -1024, "max": 1024}),
279-
Lexicon.SPACING: ("INT", {"default": 25, "min": -1024, "max": 1024}),
279+
Lexicon.SPACING: ("INT", {"default": 0, "min": -1024, "max": 1024}),
280280
Lexicon.WH: ("VEC2INT", {"default": (256, 256),
281281
"mij":MIN_IMAGE_SIZE, "label": [Lexicon.W, Lexicon.H]}),
282282
Lexicon.XY: ("VEC2", {"default": (0, 0,), "mij": -1, "maj": 1, "step": 0.01,
@@ -301,7 +301,7 @@ def run(self, **kw) -> Tuple[torch.Tensor, ...]:
301301
align = parse_param(kw, Lexicon.ALIGN, EnumAlignment, EnumAlignment.CENTER.name)
302302
justify = parse_param(kw, Lexicon.JUSTIFY, EnumJustify, EnumJustify.CENTER.name)
303303
margin = parse_param(kw, Lexicon.MARGIN, EnumConvertType.INT, 0)
304-
line_spacing = parse_param(kw, Lexicon.SPACING, EnumConvertType.INT, 25)
304+
line_spacing = parse_param(kw, Lexicon.SPACING, EnumConvertType.INT, 0)
305305
wihi = parse_param(kw, Lexicon.WH, EnumConvertType.VEC2INT, [(512, 512)], MIN_IMAGE_SIZE)
306306
pos = parse_param(kw, Lexicon.XY, EnumConvertType.VEC2, [(0, 0)], -1, 1)
307307
angle = parse_param(kw, Lexicon.ANGLE, EnumConvertType.INT, 0)

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.7.33"
4+
version = "1.7.34"
55
license = { file = "LICENSE" }
66
readme = "README.md"
77
authors = [{ name = "Alexander G. Morano", email = "[email protected]" }]

sup/text.py

+1
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ def text_draw(full_text: str, font: ImageFont,
7676
text_lines = full_text.split('\n')
7777
count = len(text_lines)
7878
height_max = text_size(draw, full_text, font)[1] + line_spacing * (count-1)
79+
print(height_max)
7980
height_delta = height_max / count
8081
# find the bounding box of this
8182

web/widget/widget_vector.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,8 @@ const VectorWidget = (app, inputName, options, initial, desc='') => {
199199
}
200200
if (!this.options?.rgb) return;
201201

202-
const rgba = widget.value;
202+
//const rgba = widget.value;
203+
const rgba = Object.values(this?.value || []);
203204
const color = colorRGB2Hex(rgba.slice(0, 3));
204205

205206
if (index != size && (x < 0 && rgba.length > 2)) {

0 commit comments

Comments
 (0)