Add user control for grid minimum spacing in GAL
This allows the user to set a thicker grid line without causing the grid lines to become over dense, or just make the grid denser according to preference. The term "density" is modified to "minimum grid spacing", which is the pixel spacing between adjacent grid lines. The spacing settings now comes in along, with other GAL display settings, as part of GAL_DISPLAY_OPTIONS observer functionality. To this end, the setter in GAL interface is removed, as an external user should be setting this parameter via the GAL_DISPLAY_OPTIONS interface.
This commit is contained in:
John Beard
Maciej Suminski
parent
970e4f8eb4
commit
0bf3a19967
|
|
@ -32,6 +32,7 @@ using namespace KIGFX;
|
||||||
static const wxString GalGLAntialiasingKeyword( "OpenGLAntialiasingMode" );
|
static const wxString GalGLAntialiasingKeyword( "OpenGLAntialiasingMode" );
|
||||||
static const wxString GalGridStyleConfig( "GridStyle" );
|
static const wxString GalGridStyleConfig( "GridStyle" );
|
||||||
static const wxString GalGridLineWidthConfig( "GridLineWidth" );
|
static const wxString GalGridLineWidthConfig( "GridLineWidth" );
|
||||||
|
static const wxString GalGridMaxDensityConfig( "GridMaxDensity" );
|
||||||
|
|
||||||
|
|
||||||
GAL_DISPLAY_OPTIONS::GAL_DISPLAY_OPTIONS()
|
GAL_DISPLAY_OPTIONS::GAL_DISPLAY_OPTIONS()
|
||||||
|
|
@ -53,6 +54,9 @@ void GAL_DISPLAY_OPTIONS::ReadConfig( wxConfigBase* aCfg, wxString aBaseName )
|
||||||
aCfg->Read( aBaseName + GalGridLineWidthConfig,
|
aCfg->Read( aBaseName + GalGridLineWidthConfig,
|
||||||
&m_gridLineWidth, 0.5 );
|
&m_gridLineWidth, 0.5 );
|
||||||
|
|
||||||
|
aCfg->Read( aBaseName + GalGridMaxDensityConfig,
|
||||||
|
&m_gridMinSpacing, 10 );
|
||||||
|
|
||||||
NotifyChanged();
|
NotifyChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -67,6 +71,9 @@ void GAL_DISPLAY_OPTIONS::WriteConfig( wxConfigBase* aCfg, wxString aBaseName )
|
||||||
|
|
||||||
aCfg->Write( aBaseName + GalGridLineWidthConfig,
|
aCfg->Write( aBaseName + GalGridLineWidthConfig,
|
||||||
m_gridLineWidth );
|
m_gridLineWidth );
|
||||||
|
|
||||||
|
aCfg->Write( aBaseName + GalGridMaxDensityConfig,
|
||||||
|
m_gridMinSpacing );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -58,10 +58,10 @@ GAL::GAL( GAL_DISPLAY_OPTIONS& aDisplayOptions ) :
|
||||||
|
|
||||||
// Set grid defaults
|
// Set grid defaults
|
||||||
SetGridVisibility( true );
|
SetGridVisibility( true );
|
||||||
SetGridDrawThreshold( 10 );
|
|
||||||
SetCoarseGrid( 10 );
|
SetCoarseGrid( 10 );
|
||||||
gridLineWidth = 0.5;
|
gridLineWidth = 0.5;
|
||||||
gridStyle = GRID_STYLE::LINES;
|
gridStyle = GRID_STYLE::LINES;
|
||||||
|
gridMinSpacing = 10;
|
||||||
|
|
||||||
// Initialize the cursor shape
|
// Initialize the cursor shape
|
||||||
SetCursorColor( COLOR4D( 1.0, 1.0, 1.0, 1.0 ) );
|
SetCursorColor( COLOR4D( 1.0, 1.0, 1.0, 1.0 ) );
|
||||||
|
|
@ -104,6 +104,12 @@ bool GAL::updatedGalDisplayOptions( const GAL_DISPLAY_OPTIONS& aOptions )
|
||||||
refresh = true;
|
refresh = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if( options.m_gridMinSpacing != gridMinSpacing )
|
||||||
|
{
|
||||||
|
gridMinSpacing = options.m_gridMinSpacing;
|
||||||
|
refresh = true;
|
||||||
|
}
|
||||||
|
|
||||||
// tell the derived class if the base class needs an update or not
|
// tell the derived class if the base class needs an update or not
|
||||||
return refresh;
|
return refresh;
|
||||||
}
|
}
|
||||||
|
|
@ -157,6 +163,14 @@ void GAL::ComputeWorldScreenMatrix()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
double GAL::computeMinGridSpacing() const
|
||||||
|
{
|
||||||
|
// just return the current value. This could be cleverer and take
|
||||||
|
// into account other settings in future
|
||||||
|
return gridMinSpacing;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
void GAL::DrawGrid()
|
void GAL::DrawGrid()
|
||||||
{
|
{
|
||||||
if( !gridVisibility )
|
if( !gridVisibility )
|
||||||
|
|
@ -170,6 +184,8 @@ void GAL::DrawGrid()
|
||||||
VECTOR2D worldStartPoint = screenWorldMatrix * VECTOR2D( 0.0, 0.0 );
|
VECTOR2D worldStartPoint = screenWorldMatrix * VECTOR2D( 0.0, 0.0 );
|
||||||
VECTOR2D worldEndPoint = screenWorldMatrix * VECTOR2D( screenSize );
|
VECTOR2D worldEndPoint = screenWorldMatrix * VECTOR2D( screenSize );
|
||||||
|
|
||||||
|
const double gridThreshold = computeMinGridSpacing();
|
||||||
|
|
||||||
int gridScreenSizeDense = KiROUND( gridSize.x * worldScale );
|
int gridScreenSizeDense = KiROUND( gridSize.x * worldScale );
|
||||||
int gridScreenSizeCoarse = KiROUND( gridSize.x * static_cast<double>( gridTick ) * worldScale );
|
int gridScreenSizeCoarse = KiROUND( gridSize.x * static_cast<double>( gridTick ) * worldScale );
|
||||||
|
|
||||||
|
|
@ -181,7 +197,7 @@ void GAL::DrawGrid()
|
||||||
double doubleMarker = 2.0 * marker;
|
double doubleMarker = 2.0 * marker;
|
||||||
|
|
||||||
// Check if the grid would not be too dense
|
// Check if the grid would not be too dense
|
||||||
if( std::max( gridScreenSizeDense, gridScreenSizeCoarse ) > gridDrawThreshold )
|
if( std::max( gridScreenSizeDense, gridScreenSizeCoarse ) > gridThreshold )
|
||||||
{
|
{
|
||||||
// Compute grid variables
|
// Compute grid variables
|
||||||
int gridStartX = KiROUND( worldStartPoint.x / gridSize.x );
|
int gridStartX = KiROUND( worldStartPoint.x / gridSize.x );
|
||||||
|
|
@ -222,13 +238,13 @@ void GAL::DrawGrid()
|
||||||
// Vertical lines
|
// Vertical lines
|
||||||
for( int j = gridStartY; j != gridEndY; j += dirY )
|
for( int j = gridStartY; j != gridEndY; j += dirY )
|
||||||
{
|
{
|
||||||
if( j % gridTick == 0 && gridScreenSizeDense > gridDrawThreshold )
|
if( j % gridTick == 0 && gridScreenSizeDense > gridThreshold )
|
||||||
SetLineWidth( doubleMarker );
|
SetLineWidth( doubleMarker );
|
||||||
else
|
else
|
||||||
SetLineWidth( marker );
|
SetLineWidth( marker );
|
||||||
|
|
||||||
if( ( j % gridTick == 0 && gridScreenSizeCoarse > gridDrawThreshold )
|
if( ( j % gridTick == 0 && gridScreenSizeCoarse > gridThreshold )
|
||||||
|| gridScreenSizeDense > gridDrawThreshold )
|
|| gridScreenSizeDense > gridThreshold )
|
||||||
{
|
{
|
||||||
drawGridLine( VECTOR2D( gridStartX * gridSize.x, j * gridSize.y + gridOrigin.y ),
|
drawGridLine( VECTOR2D( gridStartX * gridSize.x, j * gridSize.y + gridOrigin.y ),
|
||||||
VECTOR2D( gridEndX * gridSize.x, j * gridSize.y + gridOrigin.y ) );
|
VECTOR2D( gridEndX * gridSize.x, j * gridSize.y + gridOrigin.y ) );
|
||||||
|
|
@ -238,13 +254,13 @@ void GAL::DrawGrid()
|
||||||
// Horizontal lines
|
// Horizontal lines
|
||||||
for( int i = gridStartX; i != gridEndX; i += dirX )
|
for( int i = gridStartX; i != gridEndX; i += dirX )
|
||||||
{
|
{
|
||||||
if( i % gridTick == 0 && gridScreenSizeDense > gridDrawThreshold )
|
if( i % gridTick == 0 && gridScreenSizeDense > gridThreshold )
|
||||||
SetLineWidth( doubleMarker );
|
SetLineWidth( doubleMarker );
|
||||||
else
|
else
|
||||||
SetLineWidth( marker );
|
SetLineWidth( marker );
|
||||||
|
|
||||||
if( ( i % gridTick == 0 && gridScreenSizeCoarse > gridDrawThreshold )
|
if( ( i % gridTick == 0 && gridScreenSizeCoarse > gridThreshold )
|
||||||
|| gridScreenSizeDense > gridDrawThreshold )
|
|| gridScreenSizeDense > gridThreshold )
|
||||||
{
|
{
|
||||||
drawGridLine( VECTOR2D( i * gridSize.x + gridOrigin.x, gridStartY * gridSize.y ),
|
drawGridLine( VECTOR2D( i * gridSize.x + gridOrigin.x, gridStartY * gridSize.y ),
|
||||||
VECTOR2D( i * gridSize.x + gridOrigin.x, gridEndY * gridSize.y ) );
|
VECTOR2D( i * gridSize.x + gridOrigin.x, gridEndY * gridSize.y ) );
|
||||||
|
|
@ -260,19 +276,19 @@ void GAL::DrawGrid()
|
||||||
|
|
||||||
for( int j = gridStartY; j != gridEndY; j += dirY )
|
for( int j = gridStartY; j != gridEndY; j += dirY )
|
||||||
{
|
{
|
||||||
if( j % gridTick == 0 && gridScreenSizeDense > gridDrawThreshold )
|
if( j % gridTick == 0 && gridScreenSizeDense > gridThreshold )
|
||||||
tickY = true;
|
tickY = true;
|
||||||
else
|
else
|
||||||
tickY = false;
|
tickY = false;
|
||||||
|
|
||||||
for( int i = gridStartX; i != gridEndX; i += dirX )
|
for( int i = gridStartX; i != gridEndX; i += dirX )
|
||||||
{
|
{
|
||||||
if( i % gridTick == 0 && gridScreenSizeDense > gridDrawThreshold )
|
if( i % gridTick == 0 && gridScreenSizeDense > gridThreshold )
|
||||||
tickX = true;
|
tickX = true;
|
||||||
else
|
else
|
||||||
tickX = false;
|
tickX = false;
|
||||||
|
|
||||||
if( tickX || tickY || gridScreenSizeDense > gridDrawThreshold )
|
if( tickX || tickY || gridScreenSizeDense > gridThreshold )
|
||||||
{
|
{
|
||||||
double radius = ( ( tickX && tickY ) ? doubleMarker : marker ) / 2.0;
|
double radius = ( ( tickX && tickY ) ? doubleMarker : marker ) / 2.0;
|
||||||
DrawRectangle( VECTOR2D( i * gridSize.x - radius + gridOrigin.x,
|
DrawRectangle( VECTOR2D( i * gridSize.x - radius + gridOrigin.x,
|
||||||
|
|
|
||||||
|
|
@ -852,8 +852,10 @@ void OPENGL_GAL::DrawGrid()
|
||||||
double minorLineWidth = std::max( 1.0, gridLineWidth );
|
double minorLineWidth = std::max( 1.0, gridLineWidth );
|
||||||
double majorLineWidth = minorLineWidth * 2.0;
|
double majorLineWidth = minorLineWidth * 2.0;
|
||||||
|
|
||||||
|
const double gridThreshold = computeMinGridSpacing();
|
||||||
|
|
||||||
// Check if the grid would not be too dense
|
// Check if the grid would not be too dense
|
||||||
if( std::max( gridScreenSizeDense, gridScreenSizeCoarse ) < gridDrawThreshold )
|
if( std::max( gridScreenSizeDense, gridScreenSizeCoarse ) < gridThreshold )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
SetTarget( TARGET_NONCACHED );
|
SetTarget( TARGET_NONCACHED );
|
||||||
|
|
@ -907,13 +909,13 @@ void OPENGL_GAL::DrawGrid()
|
||||||
// Vertical lines
|
// Vertical lines
|
||||||
for( int j = gridStartY; j != gridEndY; j += dirY )
|
for( int j = gridStartY; j != gridEndY; j += dirY )
|
||||||
{
|
{
|
||||||
if( j % gridTick == 0 && gridScreenSizeDense > gridDrawThreshold )
|
if( j % gridTick == 0 && gridScreenSizeDense > gridThreshold )
|
||||||
glLineWidth( majorLineWidth );
|
glLineWidth( majorLineWidth );
|
||||||
else
|
else
|
||||||
glLineWidth( minorLineWidth );
|
glLineWidth( minorLineWidth );
|
||||||
|
|
||||||
if( ( j % gridTick == 0 && gridScreenSizeCoarse > gridDrawThreshold )
|
if( ( j % gridTick == 0 && gridScreenSizeCoarse > gridThreshold )
|
||||||
|| gridScreenSizeDense > gridDrawThreshold )
|
|| gridScreenSizeDense > gridThreshold )
|
||||||
{
|
{
|
||||||
glBegin( GL_LINES );
|
glBegin( GL_LINES );
|
||||||
glVertex2d( gridStartX * gridSize.x, j * gridSize.y + gridOrigin.y );
|
glVertex2d( gridStartX * gridSize.x, j * gridSize.y + gridOrigin.y );
|
||||||
|
|
@ -931,13 +933,13 @@ void OPENGL_GAL::DrawGrid()
|
||||||
// Horizontal lines
|
// Horizontal lines
|
||||||
for( int i = gridStartX; i != gridEndX; i += dirX )
|
for( int i = gridStartX; i != gridEndX; i += dirX )
|
||||||
{
|
{
|
||||||
if( i % gridTick == 0 && gridScreenSizeDense > gridDrawThreshold )
|
if( i % gridTick == 0 && gridScreenSizeDense > gridThreshold )
|
||||||
glLineWidth( majorLineWidth );
|
glLineWidth( majorLineWidth );
|
||||||
else
|
else
|
||||||
glLineWidth( minorLineWidth );
|
glLineWidth( minorLineWidth );
|
||||||
|
|
||||||
if( ( i % gridTick == 0 && gridScreenSizeCoarse > gridDrawThreshold )
|
if( ( i % gridTick == 0 && gridScreenSizeCoarse > gridThreshold )
|
||||||
|| gridScreenSizeDense > gridDrawThreshold )
|
|| gridScreenSizeDense > gridThreshold )
|
||||||
{
|
{
|
||||||
glBegin( GL_LINES );
|
glBegin( GL_LINES );
|
||||||
glVertex2d( i * gridSize.x + gridOrigin.x, gridStartY * gridSize.y );
|
glVertex2d( i * gridSize.x + gridOrigin.x, gridStartY * gridSize.y );
|
||||||
|
|
|
||||||
|
|
@ -74,6 +74,9 @@ namespace KIGFX
|
||||||
|
|
||||||
///> Thickness to render grid lines/dots
|
///> Thickness to render grid lines/dots
|
||||||
double m_gridLineWidth;
|
double m_gridLineWidth;
|
||||||
|
|
||||||
|
///> Minimum pixel distance between displayed grid lines
|
||||||
|
double m_gridMinSpacing;
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -766,16 +766,6 @@ public:
|
||||||
(long) gridOrigin.y % (long) gridSize.y );
|
(long) gridOrigin.y % (long) gridSize.y );
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Set the threshold for grid drawing.
|
|
||||||
*
|
|
||||||
* @param aThreshold is the minimum grid cell size (in pixels) for which the grid is drawn.
|
|
||||||
*/
|
|
||||||
inline void SetGridDrawThreshold( int aThreshold )
|
|
||||||
{
|
|
||||||
gridDrawThreshold = aThreshold;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Set the grid size.
|
* @brief Set the grid size.
|
||||||
*
|
*
|
||||||
|
|
@ -978,7 +968,7 @@ protected:
|
||||||
COLOR4D gridColor; ///< Color of the grid
|
COLOR4D gridColor; ///< Color of the grid
|
||||||
int gridTick; ///< Every tick line gets the double width
|
int gridTick; ///< Every tick line gets the double width
|
||||||
double gridLineWidth; ///< Line width of the grid
|
double gridLineWidth; ///< Line width of the grid
|
||||||
int gridDrawThreshold; ///< Minimum screen size of the grid (pixels)
|
int gridMinSpacing; ///< Minimum screen size of the grid (pixels)
|
||||||
///< below which the grid is not drawn
|
///< below which the grid is not drawn
|
||||||
|
|
||||||
// Cursor settings
|
// Cursor settings
|
||||||
|
|
@ -996,6 +986,13 @@ protected:
|
||||||
worldScale = screenDPI * worldUnitLength * zoomFactor;
|
worldScale = screenDPI * worldUnitLength * zoomFactor;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief compute minimum grid spacing from the grid settings
|
||||||
|
*
|
||||||
|
* @return the minimum spacing to use for drawing the grid
|
||||||
|
*/
|
||||||
|
double computeMinGridSpacing() const;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Draw a grid line (usually a simplified line function).
|
* @brief Draw a grid line (usually a simplified line function).
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -51,6 +51,9 @@ static const double gridThicknessMin = 0.5;
|
||||||
static const double gridThicknessMax = 10.0;
|
static const double gridThicknessMax = 10.0;
|
||||||
static const double gridThicknessStep = 0.5;
|
static const double gridThicknessStep = 0.5;
|
||||||
|
|
||||||
|
static const double gridMinSpacingMin = 5;
|
||||||
|
static const double gridMinSpacingMax = 200;
|
||||||
|
static const double gridMinSpacingStep = 5;
|
||||||
|
|
||||||
static void setRadioFromGridStyle( wxRadioBox& aRBox,
|
static void setRadioFromGridStyle( wxRadioBox& aRBox,
|
||||||
KIGFX::GRID_STYLE aStyle )
|
KIGFX::GRID_STYLE aStyle )
|
||||||
|
|
@ -214,6 +217,13 @@ DIALOG_DISPLAY_OPTIONS::DIALOG_DISPLAY_OPTIONS( PCB_EDIT_FRAME* parent ) :
|
||||||
gridThicknessStep );
|
gridThicknessStep );
|
||||||
m_gridSizeIncrementer->SetPrecision( 1 );
|
m_gridSizeIncrementer->SetPrecision( 1 );
|
||||||
|
|
||||||
|
m_gridMinSpacingIncrementer = std::make_unique<SPIN_INCREMENTAL_TEXT_CTRL>(
|
||||||
|
*m_gridMinSpacingSpinBtn, *m_gridMinSpacing);
|
||||||
|
|
||||||
|
m_gridMinSpacingIncrementer->SetStep( gridMinSpacingMin, gridMinSpacingMax,
|
||||||
|
gridMinSpacingStep );
|
||||||
|
m_gridMinSpacingIncrementer->SetPrecision( 0 ); // restrict to ints
|
||||||
|
|
||||||
// load settings into controls
|
// load settings into controls
|
||||||
init();
|
init();
|
||||||
|
|
||||||
|
|
@ -254,6 +264,8 @@ void DIALOG_DISPLAY_OPTIONS::init()
|
||||||
setRadioFromGridStyle( *m_gridStyle, gal_opts.m_gridStyle );
|
setRadioFromGridStyle( *m_gridStyle, gal_opts.m_gridStyle );
|
||||||
|
|
||||||
m_gridSizeIncrementer->SetValue( gal_opts.m_gridLineWidth );
|
m_gridSizeIncrementer->SetValue( gal_opts.m_gridLineWidth );
|
||||||
|
|
||||||
|
m_gridMinSpacingIncrementer->SetValue( gal_opts.m_gridMinSpacing );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -300,6 +312,8 @@ void DIALOG_DISPLAY_OPTIONS::OnOkClick(wxCommandEvent& event)
|
||||||
|
|
||||||
gal_opts.m_gridLineWidth = m_gridSizeIncrementer->GetValue();
|
gal_opts.m_gridLineWidth = m_gridSizeIncrementer->GetValue();
|
||||||
|
|
||||||
|
gal_opts.m_gridMinSpacing = m_gridMinSpacingIncrementer->GetValue();
|
||||||
|
|
||||||
gal_opts.NotifyChanged();
|
gal_opts.NotifyChanged();
|
||||||
|
|
||||||
// Apply changes to the GAL
|
// Apply changes to the GAL
|
||||||
|
|
|
||||||
|
|
@ -35,6 +35,7 @@ private:
|
||||||
PCB_EDIT_FRAME* m_Parent;
|
PCB_EDIT_FRAME* m_Parent;
|
||||||
|
|
||||||
std::unique_ptr<INCREMENTAL_TEXT_CTRL> m_gridSizeIncrementer;
|
std::unique_ptr<INCREMENTAL_TEXT_CTRL> m_gridSizeIncrementer;
|
||||||
|
std::unique_ptr<INCREMENTAL_TEXT_CTRL> m_gridMinSpacingIncrementer;
|
||||||
|
|
||||||
void init();
|
void init();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -56,7 +56,7 @@ DIALOG_DISPLAY_OPTIONS_BASE::DIALOG_DISPLAY_OPTIONS_BASE( wxWindow* parent, wxWi
|
||||||
sGridSettings->Add( m_gridStyle, 0, wxALL|wxEXPAND, 5 );
|
sGridSettings->Add( m_gridStyle, 0, wxALL|wxEXPAND, 5 );
|
||||||
|
|
||||||
wxFlexGridSizer* sGridSettingsGrid;
|
wxFlexGridSizer* sGridSettingsGrid;
|
||||||
sGridSettingsGrid = new wxFlexGridSizer( 0, 3, 0, 0 );
|
sGridSettingsGrid = new wxFlexGridSizer( 0, 4, 0, 0 );
|
||||||
sGridSettingsGrid->AddGrowableCol( 1 );
|
sGridSettingsGrid->AddGrowableCol( 1 );
|
||||||
sGridSettingsGrid->SetFlexibleDirection( wxBOTH );
|
sGridSettingsGrid->SetFlexibleDirection( wxBOTH );
|
||||||
sGridSettingsGrid->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
|
sGridSettingsGrid->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
|
||||||
|
|
@ -66,11 +66,29 @@ DIALOG_DISPLAY_OPTIONS_BASE::DIALOG_DISPLAY_OPTIONS_BASE( wxWindow* parent, wxWi
|
||||||
sGridSettingsGrid->Add( l_gridLineWidth, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
|
sGridSettingsGrid->Add( l_gridLineWidth, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
|
||||||
|
|
||||||
m_gridLineWidth = new wxTextCtrl( sGridSettings->GetStaticBox(), wxID_ANY, _("0.5"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_gridLineWidth = new wxTextCtrl( sGridSettings->GetStaticBox(), wxID_ANY, _("0.5"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
sGridSettingsGrid->Add( m_gridLineWidth, 0, wxEXPAND, 0 );
|
sGridSettingsGrid->Add( m_gridLineWidth, 0, wxEXPAND, 5 );
|
||||||
|
|
||||||
m_gridLineWidthSpinBtn = new wxSpinButton( sGridSettings->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS );
|
m_gridLineWidthSpinBtn = new wxSpinButton( sGridSettings->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS );
|
||||||
sGridSettingsGrid->Add( m_gridLineWidthSpinBtn, 0, wxALL, 0 );
|
sGridSettingsGrid->Add( m_gridLineWidthSpinBtn, 0, wxALL, 0 );
|
||||||
|
|
||||||
|
l_gridLineWidthUnits = new wxStaticText( sGridSettings->GetStaticBox(), wxID_ANY, _("px"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
l_gridLineWidthUnits->Wrap( -1 );
|
||||||
|
sGridSettingsGrid->Add( l_gridLineWidthUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
|
||||||
|
|
||||||
|
l_gridMinSpacing = new wxStaticText( sGridSettings->GetStaticBox(), wxID_ANY, _("Min grid spacing:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
l_gridMinSpacing->Wrap( -1 );
|
||||||
|
sGridSettingsGrid->Add( l_gridMinSpacing, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
|
||||||
|
|
||||||
|
m_gridMinSpacing = new wxTextCtrl( sGridSettings->GetStaticBox(), wxID_ANY, _("10"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
sGridSettingsGrid->Add( m_gridMinSpacing, 0, wxEXPAND, 5 );
|
||||||
|
|
||||||
|
m_gridMinSpacingSpinBtn = new wxSpinButton( sGridSettings->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS );
|
||||||
|
sGridSettingsGrid->Add( m_gridMinSpacingSpinBtn, 0, wxALL, 0 );
|
||||||
|
|
||||||
|
l_gridMinSpacingUnits = new wxStaticText( sGridSettings->GetStaticBox(), wxID_ANY, _("px"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
l_gridMinSpacingUnits->Wrap( -1 );
|
||||||
|
sGridSettingsGrid->Add( l_gridMinSpacingUnits, 0, wxALL, 5 );
|
||||||
|
|
||||||
|
|
||||||
sGridSettings->Add( sGridSettingsGrid, 1, wxALL|wxEXPAND, 5 );
|
sGridSettings->Add( sGridSettingsGrid, 1, wxALL|wxEXPAND, 5 );
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -513,7 +513,7 @@
|
||||||
<property name="flag">wxALL|wxEXPAND</property>
|
<property name="flag">wxALL|wxEXPAND</property>
|
||||||
<property name="proportion">1</property>
|
<property name="proportion">1</property>
|
||||||
<object class="wxFlexGridSizer" expanded="1">
|
<object class="wxFlexGridSizer" expanded="1">
|
||||||
<property name="cols">3</property>
|
<property name="cols">4</property>
|
||||||
<property name="flexible_direction">wxBOTH</property>
|
<property name="flexible_direction">wxBOTH</property>
|
||||||
<property name="growablecols">1</property>
|
<property name="growablecols">1</property>
|
||||||
<property name="growablerows"></property>
|
<property name="growablerows"></property>
|
||||||
|
|
@ -608,7 +608,7 @@
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
<object class="sizeritem" expanded="1">
|
<object class="sizeritem" expanded="1">
|
||||||
<property name="border">0</property>
|
<property name="border">5</property>
|
||||||
<property name="flag">wxEXPAND</property>
|
<property name="flag">wxEXPAND</property>
|
||||||
<property name="proportion">0</property>
|
<property name="proportion">0</property>
|
||||||
<object class="wxTextCtrl" expanded="1">
|
<object class="wxTextCtrl" expanded="1">
|
||||||
|
|
@ -782,6 +782,430 @@
|
||||||
<event name="OnUpdateUI"></event>
|
<event name="OnUpdateUI"></event>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
|
<object class="sizeritem" expanded="1">
|
||||||
|
<property name="border">5</property>
|
||||||
|
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
|
||||||
|
<property name="proportion">0</property>
|
||||||
|
<object class="wxStaticText" expanded="1">
|
||||||
|
<property name="BottomDockable">1</property>
|
||||||
|
<property name="LeftDockable">1</property>
|
||||||
|
<property name="RightDockable">1</property>
|
||||||
|
<property name="TopDockable">1</property>
|
||||||
|
<property name="aui_layer"></property>
|
||||||
|
<property name="aui_name"></property>
|
||||||
|
<property name="aui_position"></property>
|
||||||
|
<property name="aui_row"></property>
|
||||||
|
<property name="best_size"></property>
|
||||||
|
<property name="bg"></property>
|
||||||
|
<property name="caption"></property>
|
||||||
|
<property name="caption_visible">1</property>
|
||||||
|
<property name="center_pane">0</property>
|
||||||
|
<property name="close_button">1</property>
|
||||||
|
<property name="context_help"></property>
|
||||||
|
<property name="context_menu">1</property>
|
||||||
|
<property name="default_pane">0</property>
|
||||||
|
<property name="dock">Dock</property>
|
||||||
|
<property name="dock_fixed">0</property>
|
||||||
|
<property name="docking">Left</property>
|
||||||
|
<property name="enabled">1</property>
|
||||||
|
<property name="fg"></property>
|
||||||
|
<property name="floatable">1</property>
|
||||||
|
<property name="font"></property>
|
||||||
|
<property name="gripper">0</property>
|
||||||
|
<property name="hidden">0</property>
|
||||||
|
<property name="id">wxID_ANY</property>
|
||||||
|
<property name="label">px</property>
|
||||||
|
<property name="max_size"></property>
|
||||||
|
<property name="maximize_button">0</property>
|
||||||
|
<property name="maximum_size"></property>
|
||||||
|
<property name="min_size"></property>
|
||||||
|
<property name="minimize_button">0</property>
|
||||||
|
<property name="minimum_size"></property>
|
||||||
|
<property name="moveable">1</property>
|
||||||
|
<property name="name">l_gridLineWidthUnits</property>
|
||||||
|
<property name="pane_border">1</property>
|
||||||
|
<property name="pane_position"></property>
|
||||||
|
<property name="pane_size"></property>
|
||||||
|
<property name="permission">protected</property>
|
||||||
|
<property name="pin_button">1</property>
|
||||||
|
<property name="pos"></property>
|
||||||
|
<property name="resize">Resizable</property>
|
||||||
|
<property name="show">1</property>
|
||||||
|
<property name="size"></property>
|
||||||
|
<property name="style"></property>
|
||||||
|
<property name="subclass"></property>
|
||||||
|
<property name="toolbar_pane">0</property>
|
||||||
|
<property name="tooltip"></property>
|
||||||
|
<property name="window_extra_style"></property>
|
||||||
|
<property name="window_name"></property>
|
||||||
|
<property name="window_style"></property>
|
||||||
|
<property name="wrap">-1</property>
|
||||||
|
<event name="OnChar"></event>
|
||||||
|
<event name="OnEnterWindow"></event>
|
||||||
|
<event name="OnEraseBackground"></event>
|
||||||
|
<event name="OnKeyDown"></event>
|
||||||
|
<event name="OnKeyUp"></event>
|
||||||
|
<event name="OnKillFocus"></event>
|
||||||
|
<event name="OnLeaveWindow"></event>
|
||||||
|
<event name="OnLeftDClick"></event>
|
||||||
|
<event name="OnLeftDown"></event>
|
||||||
|
<event name="OnLeftUp"></event>
|
||||||
|
<event name="OnMiddleDClick"></event>
|
||||||
|
<event name="OnMiddleDown"></event>
|
||||||
|
<event name="OnMiddleUp"></event>
|
||||||
|
<event name="OnMotion"></event>
|
||||||
|
<event name="OnMouseEvents"></event>
|
||||||
|
<event name="OnMouseWheel"></event>
|
||||||
|
<event name="OnPaint"></event>
|
||||||
|
<event name="OnRightDClick"></event>
|
||||||
|
<event name="OnRightDown"></event>
|
||||||
|
<event name="OnRightUp"></event>
|
||||||
|
<event name="OnSetFocus"></event>
|
||||||
|
<event name="OnSize"></event>
|
||||||
|
<event name="OnUpdateUI"></event>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
|
<object class="sizeritem" expanded="1">
|
||||||
|
<property name="border">5</property>
|
||||||
|
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
|
||||||
|
<property name="proportion">0</property>
|
||||||
|
<object class="wxStaticText" expanded="1">
|
||||||
|
<property name="BottomDockable">1</property>
|
||||||
|
<property name="LeftDockable">1</property>
|
||||||
|
<property name="RightDockable">1</property>
|
||||||
|
<property name="TopDockable">1</property>
|
||||||
|
<property name="aui_layer"></property>
|
||||||
|
<property name="aui_name"></property>
|
||||||
|
<property name="aui_position"></property>
|
||||||
|
<property name="aui_row"></property>
|
||||||
|
<property name="best_size"></property>
|
||||||
|
<property name="bg"></property>
|
||||||
|
<property name="caption"></property>
|
||||||
|
<property name="caption_visible">1</property>
|
||||||
|
<property name="center_pane">0</property>
|
||||||
|
<property name="close_button">1</property>
|
||||||
|
<property name="context_help"></property>
|
||||||
|
<property name="context_menu">1</property>
|
||||||
|
<property name="default_pane">0</property>
|
||||||
|
<property name="dock">Dock</property>
|
||||||
|
<property name="dock_fixed">0</property>
|
||||||
|
<property name="docking">Left</property>
|
||||||
|
<property name="enabled">1</property>
|
||||||
|
<property name="fg"></property>
|
||||||
|
<property name="floatable">1</property>
|
||||||
|
<property name="font"></property>
|
||||||
|
<property name="gripper">0</property>
|
||||||
|
<property name="hidden">0</property>
|
||||||
|
<property name="id">wxID_ANY</property>
|
||||||
|
<property name="label">Min grid spacing:</property>
|
||||||
|
<property name="max_size"></property>
|
||||||
|
<property name="maximize_button">0</property>
|
||||||
|
<property name="maximum_size"></property>
|
||||||
|
<property name="min_size"></property>
|
||||||
|
<property name="minimize_button">0</property>
|
||||||
|
<property name="minimum_size"></property>
|
||||||
|
<property name="moveable">1</property>
|
||||||
|
<property name="name">l_gridMinSpacing</property>
|
||||||
|
<property name="pane_border">1</property>
|
||||||
|
<property name="pane_position"></property>
|
||||||
|
<property name="pane_size"></property>
|
||||||
|
<property name="permission">protected</property>
|
||||||
|
<property name="pin_button">1</property>
|
||||||
|
<property name="pos"></property>
|
||||||
|
<property name="resize">Resizable</property>
|
||||||
|
<property name="show">1</property>
|
||||||
|
<property name="size"></property>
|
||||||
|
<property name="style"></property>
|
||||||
|
<property name="subclass"></property>
|
||||||
|
<property name="toolbar_pane">0</property>
|
||||||
|
<property name="tooltip"></property>
|
||||||
|
<property name="window_extra_style"></property>
|
||||||
|
<property name="window_name"></property>
|
||||||
|
<property name="window_style"></property>
|
||||||
|
<property name="wrap">-1</property>
|
||||||
|
<event name="OnChar"></event>
|
||||||
|
<event name="OnEnterWindow"></event>
|
||||||
|
<event name="OnEraseBackground"></event>
|
||||||
|
<event name="OnKeyDown"></event>
|
||||||
|
<event name="OnKeyUp"></event>
|
||||||
|
<event name="OnKillFocus"></event>
|
||||||
|
<event name="OnLeaveWindow"></event>
|
||||||
|
<event name="OnLeftDClick"></event>
|
||||||
|
<event name="OnLeftDown"></event>
|
||||||
|
<event name="OnLeftUp"></event>
|
||||||
|
<event name="OnMiddleDClick"></event>
|
||||||
|
<event name="OnMiddleDown"></event>
|
||||||
|
<event name="OnMiddleUp"></event>
|
||||||
|
<event name="OnMotion"></event>
|
||||||
|
<event name="OnMouseEvents"></event>
|
||||||
|
<event name="OnMouseWheel"></event>
|
||||||
|
<event name="OnPaint"></event>
|
||||||
|
<event name="OnRightDClick"></event>
|
||||||
|
<event name="OnRightDown"></event>
|
||||||
|
<event name="OnRightUp"></event>
|
||||||
|
<event name="OnSetFocus"></event>
|
||||||
|
<event name="OnSize"></event>
|
||||||
|
<event name="OnUpdateUI"></event>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
|
<object class="sizeritem" expanded="1">
|
||||||
|
<property name="border">5</property>
|
||||||
|
<property name="flag">wxEXPAND</property>
|
||||||
|
<property name="proportion">0</property>
|
||||||
|
<object class="wxTextCtrl" expanded="1">
|
||||||
|
<property name="BottomDockable">1</property>
|
||||||
|
<property name="LeftDockable">1</property>
|
||||||
|
<property name="RightDockable">1</property>
|
||||||
|
<property name="TopDockable">1</property>
|
||||||
|
<property name="aui_layer"></property>
|
||||||
|
<property name="aui_name"></property>
|
||||||
|
<property name="aui_position"></property>
|
||||||
|
<property name="aui_row"></property>
|
||||||
|
<property name="best_size"></property>
|
||||||
|
<property name="bg"></property>
|
||||||
|
<property name="caption"></property>
|
||||||
|
<property name="caption_visible">1</property>
|
||||||
|
<property name="center_pane">0</property>
|
||||||
|
<property name="close_button">1</property>
|
||||||
|
<property name="context_help"></property>
|
||||||
|
<property name="context_menu">1</property>
|
||||||
|
<property name="default_pane">0</property>
|
||||||
|
<property name="dock">Dock</property>
|
||||||
|
<property name="dock_fixed">0</property>
|
||||||
|
<property name="docking">Left</property>
|
||||||
|
<property name="enabled">1</property>
|
||||||
|
<property name="fg"></property>
|
||||||
|
<property name="floatable">1</property>
|
||||||
|
<property name="font"></property>
|
||||||
|
<property name="gripper">0</property>
|
||||||
|
<property name="hidden">0</property>
|
||||||
|
<property name="id">wxID_ANY</property>
|
||||||
|
<property name="max_size"></property>
|
||||||
|
<property name="maximize_button">0</property>
|
||||||
|
<property name="maximum_size"></property>
|
||||||
|
<property name="maxlength"></property>
|
||||||
|
<property name="min_size"></property>
|
||||||
|
<property name="minimize_button">0</property>
|
||||||
|
<property name="minimum_size"></property>
|
||||||
|
<property name="moveable">1</property>
|
||||||
|
<property name="name">m_gridMinSpacing</property>
|
||||||
|
<property name="pane_border">1</property>
|
||||||
|
<property name="pane_position"></property>
|
||||||
|
<property name="pane_size"></property>
|
||||||
|
<property name="permission">protected</property>
|
||||||
|
<property name="pin_button">1</property>
|
||||||
|
<property name="pos"></property>
|
||||||
|
<property name="resize">Resizable</property>
|
||||||
|
<property name="show">1</property>
|
||||||
|
<property name="size"></property>
|
||||||
|
<property name="style"></property>
|
||||||
|
<property name="subclass"></property>
|
||||||
|
<property name="toolbar_pane">0</property>
|
||||||
|
<property name="tooltip"></property>
|
||||||
|
<property name="validator_data_type"></property>
|
||||||
|
<property name="validator_style">wxFILTER_NONE</property>
|
||||||
|
<property name="validator_type">wxDefaultValidator</property>
|
||||||
|
<property name="validator_variable"></property>
|
||||||
|
<property name="value">10</property>
|
||||||
|
<property name="window_extra_style"></property>
|
||||||
|
<property name="window_name"></property>
|
||||||
|
<property name="window_style"></property>
|
||||||
|
<event name="OnChar"></event>
|
||||||
|
<event name="OnEnterWindow"></event>
|
||||||
|
<event name="OnEraseBackground"></event>
|
||||||
|
<event name="OnKeyDown"></event>
|
||||||
|
<event name="OnKeyUp"></event>
|
||||||
|
<event name="OnKillFocus"></event>
|
||||||
|
<event name="OnLeaveWindow"></event>
|
||||||
|
<event name="OnLeftDClick"></event>
|
||||||
|
<event name="OnLeftDown"></event>
|
||||||
|
<event name="OnLeftUp"></event>
|
||||||
|
<event name="OnMiddleDClick"></event>
|
||||||
|
<event name="OnMiddleDown"></event>
|
||||||
|
<event name="OnMiddleUp"></event>
|
||||||
|
<event name="OnMotion"></event>
|
||||||
|
<event name="OnMouseEvents"></event>
|
||||||
|
<event name="OnMouseWheel"></event>
|
||||||
|
<event name="OnPaint"></event>
|
||||||
|
<event name="OnRightDClick"></event>
|
||||||
|
<event name="OnRightDown"></event>
|
||||||
|
<event name="OnRightUp"></event>
|
||||||
|
<event name="OnSetFocus"></event>
|
||||||
|
<event name="OnSize"></event>
|
||||||
|
<event name="OnText"></event>
|
||||||
|
<event name="OnTextEnter"></event>
|
||||||
|
<event name="OnTextMaxLen"></event>
|
||||||
|
<event name="OnTextURL"></event>
|
||||||
|
<event name="OnUpdateUI"></event>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
|
<object class="sizeritem" expanded="1">
|
||||||
|
<property name="border">0</property>
|
||||||
|
<property name="flag">wxALL</property>
|
||||||
|
<property name="proportion">0</property>
|
||||||
|
<object class="wxSpinButton" expanded="1">
|
||||||
|
<property name="BottomDockable">1</property>
|
||||||
|
<property name="LeftDockable">1</property>
|
||||||
|
<property name="RightDockable">1</property>
|
||||||
|
<property name="TopDockable">1</property>
|
||||||
|
<property name="aui_layer"></property>
|
||||||
|
<property name="aui_name"></property>
|
||||||
|
<property name="aui_position"></property>
|
||||||
|
<property name="aui_row"></property>
|
||||||
|
<property name="best_size"></property>
|
||||||
|
<property name="bg"></property>
|
||||||
|
<property name="caption"></property>
|
||||||
|
<property name="caption_visible">1</property>
|
||||||
|
<property name="center_pane">0</property>
|
||||||
|
<property name="close_button">1</property>
|
||||||
|
<property name="context_help"></property>
|
||||||
|
<property name="context_menu">1</property>
|
||||||
|
<property name="default_pane">0</property>
|
||||||
|
<property name="dock">Dock</property>
|
||||||
|
<property name="dock_fixed">0</property>
|
||||||
|
<property name="docking">Left</property>
|
||||||
|
<property name="enabled">1</property>
|
||||||
|
<property name="fg"></property>
|
||||||
|
<property name="floatable">1</property>
|
||||||
|
<property name="font"></property>
|
||||||
|
<property name="gripper">0</property>
|
||||||
|
<property name="hidden">0</property>
|
||||||
|
<property name="id">wxID_ANY</property>
|
||||||
|
<property name="max_size"></property>
|
||||||
|
<property name="maximize_button">0</property>
|
||||||
|
<property name="maximum_size"></property>
|
||||||
|
<property name="min_size"></property>
|
||||||
|
<property name="minimize_button">0</property>
|
||||||
|
<property name="minimum_size"></property>
|
||||||
|
<property name="moveable">1</property>
|
||||||
|
<property name="name">m_gridMinSpacingSpinBtn</property>
|
||||||
|
<property name="pane_border">1</property>
|
||||||
|
<property name="pane_position"></property>
|
||||||
|
<property name="pane_size"></property>
|
||||||
|
<property name="permission">protected</property>
|
||||||
|
<property name="pin_button">1</property>
|
||||||
|
<property name="pos"></property>
|
||||||
|
<property name="resize">Resizable</property>
|
||||||
|
<property name="show">1</property>
|
||||||
|
<property name="size"></property>
|
||||||
|
<property name="style">wxSP_ARROW_KEYS</property>
|
||||||
|
<property name="subclass"></property>
|
||||||
|
<property name="toolbar_pane">0</property>
|
||||||
|
<property name="tooltip"></property>
|
||||||
|
<property name="window_extra_style"></property>
|
||||||
|
<property name="window_name"></property>
|
||||||
|
<property name="window_style"></property>
|
||||||
|
<event name="OnChar"></event>
|
||||||
|
<event name="OnEnterWindow"></event>
|
||||||
|
<event name="OnEraseBackground"></event>
|
||||||
|
<event name="OnKeyDown"></event>
|
||||||
|
<event name="OnKeyUp"></event>
|
||||||
|
<event name="OnKillFocus"></event>
|
||||||
|
<event name="OnLeaveWindow"></event>
|
||||||
|
<event name="OnLeftDClick"></event>
|
||||||
|
<event name="OnLeftDown"></event>
|
||||||
|
<event name="OnLeftUp"></event>
|
||||||
|
<event name="OnMiddleDClick"></event>
|
||||||
|
<event name="OnMiddleDown"></event>
|
||||||
|
<event name="OnMiddleUp"></event>
|
||||||
|
<event name="OnMotion"></event>
|
||||||
|
<event name="OnMouseEvents"></event>
|
||||||
|
<event name="OnMouseWheel"></event>
|
||||||
|
<event name="OnPaint"></event>
|
||||||
|
<event name="OnRightDClick"></event>
|
||||||
|
<event name="OnRightDown"></event>
|
||||||
|
<event name="OnRightUp"></event>
|
||||||
|
<event name="OnSetFocus"></event>
|
||||||
|
<event name="OnSize"></event>
|
||||||
|
<event name="OnSpin"></event>
|
||||||
|
<event name="OnSpinDown"></event>
|
||||||
|
<event name="OnSpinUp"></event>
|
||||||
|
<event name="OnUpdateUI"></event>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
|
<object class="sizeritem" expanded="1">
|
||||||
|
<property name="border">5</property>
|
||||||
|
<property name="flag">wxALL</property>
|
||||||
|
<property name="proportion">0</property>
|
||||||
|
<object class="wxStaticText" expanded="1">
|
||||||
|
<property name="BottomDockable">1</property>
|
||||||
|
<property name="LeftDockable">1</property>
|
||||||
|
<property name="RightDockable">1</property>
|
||||||
|
<property name="TopDockable">1</property>
|
||||||
|
<property name="aui_layer"></property>
|
||||||
|
<property name="aui_name"></property>
|
||||||
|
<property name="aui_position"></property>
|
||||||
|
<property name="aui_row"></property>
|
||||||
|
<property name="best_size"></property>
|
||||||
|
<property name="bg"></property>
|
||||||
|
<property name="caption"></property>
|
||||||
|
<property name="caption_visible">1</property>
|
||||||
|
<property name="center_pane">0</property>
|
||||||
|
<property name="close_button">1</property>
|
||||||
|
<property name="context_help"></property>
|
||||||
|
<property name="context_menu">1</property>
|
||||||
|
<property name="default_pane">0</property>
|
||||||
|
<property name="dock">Dock</property>
|
||||||
|
<property name="dock_fixed">0</property>
|
||||||
|
<property name="docking">Left</property>
|
||||||
|
<property name="enabled">1</property>
|
||||||
|
<property name="fg"></property>
|
||||||
|
<property name="floatable">1</property>
|
||||||
|
<property name="font"></property>
|
||||||
|
<property name="gripper">0</property>
|
||||||
|
<property name="hidden">0</property>
|
||||||
|
<property name="id">wxID_ANY</property>
|
||||||
|
<property name="label">px</property>
|
||||||
|
<property name="max_size"></property>
|
||||||
|
<property name="maximize_button">0</property>
|
||||||
|
<property name="maximum_size"></property>
|
||||||
|
<property name="min_size"></property>
|
||||||
|
<property name="minimize_button">0</property>
|
||||||
|
<property name="minimum_size"></property>
|
||||||
|
<property name="moveable">1</property>
|
||||||
|
<property name="name">l_gridMinSpacingUnits</property>
|
||||||
|
<property name="pane_border">1</property>
|
||||||
|
<property name="pane_position"></property>
|
||||||
|
<property name="pane_size"></property>
|
||||||
|
<property name="permission">protected</property>
|
||||||
|
<property name="pin_button">1</property>
|
||||||
|
<property name="pos"></property>
|
||||||
|
<property name="resize">Resizable</property>
|
||||||
|
<property name="show">1</property>
|
||||||
|
<property name="size"></property>
|
||||||
|
<property name="style"></property>
|
||||||
|
<property name="subclass"></property>
|
||||||
|
<property name="toolbar_pane">0</property>
|
||||||
|
<property name="tooltip"></property>
|
||||||
|
<property name="window_extra_style"></property>
|
||||||
|
<property name="window_name"></property>
|
||||||
|
<property name="window_style"></property>
|
||||||
|
<property name="wrap">-1</property>
|
||||||
|
<event name="OnChar"></event>
|
||||||
|
<event name="OnEnterWindow"></event>
|
||||||
|
<event name="OnEraseBackground"></event>
|
||||||
|
<event name="OnKeyDown"></event>
|
||||||
|
<event name="OnKeyUp"></event>
|
||||||
|
<event name="OnKillFocus"></event>
|
||||||
|
<event name="OnLeaveWindow"></event>
|
||||||
|
<event name="OnLeftDClick"></event>
|
||||||
|
<event name="OnLeftDown"></event>
|
||||||
|
<event name="OnLeftUp"></event>
|
||||||
|
<event name="OnMiddleDClick"></event>
|
||||||
|
<event name="OnMiddleDown"></event>
|
||||||
|
<event name="OnMiddleUp"></event>
|
||||||
|
<event name="OnMotion"></event>
|
||||||
|
<event name="OnMouseEvents"></event>
|
||||||
|
<event name="OnMouseWheel"></event>
|
||||||
|
<event name="OnPaint"></event>
|
||||||
|
<event name="OnRightDClick"></event>
|
||||||
|
<event name="OnRightDown"></event>
|
||||||
|
<event name="OnRightUp"></event>
|
||||||
|
<event name="OnSetFocus"></event>
|
||||||
|
<event name="OnSize"></event>
|
||||||
|
<event name="OnUpdateUI"></event>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
|
|
|
||||||
|
|
@ -53,6 +53,11 @@ class DIALOG_DISPLAY_OPTIONS_BASE : public DIALOG_SHIM
|
||||||
wxStaticText* l_gridLineWidth;
|
wxStaticText* l_gridLineWidth;
|
||||||
wxTextCtrl* m_gridLineWidth;
|
wxTextCtrl* m_gridLineWidth;
|
||||||
wxSpinButton* m_gridLineWidthSpinBtn;
|
wxSpinButton* m_gridLineWidthSpinBtn;
|
||||||
|
wxStaticText* l_gridLineWidthUnits;
|
||||||
|
wxStaticText* l_gridMinSpacing;
|
||||||
|
wxTextCtrl* m_gridMinSpacing;
|
||||||
|
wxSpinButton* m_gridMinSpacingSpinBtn;
|
||||||
|
wxStaticText* l_gridMinSpacingUnits;
|
||||||
wxRadioBox* m_ShowNetNamesOption;
|
wxRadioBox* m_ShowNetNamesOption;
|
||||||
wxRadioBox* m_OptDisplayTracksClearance;
|
wxRadioBox* m_OptDisplayTracksClearance;
|
||||||
wxCheckBox* m_OptDisplayModOutlines;
|
wxCheckBox* m_OptDisplayModOutlines;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue