[ImagePane] Addition of directional zoom + pan via mouse drag #421
Conversation
There was a problem hiding this comment.
This seems like a solid improvement to me. Thanks for the contibution! Can you rebuild the js once #418 is in? I'll pull it in afterwards.
Also for testing with the demo, be sure to be running the server when launching the demo script.
|
Ok I'll do that.
|
Summary: Closes fossasia#415. Pull Request resolved: fossasia#418 Differential Revision: D8875176 Pulled By: JackUrb fbshipit-source-id: 38ab0fde5bfca867f7415090e4331e8be0af481d
Summary:
I was getting this error before:
```python
> visdom_client.contour(torch.randn(5,5))
```
```
~/anaconda3/lib/python3.6/json/__init__.py in dumps(obj, skipkeys, ensure_ascii, check_circular, allow_nan, cls, indent, separators, default, sort_keys, **kw)
229 cls is None and indent is None and separators is None and
230 default is None and not sort_keys and not kw):
--> 231 return _default_encoder.encode(obj)
232 if cls is None:
233 cls = JSONEncoder
~/anaconda3/lib/python3.6/json/encoder.py in encode(self, o)
197 # exceptions aren't as detailed. The list call should be roughly
198 # equivalent to the PySequence_Fast that ''.join() would do.
--> 199 chunks = self.iterencode(o, _one_shot=True)
200 if not isinstance(chunks, (list, tuple)):
201 chunks = list(chunks)
~/anaconda3/lib/python3.6/json/encoder.py in iterencode(self, o, _one_shot)
255 self.key_separator, self.item_separator, self.sort_keys,
256 self.skipkeys, _one_shot)
--> 257 return _iterencode(o, 0)
258
259 def _make_iterencode(markers, _default, _encoder, _indent, _floatstr,
~/anaconda3/lib/python3.6/json/encoder.py in default(self, o)
178 """
179 raise TypeError("Object of type '%s' is not JSON serializable" %
--> 180 o.__class__.__name__)
181
182 def encode(self, o):
TypeError: Object of type 'float32' is not JSON serializable
```
The problem is in https://github.com/facebookresearch/visdom/blob/291a02e885a924c3e3cacc46fb059e9624ff5644/py/visdom/__init__.py#L1358 .
`X.min()` can return a numpy scalar type, like `numpy.float32`, which `json.dumps` doesn't know how to handle with the default serializer.
Pull Request resolved: fossasia#423
Differential Revision: D8879895
Pulled By: JackUrb
fbshipit-source-id: 2eaf4ab74dccf6c8fb33cdc399061ed70d61d72a
Conflicts: py/visdom/static/js/main.js
|
Hi. |
|
Alright it's good to go now. Thanks for the contribution! |
There was a problem hiding this comment.
@JackUrb is landing this pull request. If you are a Facebook employee, you can view this diff on Phabricator.
Description
Added 2 features to the ImagePane Component.
The first one allows to zoom on a particular area of the image (while keeping this area in the center of the visible part)
The second allows to pan the image with the mouse drag action.
Most of the changes are in ImagePane.js. Only two lines of css needed to be changed to allow zooming to work properly.
Motivation and Context
Image interaction was quite poor so far : zoom and pan were not very user-friendly.
#308 introduced image pan, but it used onWheel event, which did not allow for horizontal pan on desktop computers.
In addition, it was not possible to zoom in a particular area of the image.
How Has This Been Tested?
I tested my changes by compiling the js code, running a visdom server, and displaying a saved visdom environment which included a visdom.image call.
I am using a line of javascript which might not be very clean :
this._paneRef._windowRef.children[1]at line 71 of file ImagePane.js, to get the top and left position of the Pane. There may be a cleaner way to get these but I couldn't find. As it uses some "hidden" attributes, it may not be very robust to future changes of React API.My changes should not modify existing features, apart from the zooming and panning speed that I increased in the handleZoom function (feel free to reset these constants to their previous value).
I tried to run python example/demo.py but it failed with
ConnectionRefusedError: [Errno 111] Connection refused, both with and without my changes (after installing from sources).Screenshots (if appropriate):
Not appropriate
Types of changes
Checklist: