Skip to content

Commit

Permalink
try to tweak help panel for old system vs new frontend
Browse files Browse the repository at this point in the history
  • Loading branch information
Amorano committed Aug 10, 2024
1 parent ba1112e commit 44fe530
Show file tree
Hide file tree
Showing 4 changed files with 254 additions and 257 deletions.
14 changes: 7 additions & 7 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
[project]
name = "jovimetrix"
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."
version = "1.2.11"
version = "1.2.12"
license = { file = "LICENSE" }
dependencies = [
"aenum>=3.1.15, <4",
"aenum>=3.1.15,<4",
"blendmodes>=2024.1.1",
"daltonlens>=0.1.5",
"glfw>=2.7.0",
"loguru>=0.7.2",
"matplotlib>=3.8.4",
"mido[ports-rtmidi]>=1.3.2",
"mss>=9.0.1",
"numba>=0.59.1",
"numpy>=1.26.4,<2.0.0",
"opencv-contrib-python>=4.10.0.82",
"Pillow>=10.2.0",
"numba>=0.60.0",
"numpy>=1.26.4",
"opencv-contrib-python>=4.10.0.84",
"Pillow>=10.4.0",
"PyOpenGL>=3.1.7",
"PyOpenGL-accelerate>=3.1.7",
"pywin32>=306; platform_system==\"Windows\"",
"requests>=2.32.3",
"scikit-image>=0.23.2",
"scikit-image>=0.24.0",
"scikit-learn>=1.5.1",
"SpoutGL>=0.0.6; platform_system==\"Windows\"",
"stereoscopy[auto_align]>=2.0.1",
Expand Down
10 changes: 5 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
aenum>=3.1.15, <4
aenum>=3.1.15,<4
blendmodes>=2024.1.1
daltonlens>=0.1.5
glfw>=2.7.0
loguru>=0.7.2
matplotlib>=3.8.4
mido[ports-rtmidi]>=1.3.2
mss>=9.0.1
numba>=0.59.1
numba>=0.60.0
numpy>=1.26.4,<2.0.0
opencv-contrib-python>=4.10.0.82
Pillow>=10.2.0
opencv-contrib-python>=4.10.0.84
Pillow>=10.4.0
PyOpenGL>=3.1.7
PyOpenGL-accelerate>=3.1.7
pywin32>=306; platform_system=="Windows"
requests>=2.32.3
scikit-image>=0.23.2
scikit-image>=0.24.0
scikit-learn>=1.5.1
SpoutGL>=0.0.6; platform_system=="Windows"
stereoscopy[auto_align]>=2.0.1
Expand Down
15 changes: 7 additions & 8 deletions web/core/core_cozy_tips.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,19 @@ app.registerExtension({

const onCanvasPointerMove = function () {
const node = this.node_over;

if (!node || node.flags.collapsed) {
widget_previous = null;
hideTooltip();
return;
}

// jovian tooltip
// Jovian tooltip logic
const widget_tooltip = (node?.widgets || [])
.find(widget => widget.type === 'JTOOLTIP');

if (!widget_tooltip) {
widget_previous = null;
hideTooltip();
return;
}
Expand Down Expand Up @@ -128,14 +131,10 @@ app.registerExtension({
}

if (widget_previous != name) {
hideTooltip();
widget_previous = name;
if (tip) {
return showTooltip(tip);
}
return;
} else {
return;
}
if (tip) {
return showTooltip(tip);
}
hideTooltip();
}.bind(app.canvas);
Expand Down
Loading

0 comments on commit 44fe530

Please sign in to comment.