Skip to content
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

Jump to bottom

Fixed opencv runtime initialization #7101

Merged
merged 5 commits into from
Nov 6, 2023
Merged

Fixed opencv runtime initialization #7101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e216872
Fixed opencv runtime initialization
bsekachev Nov 6, 2023
b6a4dcd
Update changelog.d/20231106_112434_boris_fixed_opencv_runtime_init.md
bsekachev Nov 6, 2023
a9d48c9
Enhanced fix
bsekachev Nov 6, 2023
b20b23b
Clear memory
bsekachev Nov 6, 2023
fe54728
Correct state update
bsekachev Nov 6, 2023
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
4 changes: 4 additions & 0 deletions changelog.d/20231106_112434_boris_fixed_opencv_runtime_init.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
### Fixed

- OpenCV runtime initialization
(<https://github.com/opencv/cvat/pull/7101>)
2 changes: 2 additions & 0 deletions ...ui/src/components/annotation-page/standard-workspace/controls-side-bar/opencv-control.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,6 +811,8 @@ class OpenCVControlComponent extends React.PureComponent<Props & DispatchToProps
} else if (libraryInitialized !== openCVWrapper.isInitialized) {
this.setState({
libraryInitialized: openCVWrapper.isInitialized,
trackers: Object.values(openCVWrapper.tracking),
activeTracker: Object.values(openCVWrapper.tracking)[0] || null,
});
}
}}
Expand Down
14 changes: 10 additions & 4 deletions cvat-ui/src/utils/opencv-wrapper/opencv-wrapper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
//
// SPDX-License-Identifier: MIT

import waitFor from 'utils/wait-for';
import HistogramEqualizationImplementation, { HistogramEqualization } from './histogram-equalization';
import TrackerMImplementation from './tracker-mil';
import IntelligentScissorsImplementation, { IntelligentScissors } from './intelligent-scissors';
Expand Down Expand Up @@ -94,14 +95,19 @@ export class OpenCVWrapper {
}
}

let runtimeInitialized = false;
(window as any).Module = {
onRuntimeInitialized: () => {
runtimeInitialized = true;
delete (window as any).Module;
},
};
// Inject opencv to DOM
// eslint-disable-next-line @typescript-eslint/no-implied-eval
const OpenCVConstructor = new Function(decodedScript);
OpenCVConstructor();

const global = window as any;

this.cv = global.cv;
this.cv = (window as any).cv;
await waitFor(2, () => runtimeInitialized);
}

public async initialize(onProgress: (percent: number) => void): Promise<void> {
Expand Down
Loading