Support non-quadratic viewports #3634

philippotto · 2019-01-16T15:23:38Z

URL of deployed dev instance (used for testing):

https://___.webknossos.xyz

Steps to test:

test protocol will be done by the lab

Issues:

fixes Implement non-square viewports #3522

Updated changelog
Ready for review

…bucketsPerDim is still quadratic)

app/assets/javascripts/oxalis/model/accessors/flycam_accessor.js

…a (breaks fallback rendering and mouse interactions)

…-quadratic-viewports

…ring; band-aid fix arbitrary viewport zoomstep selection

…-quadratic-viewports

philippotto · 2019-02-04T15:48:11Z

@daniel-wer I think it makes sense if you start reviewing this PR. There are some parts which are not spotless (bucket calculation for arbitrary mode and there are some code fragments for an rectangular arbitrary view which are not effective). However, the main part should be ready for review.

Also: Maybe you have an idea on how to estimate the bucket count which is needed for arbitrary view. Right now, I switched back to the very old way of calculating the zoomstep (log(zoomValue / 1.3)), which is not exact.

daniel-wer

Reviewed a little more than half, will continue tomorrow, looking very good so far :)

Only thing I noticed so far was that the 3D-View is being stretched when it is resized, so the whole scene in the 3D-View is displayed with a wrong aspect ratio.

app/assets/javascripts/oxalis/controller/combinations/skeletontracing_plane_controller.js

app/assets/javascripts/oxalis/controller/scene_controller.js

app/assets/javascripts/oxalis/geometries/arbitrary_plane.js

app/assets/javascripts/oxalis/geometries/materials/node_shader.js

app/assets/javascripts/oxalis/constants.js

app/assets/javascripts/oxalis/model/accessors/flycam_accessor.js

app/assets/javascripts/oxalis/model/accessors/view_mode_accessor.js

daniel-wer

2nd part of the review, also looking very good! Awesome PR and the result is serious eye candy 👍

I agree that the determination of the number of needed buckets needs some work, maybe we should sit together for an hour, note down the constraints of this problem and think of possible solutions :)

...ripts/oxalis/model/bucket_data_handling/bucket_picker_strategies/orthogonal_bucket_picker.js

daniel-wer · 2019-02-07T10:44:02Z

app/assets/javascripts/oxalis/model/bucket_data_handling/texture_bucket_manager.js

-    if (x < 0) console.warn("x should be greater than 0. is currently:", x);
-    if (y < 0) console.warn("y should be greater than 0. is currently:", y);
-    if (z < 0) console.warn("z should be greater than 0. is currently:", z);
+    // if (x < 0) console.warn("x should be greater than 0. is currently:", x);


Just to make sure, this is not solved, right?

No, not really, but it's a bit of a performance killer (the actual log statements). I plan to re-investigate it soon.

app/assets/javascripts/oxalis/model/bucket_data_handling/texture_bucket_manager.js

app/assets/javascripts/oxalis/model/sagas/volumetracing_saga.js

app/assets/javascripts/oxalis/store.js

app/assets/javascripts/oxalis/view/input_catcher.js

app/assets/javascripts/oxalis/view/layouting/default_layout_configs.js

app/assets/javascripts/oxalis/view/right-menu/dataset_info_tab_view.js

…-quadratic-viewports

philippotto · 2019-02-08T14:25:54Z

