Skip to content

Fix interaction #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 5, 2022
Merged

Fix interaction #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7bacadd
fix(View): disable style when not interactive
floryst May 5, 2022
fcf47af
fix(ViewContainer): instantiate interactor
floryst May 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/core/View.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,11 +133,9 @@ export default class View extends Component {

this.openglRenderWindow = props.renderWindowView;

if (props.interactive) {
this.interactor = props.interactor;
this.defaultStyle = vtkInteractorStyleManipulator.newInstance();
this.style = this.defaultStyle;
}
this.interactor = props.interactor;
this.defaultStyle = vtkInteractorStyleManipulator.newInstance();
this.style = props.interactive ? this.defaultStyle : null;

// Create orientation widget
this.axesActor = vtkAxesActor.newInstance();
Expand Down Expand Up @@ -194,8 +192,10 @@ export default class View extends Component {
this.debouncedCubeBounds = debounce(this.updateCubeBounds, 50);

this.setInteractorStyle = (style) => {
this.style = style;
this.interactor.setInteractorStyle(style);
if (this.props.interactive) {
this.style = style;
this.interactor.setInteractorStyle(style);
}
};

// Internal functions
Expand Down
2 changes: 1 addition & 1 deletion src/core/ViewContainer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ class ViewController extends Component {
} else {
this.renderWindow = vtkRenderWindow.newInstance();
this.openglRenderWindow = vtkOpenGLRenderWindow.newInstance();
this.interactor = vtkRenderWindowInteractor.newInstance();
}

this.onEnter = this.onEnter.bind(this);
Expand All @@ -32,7 +33,6 @@ class ViewController extends Component {
if (!this.props.root) {
this.renderWindow.addView(this.openglRenderWindow);

this.interactor = vtkRenderWindowInteractor.newInstance();
if (this.props.interactive) {
this.interactor.setView(this.openglRenderWindow);
this.interactor.initialize();
Expand Down