Merge pull request #857 from ramox81/codex/align-point-behavior
Align point command, properties, and display behavior
This commit is contained in:
commit
339d9afcfe
74 changed files with 997 additions and 190 deletions
|
|
@ -674,9 +674,13 @@ impl OpenCADStudio {
|
|||
}
|
||||
}
|
||||
|
||||
"POINT" => {
|
||||
"POINT" | "MULTIPOINT" => {
|
||||
use crate::modules::draw::draw::point::PointCommand;
|
||||
let new_cmd = PointCommand::new();
|
||||
let new_cmd = if cmd == "MULTIPOINT" {
|
||||
PointCommand::multiple()
|
||||
} else {
|
||||
PointCommand::new()
|
||||
};
|
||||
self.command_line.push_info(&new_cmd.prompt());
|
||||
self.tabs[i].active_cmd = Some(Box::new(new_cmd));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2309,7 +2309,7 @@ impl OpenCADStudio {
|
|||
use crate::command::ValuePromptCommand;
|
||||
let c = ValuePromptCommand::new(
|
||||
"PDSIZE",
|
||||
"PDSIZE new point size (0 = 5% of viewport, <0 = absolute):",
|
||||
"PDSIZE new point size (0 = 5% of viewport, >0 = absolute, <0 = viewport percentage):",
|
||||
);
|
||||
self.command_line.push_info(&c.prompt());
|
||||
self.tabs[i].active_cmd = Some(Box::new(c));
|
||||
|
|
|
|||
|
|
@ -341,8 +341,9 @@ impl OpenCADStudio {
|
|||
.abs();
|
||||
if !self.point_size_relative && mag == 0.0 {
|
||||
let wpp = self.tabs[i].scene.world_per_pixel().unwrap_or(0.0);
|
||||
let viewport_height = self.tabs[i].scene.selection.borrow().vp_size.1;
|
||||
mag = if wpp > 0.0 {
|
||||
crate::entities::point::relative_world_size(0.0, wpp)
|
||||
crate::entities::point::relative_world_size(0.0, wpp, viewport_height)
|
||||
} else {
|
||||
1.0
|
||||
};
|
||||
|
|
@ -2237,6 +2238,7 @@ impl OpenCADStudio {
|
|||
let far_pos = base + dir * far;
|
||||
let far_neg = base - dir * far;
|
||||
let guide = crate::scene::WireModel {
|
||||
point_marker: None,
|
||||
taper_widths: Vec::new(),
|
||||
world_width: 0.0,
|
||||
depth_override: None,
|
||||
|
|
|
|||
Loading…
Reference in a new issue