berkus
/
topola
mirror of https://codeberg.org/topola/topola.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Actually display the drag selection box, and some fixes

This commit is contained in:
Mikolaj Wielgus 2026-05-27 23:27:46 +02:00
parent 1a2c4aeec2
commit e1795413bd
3 changed files with 78 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
topola-egui/src/viewport.rs
View File

@ -91,6 +91,40 @@ impl Viewport {
workspace.appearance_panel.active, workspace.appearance_panel.active,
InteractiveInput::new(pointer_on_scene, false, false, false), InteractiveInput::new(pointer_on_scene, false, false, false),
); );
if let Some(selection_interactor) =
interactor.selection_interactor().as_ref()
{
let origin = *selection_interactor.origin();
let drag_rect_scene = egui::Rect::from_min_max(
egui::pos2(
origin.x.min(pointer_on_scene.x) as f32,
origin.y.min(pointer_on_scene.y) as f32,
),
egui::pos2(
origin.x.max(pointer_on_scene.x) as f32,
origin.y.max(pointer_on_scene.y) as f32,
),
);
let drag_rect_on_viewport = egui::Rect::from_min_max(
scene_to_viewport * drag_rect_scene.min,
scene_to_viewport * drag_rect_scene.max,
);
let boundary_color = if pointer_on_scene.x >= origin.x {
egui::Color32::YELLOW
} else {
egui::Color32::from_rgb(80, 160, 255)
};
ui.painter().rect(
drag_rect_on_viewport,
egui::CornerRadius::ZERO,
egui::Color32::from_rgba_unmultiplied(80, 160, 255, 48),
egui::Stroke::new(1.5, boundary_color),
egui::StrokeKind::Outside,
);
}
} }
} }
} }

72
topola/src/board/interactors/drag_selection.rs
View File

@ -13,6 +13,7 @@ use crate::{
interactors::{InteractiveInput, SelectionCombineMode, SelectionContainMode}, interactors::{InteractiveInput, SelectionCombineMode, SelectionContainMode},
selections::PersistableSelection, selections::PersistableSelection,
}, },
layout::LayerId,
}; };
#[derive(Clone, Constructor, Debug, Deserialize, Eq, PartialEq, Serialize)] #[derive(Clone, Constructor, Debug, Deserialize, Eq, PartialEq, Serialize)]
@ -24,6 +25,7 @@ pub struct DragSelectionOptions {
#[derive(Clone, Debug, Eq, Getters, PartialEq)] #[derive(Clone, Debug, Eq, Getters, PartialEq)]
pub struct DragSelectionInteractor { pub struct DragSelectionInteractor {
origin: Vector2<i64>, origin: Vector2<i64>,
layer: LayerId,
original_selection: PersistableSelection, original_selection: PersistableSelection,
selection: PersistableSelection, selection: PersistableSelection,
options: DragSelectionOptions, options: DragSelectionOptions,
@ -32,11 +34,13 @@ pub struct DragSelectionInteractor {
impl DragSelectionInteractor { impl DragSelectionInteractor {
pub fn new( pub fn new(
origin: Vector2<i64>, origin: Vector2<i64>,
layer: LayerId,
original_selection: PersistableSelection, original_selection: PersistableSelection,
options: DragSelectionOptions, options: DragSelectionOptions,
) -> Self { ) -> Self {
Self { Self {
origin, origin,
layer,
original_selection, original_selection,
selection: PersistableSelection::new(), selection: PersistableSelection::new(),
options, options,
@ -51,45 +55,43 @@ impl DragSelectionInteractor {
self.selection = PersistableSelection::new(); self.selection = PersistableSelection::new();
for layer_index in 0..*board.layout().layer_count() { let rect = Rect3::new(
let rect = Rect3::new( Vector3::new(self.origin.x, self.origin.y, self.layer.index() as i64),
Vector3::new(self.origin.x, self.origin.y, layer_index as i64), Vector3::new(input.pointer.x, input.pointer.y, self.layer.index() as i64),
Vector3::new(input.pointer.x, input.pointer.y, layer_index as i64), );
);
match self.options.contain { match self.options.contain {
SelectionContainMode::Crossing => { SelectionContainMode::Crossing => {
self.selection self.selection
.components .components
.add(board.locate_components_intersecting_rect(rect)); .add(board.locate_components_intersecting_rect(rect));
}
SelectionContainMode::Window => {
self.selection
.components
.add(board.locate_components_inside_rect(rect));
}
} }
SelectionContainMode::Window => {
match self.options.contain { self.selection
SelectionContainMode::Crossing => { .components
self.selection .add(board.locate_components_inside_rect(rect));
.nets
.add(board.locate_nets_intersecting_rect(rect));
}
SelectionContainMode::Window => {
self.selection.nets.add(board.locate_nets_inside_rect(rect));
}
} }
}
match self.options.contain { match self.options.contain {
SelectionContainMode::Crossing => { SelectionContainMode::Crossing => {
self.selection self.selection
.pins .nets
.add(board.locate_pins_intersecting_rect(rect)); .add(board.locate_nets_intersecting_rect(rect));
} }
SelectionContainMode::Window => { SelectionContainMode::Window => {
self.selection.pins.add(board.locate_pins_inside_rect(rect)); self.selection.nets.add(board.locate_nets_inside_rect(rect));
} }
}
match self.options.contain {
SelectionContainMode::Crossing => {
self.selection
.pins
.add(board.locate_pins_intersecting_rect(rect));
}
SelectionContainMode::Window => {
self.selection.pins.add(board.locate_pins_inside_rect(rect));
} }
} }

9
topola/src/board/interactors/selection.rs
View File

@ -82,8 +82,13 @@ impl SelectionInteractor {
}; };
let options = DragSelectionOptions::new(self.combine.clone(), contain); let options = DragSelectionOptions::new(self.combine.clone(), contain);
let mut drag_selection_interactor = let mut drag_selection_interactor = DragSelectionInteractor::new(
DragSelectionInteractor::new(self.origin, self.original_selection.clone(), options); self.origin,
layer,
self.original_selection.clone(),
options,
);
drag_selection_interactor.update(board, input); drag_selection_interactor.update(board, input);
self.selection = drag_selection_interactor.selection().clone(); self.selection = drag_selection_interactor.selection().clone();
} }