I fixed the scalebars and added a tooltip for the whole viewport extent (since this isn't in the dataset info tab view anymore).

* use bucket picker for counting (orthogonal mode only) * adapt arbitrary bucket pickers to new bucket counting approach * add types for priority queue

daniel-wer

Sweet, this went smoother than expected, great design with the enqueueFunction! 🎉
I didn't test manually as the test protocol will be executed anyways.

...ripts/oxalis/model/bucket_data_handling/bucket_picker_strategies/orthogonal_bucket_picker.js

daniel-wer · 2019-02-11T17:46:18Z

...vascripts/oxalis/model/bucket_data_handling/bucket_picker_strategies/flight_bucket_picker.js

@@ -149,12 +147,13 @@ export default function determineBucketsForFlight(
  const fallbackBuckets = isFallbackAvailable ? traverseFallbackBBox(getBBox(planeBuckets)) : [];
  traversedBuckets = traversedBuckets.concat(fallbackBuckets);

+  let currentCount = 0;


The const uniqueBucketMap = new ThreeDMap(); is used for the other two bucket pickers but not this one, is there a reason for that?

"Historical growth" 🙈 I forgot about the approach in the flight bucket picker (which was there before) and used the ThreeDMap instead. I'll probably consolidate this when doing the arbitrary-fallback-rendering PR.

...ripts/oxalis/model/bucket_data_handling/bucket_picker_strategies/orthogonal_bucket_picker.js

daniel-wer · 2019-02-11T17:52:44Z

flow-typed/npm/js-priority-queue_vx.x.x.js

+ * https://github.com/flowtype/flow-typed
+ */
+
+declare module "js-priority-queue" {


…-quadratic-viewports

.circleci/not-on-master.sh

…-quadratic-viewports

philippotto added 9 commits January 16, 2019 08:39

allow viewports to be non-quadratic (3D viewport still a bit broken; …

4b56e7a

…bucketsPerDim is still quadratic)

zoom into viewports so that data cannot be cropped

0e6c7a6

fix interactions with 3D viewport

f38a139

make arbitrary viewport square to avoid scaling problems

d6c75af

Merge branch 'master' into non-quadratic-viewports

60cd536

fix node selection and other rectangular-viewport-related bugs

c255453

fix panning

a5fa735

iterate on brush

3c8e2e8

fix brush preview

4b9a24f

philippotto commented Jan 21, 2019

View reviewed changes

app/assets/javascripts/oxalis/model/accessors/flycam_accessor.js Outdated Show resolved Hide resolved

philippotto added 8 commits January 21, 2019 16:17

clean up

85deff7

remove viewport width from info tab view and clean up info tab UI

ea3aba3

remove unused constants

586e6e3

use larger viewport area to render more data instead of upscaling dat…

61f1820

…a (breaks fallback rendering and mouse interactions)

Merge branch 'master' of github.com:scalableminds/webknossos into non…

b9ce445

…-quadratic-viewports

adapt mouse interactions to true-viewport-scaling; fix fallback rende…

4c374ec

…ring; band-aid fix arbitrary viewport zoomstep selection

clean up

cd5b18b

disable some CI checks

abec2f0

philippotto self-assigned this Jan 29, 2019

Merge branch 'master' of github.com:scalableminds/webknossos into non…

5992bc7

…-quadratic-viewports

philippotto requested a review from daniel-wer February 4, 2019 15:45

philippotto changed the title ~~[WIP] Support non-quadratic viewports~~ Support non-quadratic viewports Feb 6, 2019

daniel-wer reviewed Feb 6, 2019

View reviewed changes

daniel-wer reviewed Feb 7, 2019

View reviewed changes

philippotto added 5 commits February 7, 2019 17:55

Merge branch 'master' of github.com:scalableminds/webknossos into non…

e5d48d9

…-quadratic-viewports

clean up according to PR feedback

134cd42

update changelog

0e7eb19

clean up

9df2531

fix scalebars and implement tooltips for complete viewport extent

cb7b5d0

Refactor bucket counting (#3750)

887afb6

* use bucket picker for counting (orthogonal mode only) * adapt arbitrary bucket pickers to new bucket counting approach * add types for priority queue

daniel-wer approved these changes Feb 11, 2019

View reviewed changes

philippotto added 4 commits February 12, 2019 10:06

Merge branch 'master' of github.com:scalableminds/webknossos into non…

13dd17d

…-quadratic-viewports

remove obsolete comment

9d13e6a

Merge branch 'master' of github.com:scalableminds/webknossos into non…

1c4a207

…-quadratic-viewports

fix import

38d4249

philippotto commented Feb 14, 2019

View reviewed changes

.circleci/not-on-master.sh Outdated Show resolved Hide resolved

philippotto added 8 commits February 18, 2019 08:58

Merge branch 'master' of github.com:scalableminds/webknossos into non…

7e22dc6

…-quadratic-viewports

revert not-on-master.sh

613a64d

remove unnecessary import

49173d5

fix tests and refactor to remove cyclic dependencies in accessors

f41e386

extract constant

7d93921

update screenshots

02ce143

adapt screenshot view value

4e7e3d7

Merge branch 'master' of github.com:scalableminds/webknossos into non…

40270c4

…-quadratic-viewports

philippotto merged commit 347b159 into master Feb 18, 2019

philippotto deleted the non-quadratic-viewports branch May 20, 2019 09:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support non-quadratic viewports #3634

Support non-quadratic viewports #3634

philippotto commented Jan 16, 2019 •

edited

Loading

philippotto commented Feb 4, 2019

daniel-wer left a comment

daniel-wer left a comment

daniel-wer Feb 7, 2019

philippotto Feb 8, 2019

philippotto commented Feb 8, 2019

daniel-wer left a comment

daniel-wer Feb 11, 2019

philippotto Feb 12, 2019

daniel-wer Feb 11, 2019

philippotto Feb 12, 2019

Support non-quadratic viewports #3634

Support non-quadratic viewports #3634

Conversation

philippotto commented Jan 16, 2019 • edited Loading

URL of deployed dev instance (used for testing):

Steps to test:

Issues:

philippotto commented Feb 4, 2019

daniel-wer left a comment

Choose a reason for hiding this comment

daniel-wer left a comment

Choose a reason for hiding this comment

daniel-wer Feb 7, 2019

Choose a reason for hiding this comment

philippotto Feb 8, 2019

Choose a reason for hiding this comment

philippotto commented Feb 8, 2019

daniel-wer left a comment

Choose a reason for hiding this comment

daniel-wer Feb 11, 2019

Choose a reason for hiding this comment

philippotto Feb 12, 2019

Choose a reason for hiding this comment

daniel-wer Feb 11, 2019

Choose a reason for hiding this comment

philippotto Feb 12, 2019

Choose a reason for hiding this comment

philippotto commented Jan 16, 2019 •

edited

Loading