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.

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

Add media reference to inspector #68

Open
wants to merge 24 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
e57d2c7
Initial setup of the dropdown menu to select media references
Jspada200ilm Sep 26, 2024
0463c85
Use the key on the media ref object to display in the dropdown
Jspada200ilm Sep 26, 2024
8129364
Set the selected media ref index to -1 on clip change, UI updates, Se…
Jspada200ilm Sep 27, 2024
5e58a2b
Remove test file
Jspada200ilm Sep 27, 2024
1f2ce64
remove accidental commit of config file
Jspada200ilm Sep 27, 2024
853d346
Add vscode folder to git ignore
Jspada200ilm Sep 27, 2024
1039d5f
Add method for drawing and modifying the image bounds
Jspada200ilm Sep 27, 2024
05ce4e1
Remove unused import
Jspada200ilm Sep 27, 2024
ef58ace
remove try/catch
Jspada200ilm Sep 27, 2024
89c3ac7
Remove comments
Jspada200ilm Sep 27, 2024
012be20
Fix bug with the wrong pointer being used
Jspada200ilm Sep 27, 2024
c5865a0
Ensure the min value is less then the max
Jspada200ilm Sep 27, 2024
002bf81
Ensure we are checking for the missing reference
Jspada200ilm Sep 27, 2024
0a6edf4
make labels consistent
Jspada200ilm Sep 27, 2024
05d638e
make text consistent
Jspada200ilm Sep 27, 2024
c2d4b20
PR feedback
Jspada200ilm Oct 1, 2024
170dac1
Improve clip and transition color changes on hover and select (#67)
yaash45 Sep 27, 2024
b230c2a
Add drag & drop functionality for opening files (in macOS) (#69)
agetroortega Sep 27, 2024
358ed9f
Add instruction to do a recursive clone before attempting a build (#66)
yaash45 Sep 28, 2024
5ff0f78
Expose methods to load OTIO files in WASM through Javascript (#70)
austinwitherspoon Sep 28, 2024
7963d25
Bump libs/glfw from `dc557ec` to `b35641f` (#48)
dependabot[bot] Sep 28, 2024
2432f70
Bump libs/opentimelineio from `4b3b673` to `5184c36` (#71)
dependabot[bot] Sep 28, 2024
75a333d
Adjust timecode track height dynamically (#75)
TrevorAyl Sep 30, 2024
b730ee0
Merge branch 'main' into Add-Media-Reference-to-inspector
jspada200 Oct 1, 2024
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
Prev Previous commit
Next Next commit
make labels consistent
Signed-off-by: jspadafora <[email protected]>
  • Loading branch information
Jspada200ilm committed Oct 1, 2024
commit 0a6edf4ff8332db052c4c9f69ebf0fda0862d939
12 changes: 6 additions & 6 deletions inspector.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -732,13 +732,13 @@ void DrawInspector() {
}

auto available_range = external_ref->available_range();
if (available_range && DrawTimeRange("Available Range", &(*available_range), false)) {
if (available_range && DrawTimeRange("Available range", &(*available_range), false)) {
external_ref->set_available_range(available_range);
}

auto available_image_bounds = external_ref->available_image_bounds();
if (available_image_bounds) {
DrawAvailableImageBounds("Available Image Bounds", external_ref);
DrawAvailableImageBounds("Available image bounds", external_ref);
}

ImGui::Text("Metadata:");
Expand All @@ -748,13 +748,13 @@ void DrawInspector() {
ImGui::Text("Type: Missing Media");

auto available_range = missing_ref->available_range();
if (available_range && DrawTimeRange("Available Range", &(*available_range), false)) {
if (available_range && DrawTimeRange("Available range", &(*available_range), false)) {
missing_ref->set_available_range(available_range);
}

auto available_image_bounds = missing_ref->available_image_bounds();
if (available_image_bounds) {
DrawAvailableImageBounds("Available Image Bounds", missing_ref);
DrawAvailableImageBounds("Available image bounds", missing_ref);
}

ImGui::Text("Metadata:");
Expand All @@ -768,13 +768,13 @@ void DrawInspector() {
}

auto available_range = imageSeqRef->available_range();
if (available_range && DrawTimeRange("Available Range", &(*available_range), false)) {
if (available_range && DrawTimeRange("Available range", &(*available_range), false)) {
imageSeqRef->set_available_range(available_range);
}

auto available_image_bounds = imageSeqRef->available_image_bounds();
if (available_image_bounds) {
DrawAvailableImageBounds("Available Image Bounds", imageSeqRef);
DrawAvailableImageBounds("Available image bounds", imageSeqRef);
}

ImGui::Text("Metadata:");
Expand Down