Revision: 70004
http://sourceforge.net/p/brlcad/code/70004
Author: bob1961
Date: 2017-07-27 16:55:34 +0000 (Thu, 27 Jul 2017)
Log Message:
-----------
Updated some of the sketching related functions in libtclcad to call
ged_snap_to_grid. Also updated a few methods in Ged.tcl.
Modified Paths:
--------------
brlcad/trunk/src/libtclcad/tclcad_obj.c
brlcad/trunk/src/tclscripts/lib/Ged.tcl
Modified: brlcad/trunk/src/libtclcad/tclcad_obj.c
===================================================================
--- brlcad/trunk/src/libtclcad/tclcad_obj.c 2017-07-26 22:53:45 UTC (rev
70003)
+++ brlcad/trunk/src/libtclcad/tclcad_obj.c 2017-07-27 16:55:34 UTC (rev
70004)
@@ -9075,6 +9075,9 @@
fx = screen_to_view_x(gdvp->gdv_dmp, x);
fy = screen_to_view_y(gdvp->gdv_dmp, y);
+ if (gedp->ged_gvp->gv_grid.snap) {
+ ged_snap_to_grid(gedp, &fx, &fy);
+ }
bu_vls_printf(&plist, "{0 ");
@@ -9285,6 +9288,9 @@
fx = screen_to_view_x(gdvp->gdv_dmp, x);
fy = screen_to_view_y(gdvp->gdv_dmp, y);
+ if (gedp->ged_gvp->gv_grid.snap) {
+ ged_snap_to_grid(gedp, &fx, &fy);
+ }
bu_vls_printf(&plist, "{0 ");
@@ -9412,6 +9418,9 @@
fx = screen_to_view_x(gdvp->gdv_dmp, x);
fy = screen_to_view_y(gdvp->gdv_dmp, y);
+ if (gedp->ged_gvp->gv_grid.snap) {
+ ged_snap_to_grid(gedp, &fx, &fy);
+ }
if (gdvp->gdv_view->gv_mode == TCLCAD_POLY_SQUARE_MODE) {
fastf_t dx, dy;
Modified: brlcad/trunk/src/tclscripts/lib/Ged.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/lib/Ged.tcl 2017-07-26 22:53:45 UTC (rev
70003)
+++ brlcad/trunk/src/tclscripts/lib/Ged.tcl 2017-07-27 16:55:34 UTC (rev
70004)
@@ -4451,11 +4451,6 @@
if {$itk_option(-gridSnap)} {
set mpos [$mGed get_prev_mouse $itk_component($_pane)]
- set view [eval $mGed screen2view $itk_component($_pane) $mpos]
- set view [$mGed snap_view $itk_component($_pane) [lindex $view 0]
[lindex $view 1]]
- set mpos [$mGed view2screen $itk_component($_pane) $view]
-
- # This will regenerate the circle based on the snapped mouse position
eval $mGed mouse_poly_circ $itk_component($_pane) $mpos
}
@@ -4504,11 +4499,6 @@
if {$itk_option(-gridSnap)} {
set mpos [$mGed get_prev_mouse $itk_component($_pane)]
- set view [eval $mGed screen2view $itk_component($_pane) $mpos]
- set view [$mGed snap_view $itk_component($_pane) [lindex $view 0]
[lindex $view 1]]
- set mpos [$mGed view2screen $itk_component($_pane) $view]
-
- # This will regenerate the circle based on the snapped mouse position
eval $mGed mouse_poly_ell $itk_component($_pane) $mpos
}
@@ -4530,11 +4520,6 @@
if {$itk_option(-gridSnap)} {
set mpos [$mGed get_prev_mouse $itk_component($_pane)]
- set view [eval $mGed screen2view $itk_component($_pane) $mpos]
- set view [$mGed snap_view $itk_component($_pane) [lindex $view 0]
[lindex $view 1]]
- set mpos [$mGed view2screen $itk_component($_pane) $view]
-
- # This will regenerate the rectangle based on the snapped mouse position
eval $mGed mouse_poly_rect $itk_component($_pane) $mpos
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
