Fix paintwidget and add renormalize.

This commit is contained in:
David Bau
2022-06-01 09:50:44 -04:00
parent f739a62bc6
commit 887011a28e
2 changed files with 8 additions and 7 deletions
+1
View File
@@ -10,6 +10,7 @@ from .nethook import module_names, parameter_names
from .nethook import subsequence, get_module, get_parameter, replace_module
from .pidfile import reserve_dir
from .parallelfolder import ParallelImageFolders
from . import renormalize
from .runningstats import Stat, Mean, Variance, Covariance, Bincount
from .runningstats import CrossCovariance, IoU, CrossIoU, Quantile, TopK
from .runningstats import Reservoir, History, CombinedStat
+7 -7
View File
@@ -1,15 +1,15 @@
from .labwidget import Widget, Property, minify
from .labwidget import Widget, Property, Image, minify
from . import show
class PaintWidget(Widget):
class PaintWidget(Image):
def __init__(self,
width=256, height=256,
image='', mask='', brushsize=10.0, oneshot=False, disabled=False,
src='', mask='', brushsize=10.0, oneshot=False, disabled=False,
vanishing=True, opacity=0.7, fillStyle='#fff',
**kwargs):
super().__init__(**kwargs)
super().__init__(src=src, **kwargs)
self.mask = Property(mask)
self.image = Property(image)
self.vanishing = Property(vanishing)
self.brushsize = Property(brushsize)
self.erase = Property(False)
@@ -52,7 +52,7 @@ class PaintWidget {
this.model = model;
this.size_changed();
this.model.on('mask', this.mask_changed.bind(this));
this.model.on('image', this.image_changed.bind(this));
this.model.on('src', this.image_changed.bind(this));
this.model.on('vanishing', this.mask_changed.bind(this));
this.model.on('width', this.size_changed.bind(this));
this.model.on('height', this.size_changed.bind(this));
@@ -116,7 +116,7 @@ class PaintWidget {
this.draw_data_url(this.mask_canvas, this.model.get('mask'));
}
image_changed() {
this.image.src = this.model.get('image');
this.image.src = this.model.get('src');
}
size_changed() {
this.mask_canvas = document.createElement('canvas');