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

Some fixes #11

Merged
merged 22 commits into from
May 19, 2023
Merged

Some fixes #11

Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
aa076d1
v0.0.1 of DepthaiViewer, WIP (#1)
zrezke May 3, 2023
dba1ddb
Fix rerun lints
zrezke May 3, 2023
893a8f7
rename binary, always start with memory-limit, pin depthai dependenci…
zrezke May 3, 2023
4f63bd8
remove compiler warnings
zrezke May 3, 2023
9d40325
fix memory leak when app is in background
zrezke May 4, 2023
9d85e10
Custom viewport UI (#4)
zrezke May 8, 2023
cd44a4b
MJPEG encode image frames if connected to a PoE device. Only add magn…
zrezke May 9, 2023
93383b4
Styling (#6)
zrezke May 11, 2023
fb52075
Tabify all panels (except for blueprint) (#7)
zrezke May 18, 2023
15bd4f0
pass lint checks and bugfixes
zrezke May 18, 2023
cfccd48
forgot to sort imports
zrezke May 18, 2023
ed8217e
Fix mypy lint (TODO: Proper typing, especially in the comms from back…
zrezke May 18, 2023
b7e2e42
pylints and fix Queue typehinting
zrezke May 18, 2023
60849c9
fix doc build
zrezke May 18, 2023
4860bfd
try to pass pylints with py.typed
zrezke May 18, 2023
8b084bd
ignore misc mypy errors
zrezke May 18, 2023
6dba2a8
forgot to run black formatter
zrezke May 18, 2023
dc6d8ed
switch back to old ci
zrezke May 18, 2023
b127706
Merge branch 'release-0.0.1' of github.com:luxonis/depthai-viewer int…
zrezke May 19, 2023
257c7ef
sync mono camera settings
zrezke May 19, 2023
f192bcb
fix web build
zrezke May 19, 2023
51a6330
Update scripts/version_util.py
zrezke May 19, 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
9 changes: 6 additions & 3 deletions crates/re_ui/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,16 +195,19 @@ impl ReUi {
label: &str,
value: &mut Num,
range: RangeInclusive<Num>,
) where
) -> egui::Response
where
Num: egui::emath::Numeric,
{
ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
ui.add_sized(
let response = ui.add_sized(
[Self::box_width(), Self::box_height()],
egui::DragValue::new(value).clamp_range(range),
);
ui.label(egui::RichText::new(label).color(self.design_tokens.gray_900));
});
response
})
.inner
}

pub fn labeled_toggle_switch(&self, ui: &mut egui::Ui, label: &str, value: &mut bool) {
Expand Down
9 changes: 6 additions & 3 deletions crates/re_viewer/src/app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,9 +493,12 @@ impl eframe::App for App {
};
}

if self.backend_handle.is_none() {
self.backend_handle = App::spawn_backend();
};
#[cfg(not(target_arch = "wasm32"))]
{
if self.backend_handle.is_none() {
self.backend_handle = App::spawn_backend();
};
}

if self.startup_options.memory_limit.limit.is_none() {
// we only warn about high memory usage if the user hasn't specified a limit
Expand Down
73 changes: 51 additions & 22 deletions crates/re_viewer/src/ui/device_settings_panel.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,20 +152,35 @@ impl DeviceSettingsPanel {
.selected_device
.supported_left_mono_resolutions
{
ui.selectable_value(
&mut device_config.left_camera.resolution,
*res,
format!("{res}"),
);
if ui
.selectable_value(
&mut device_config
.left_camera
.resolution,
*res,
format!("{res}"),
)
.changed()
{
device_config.right_camera.resolution =
*res;
}
}
},
);
ctx.re_ui.labeled_dragvalue(
ui,
"FPS",
&mut device_config.left_camera.fps,
0..=120,
);
if ctx
.re_ui
.labeled_dragvalue(
ui,
"FPS",
&mut device_config.left_camera.fps,
0..=120,
)
.changed()
{
device_config.right_camera.fps =
device_config.left_camera.fps;
}
ctx.re_ui.labeled_checkbox(
ui,
"Stream",
Expand All @@ -191,20 +206,34 @@ impl DeviceSettingsPanel {
.selected_device
.supported_right_mono_resolutions
{
ui.selectable_value(
&mut device_config.right_camera.resolution,
*res,
format!("{res}"),
);
if ui
.selectable_value(
&mut device_config
.right_camera
.resolution,
*res,
format!("{res}"),
)
.changed()
{
device_config.left_camera.resolution = *res;
}
}
},
);
ctx.re_ui.labeled_dragvalue(
ui,
"FPS",
&mut device_config.right_camera.fps,
0..=120,
);
if ctx
.re_ui
.labeled_dragvalue(
ui,
"FPS",
&mut device_config.right_camera.fps,
0..=120,
)
.changed()
{
device_config.left_camera.fps =
device_config.right_camera.fps;
}
ctx.re_ui.labeled_checkbox(
ui,
"Stream",
Expand Down
1 change: 0 additions & 1 deletion scripts/version_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
EXPECTED_VERSION=$(python3 scripts/version_util.py --bare_cargo_version)
"""

import os
import re
zrezke marked this conversation as resolved.
Show resolved Hide resolved
import subprocess
import sys
Expand Down