summaryrefslogtreecommitdiff
path: root/app/bin/csnap.c
diff options
context:
space:
mode:
Diffstat (limited to 'app/bin/csnap.c')
-rw-r--r--app/bin/csnap.c57
1 files changed, 33 insertions, 24 deletions
diff --git a/app/bin/csnap.c b/app/bin/csnap.c
index baf6998..f863df2 100644
--- a/app/bin/csnap.c
+++ b/app/bin/csnap.c
@@ -120,13 +120,13 @@ void static DrawGridPoint(
p0.y < 0.0 || p0.y > size->y ) ) {
return;
}
- DIST_T r;
+// DIST_T r;
nDrawGridPoints++;
- if ( bigdot ) {
- r = (bigdot_width+0.5)/2 - 0.5;
- } else {
- r = 0.75;
- }
+// if ( bigdot ) {
+// r = (bigdot_width+0.5)/2 - 0.5;
+// } else {
+// r = 0.75;
+// }
coOrd sz;
sz.x = sz.y = (bigdot?2.5:1.5)/dpi;
p0.x -= 1.0/dpi;
@@ -178,7 +178,7 @@ EXPORT void DrawGrid(
DIST_T hMinSpacing=0, vMinSpacing=0;
long f;
POS_T hMajSpacing_dpi, vMajSpacing_dpi;
- BOOL_T bigdot;
+ BOOL_T bigdot = FALSE;
if (hMajSpacing <= 0 && vMajSpacing <= 0) {
return;
@@ -526,29 +526,30 @@ static paramIntegerRange_t i0_1000 = { 0, 1000, 30 };
static paramFloatRange_t r_1000_1000 = { -1000.0, 1000.0, 80 };
static paramFloatRange_t r0_360 = { 0.0, 360.0, 80 };
static char *gridLabels[] = { "", NULL };
+
static paramData_t gridPLs[] = {
{ PD_MESSAGE, N_("Horz"), NULL, 0, I2VP(60) },
#define I_HORZSPACING (1)
- { PD_FLOAT, &grid.Horz.Spacing, "horzspacing", PDO_DIM, &r0_999999, N_("Spacing") },
+ { PD_FLOAT, &grid.Horz.Spacing, "horzspacing", PDO_NOPSHUPD|PDO_DIM, &r0_999999, N_("Spacing") },
#define I_HORZDIVISION (2)
- { PD_LONG, &grid.Horz.Division, "horzdivision", 0, &i0_1000, N_("Divisions") },
+ { PD_LONG, &grid.Horz.Division, "horzdivision", PDO_NOPSHUPD, &i0_1000, N_("Divisions") },
#define I_HORZENABLE (3)
#define gridHorzEnableT ((wChoice_p)gridPLs[I_HORZENABLE].control)
{ PD_TOGGLE, &grid.Horz.Enable, "horzenable", 0, gridLabels, N_("Enable"), BC_HORZ|BC_NOBORDER },
{ PD_MESSAGE, N_("Vert"), NULL, PDO_DLGNEWCOLUMN|PDO_DLGWIDE, I2VP(60) },
#define I_VERTSPACING (5)
- { PD_FLOAT, &grid.Vert.Spacing, "vertspacing", PDO_DIM, &r0_999999, NULL },
+ { PD_FLOAT, &grid.Vert.Spacing, "vertspacing", PDO_NOPSHUPD|PDO_DIM, &r0_999999, NULL },
#define I_VERTDIVISION (6)
- { PD_LONG, &grid.Vert.Division, "vertdivision", 0, &i0_1000, NULL },
+ { PD_LONG, &grid.Vert.Division, "vertdivision", PDO_NOPSHUPD, &i0_1000, NULL },
#define I_VERTENABLE (7)
#define gridVertEnableT ((wChoice_p)gridPLs[I_VERTENABLE].control)
{ PD_TOGGLE, &grid.Vert.Enable, "vertenable", 0, gridLabels, NULL, BC_HORZ|BC_NOBORDER },
#define I_VALUEX (8)
- { PD_FLOAT, &grid.Orig.x, "origx", PDO_DIM|PDO_DLGNEWCOLUMN|PDO_DLGWIDE, &r_1000_1000, N_("X") },
+ { PD_FLOAT, &grid.Orig.x, "origx", PDO_NOPSHUPD|PDO_DLGNEWCOLUMN|PDO_DLGWIDE, &r_1000_1000, N_("X") },
#define I_VALUEY (9)
- { PD_FLOAT, &grid.Orig.y, "origy", PDO_DIM, &r_1000_1000, N_("Y") },
+ { PD_FLOAT, &grid.Orig.y, "origy", PDO_NOPSHUPD, &r_1000_1000, N_("Y") },
#define I_VALUEA (10)
- { PD_FLOAT, &grid.Angle, "origa", PDO_ANGLE, &r0_360, N_("A") },
+ { PD_FLOAT, &grid.Angle, "origa", PDO_NOPSHUPD, &r0_360, N_("A") },
#define I_SHOW (11)
#define gridShowT ((wChoice_p)gridPLs[I_SHOW].control)
{ PD_TOGGLE, &grid.Show, "show", PDO_DLGIGNORELABELWIDTH, gridLabels, N_("Show"), BC_HORZ|BC_NOBORDER }
@@ -667,7 +668,6 @@ static void GridButtonUpdate( long mode0 )
if ( mode0&CHK_SHOW ) {
RedrawGrid();
}
- oldGrid = grid;
}
@@ -699,10 +699,21 @@ static void GridDlgUpdate(
case I_SHOW:
GridButtonUpdate( CHK_SHOW );
break;
- default:
+ case I_HORZSPACING:
+ case I_HORZDIVISION:
+ case I_VERTSPACING:
+ case I_VERTDIVISION:
+ case I_VALUEX:
+ case I_VALUEY:
+ case I_VALUEA:
ParamLoadData( &gridPG );
+ MainRedraw(); // GridDlgUpdate
+ break;
+ default:
+// ParamLoadData( &gridPG );
GridButtonUpdate( 0 );
MainRedraw(); // GridDlgUpdate
+ break;
}
}
@@ -713,7 +724,6 @@ static void SnapGridRotate( void * pangle )
wDrawDelayUpdate( tempD.d, TRUE );
grid.Orig = cmdMenuPos;
grid.Angle += angle/1000;
- oldGrid = grid;
DrawASnapGrid( &grid, &tempD, mapD.size, TRUE );
wDrawDelayUpdate( tempD.d, FALSE );
ParamLoadControls( &gridPG );
@@ -731,7 +741,7 @@ EXPORT STATUS_T CmdGrid(
case C_START:
if (gridW == NULL) {
gridW = ParamCreateDialog( &gridPG, MakeWindowTitle(_("Snap Grid")), _("Ok"),
- GridOk, (paramActionCancelProc)Reset, TRUE, NULL, 0, GridDlgUpdate );
+ GridOk, ParamCancel_Null, TRUE, NULL, 0, GridDlgUpdate );
}
oldGrid = grid;
ParamLoadControls( &gridPG );
@@ -744,6 +754,7 @@ EXPORT STATUS_T CmdGrid(
case C_CANCEL:
grid = oldGrid;
+// ParamLoadControls( &gridPG );
wHide( gridW );
return C_TERMINATE;
@@ -761,7 +772,6 @@ EXPORT STATUS_T CmdGrid(
case C_DOWN:
case C_RDOWN:
- oldGrid = grid;
rc = GridAction( action, pos, &grid.Orig, &grid.Angle );
return rc;
case C_MOVE:
@@ -774,7 +784,6 @@ EXPORT STATUS_T CmdGrid(
rc = GridAction( action, pos, &grid.Orig, &grid.Angle );
ParamLoadControls( &gridPG );
RedrawGrid();
- oldGrid = grid;
return rc;
case C_CMDMENU:
@@ -830,14 +839,14 @@ EXPORT void SnapGridShow( void * unused )
GridButtonUpdate( CHK_SHOW );
}
-#include "bitmaps/snap-curs.xpm3"
-#include "bitmaps/snap-grid.xpm3"
+#include "bitmaps/snap-curs.image3"
+#include "bitmaps/snap-grid.image3"
EXPORT void InitSnapGridButtons( void )
{
snapGridEnable_b = AddToolbarButton( "cmdGridEnable",
- wIconCreatePixMap(snap_curs_xpm3[iconSize] ), 0, SnapGridEnable, NULL );
+ wIconCreatePixMap(snap_curs_image3[iconSize] ), 0, SnapGridEnable, NULL );
snapGridShow_b = AddToolbarButton( "cmdGridShow",
- wIconCreatePixMap(snap_grid_xpm3[iconSize] ), IC_MODETRAIN_TOO, SnapGridShow,
+ wIconCreatePixMap(snap_grid_image3[iconSize] ), IC_MODETRAIN_TOO, SnapGridShow,
NULL );
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-27 19:02:34 +0000