Eliminate 0.1deg units in DIALOG_MODULE_BOARD_EDITOR
This commit is contained in:
parent
4fe676753a
commit
0a6583f902
|
@ -7,7 +7,7 @@
|
||||||
*
|
*
|
||||||
* Copyright (C) 2015 Jean-Pierre Charras, jp.charras at wanadoo.fr
|
* Copyright (C) 2015 Jean-Pierre Charras, jp.charras at wanadoo.fr
|
||||||
* Copyright (C) 2015 Dick Hollenbeck, dick@softplc.com
|
* Copyright (C) 2015 Dick Hollenbeck, dick@softplc.com
|
||||||
* Copyright (C) 2004-2015 KiCad Developers, see change_log.txt for contributors.
|
* Copyright (C) 2004-2016 KiCad Developers, see change_log.txt for contributors.
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or
|
* This program is free software; you can redistribute it and/or
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
|
@ -59,7 +59,8 @@ size_t DIALOG_MODULE_BOARD_EDITOR::m_page = 0; // remember the last open pag
|
||||||
DIALOG_MODULE_BOARD_EDITOR::DIALOG_MODULE_BOARD_EDITOR( PCB_EDIT_FRAME* aParent,
|
DIALOG_MODULE_BOARD_EDITOR::DIALOG_MODULE_BOARD_EDITOR( PCB_EDIT_FRAME* aParent,
|
||||||
MODULE* aModule,
|
MODULE* aModule,
|
||||||
wxDC* aDC ) :
|
wxDC* aDC ) :
|
||||||
DIALOG_MODULE_BOARD_EDITOR_BASE( aParent )
|
DIALOG_MODULE_BOARD_EDITOR_BASE( aParent ),
|
||||||
|
m_OrientValidator( 1, &m_OrientValue )
|
||||||
{
|
{
|
||||||
m_Parent = aParent;
|
m_Parent = aParent;
|
||||||
m_DC = aDC;
|
m_DC = aDC;
|
||||||
|
@ -70,12 +71,12 @@ DIALOG_MODULE_BOARD_EDITOR::DIALOG_MODULE_BOARD_EDITOR( PCB_EDIT_FRAME* aParent
|
||||||
icon.CopyFromBitmap( KiBitmap( icon_modedit_xpm ) );
|
icon.CopyFromBitmap( KiBitmap( icon_modedit_xpm ) );
|
||||||
SetIcon( icon );
|
SetIcon( icon );
|
||||||
|
|
||||||
|
m_OrientValidator.SetRange( -360.0, 360.0 );
|
||||||
|
m_OrientValueCtrl->SetValidator( m_OrientValidator );
|
||||||
|
|
||||||
m_PreviewPane = new PANEL_PREV_3D( m_Panel3D, aParent->Prj().Get3DCacheManager() );
|
m_PreviewPane = new PANEL_PREV_3D( m_Panel3D, aParent->Prj().Get3DCacheManager() );
|
||||||
bLowerSizer3D->Add( m_PreviewPane, 1, wxEXPAND, 5 );
|
bLowerSizer3D->Add( m_PreviewPane, 1, wxEXPAND, 5 );
|
||||||
|
|
||||||
InitModeditProperties();
|
|
||||||
InitBoardProperties();
|
|
||||||
|
|
||||||
m_NoteBook->SetSelection( m_page );
|
m_NoteBook->SetSelection( m_page );
|
||||||
m_sdbSizerStdButtonsOK->SetDefault();
|
m_sdbSizerStdButtonsOK->SetDefault();
|
||||||
|
|
||||||
|
@ -116,7 +117,7 @@ void DIALOG_MODULE_BOARD_EDITOR::InitBoardProperties()
|
||||||
m_LayerCtrl->SetSelection(
|
m_LayerCtrl->SetSelection(
|
||||||
(m_CurrentModule->GetLayer() == B_Cu) ? 1 : 0 );
|
(m_CurrentModule->GetLayer() == B_Cu) ? 1 : 0 );
|
||||||
|
|
||||||
bool select = false;
|
bool custom_orientation = false;
|
||||||
switch( int( m_CurrentModule->GetOrientation() ) )
|
switch( int( m_CurrentModule->GetOrientation() ) )
|
||||||
{
|
{
|
||||||
case 0:
|
case 0:
|
||||||
|
@ -140,14 +141,14 @@ void DIALOG_MODULE_BOARD_EDITOR::InitBoardProperties()
|
||||||
|
|
||||||
default:
|
default:
|
||||||
m_OrientCtrl->SetSelection( 4 );
|
m_OrientCtrl->SetSelection( 4 );
|
||||||
select = true;
|
custom_orientation = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
wxString msg;
|
m_OrientValueCtrl->Enable( custom_orientation );
|
||||||
msg << m_CurrentModule->GetOrientation();
|
m_OrientValue = m_CurrentModule->GetOrientation() / 10.0;
|
||||||
m_OrientValue->SetValue( msg );
|
m_OrientValidator.SetWindow( m_OrientValueCtrl );
|
||||||
m_OrientValue->Enable( select );
|
m_OrientValidator.TransferToWindow();
|
||||||
|
|
||||||
// Initialize dialog relative to masks clearances
|
// Initialize dialog relative to masks clearances
|
||||||
m_NetClearanceUnits->SetLabel( GetAbbreviatedUnitsLabel( g_UserUnit ) );
|
m_NetClearanceUnits->SetLabel( GetAbbreviatedUnitsLabel( g_UserUnit ) );
|
||||||
|
@ -167,6 +168,7 @@ void DIALOG_MODULE_BOARD_EDITOR::InitBoardProperties()
|
||||||
|
|
||||||
// Add solder paste margin ration in per cent
|
// Add solder paste margin ration in per cent
|
||||||
// for the usual default value 0.0, display -0.0 (or -0,0 in some countries)
|
// for the usual default value 0.0, display -0.0 (or -0,0 in some countries)
|
||||||
|
wxString msg;
|
||||||
msg.Printf( wxT( "%f" ),
|
msg.Printf( wxT( "%f" ),
|
||||||
m_CurrentModule->GetLocalSolderPasteMarginRatio() * 100.0 );
|
m_CurrentModule->GetLocalSolderPasteMarginRatio() * 100.0 );
|
||||||
|
|
||||||
|
@ -198,12 +200,6 @@ void DIALOG_MODULE_BOARD_EDITOR::InitBoardProperties()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void DIALOG_MODULE_BOARD_EDITOR::OnCancelClick( wxCommandEvent& event )
|
|
||||||
{
|
|
||||||
EndModal( PRM_EDITOR_ABORT );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void DIALOG_MODULE_BOARD_EDITOR::GotoModuleEditor( wxCommandEvent& event )
|
void DIALOG_MODULE_BOARD_EDITOR::GotoModuleEditor( wxCommandEvent& event )
|
||||||
{
|
{
|
||||||
if( m_CurrentModule->GetTimeStamp() == 0 ) // Module Editor needs a non null timestamp
|
if( m_CurrentModule->GetTimeStamp() == 0 ) // Module Editor needs a non null timestamp
|
||||||
|
@ -224,32 +220,34 @@ void DIALOG_MODULE_BOARD_EDITOR::ExchangeModule( wxCommandEvent& event )
|
||||||
|
|
||||||
void DIALOG_MODULE_BOARD_EDITOR::ModuleOrientEvent( wxCommandEvent& event )
|
void DIALOG_MODULE_BOARD_EDITOR::ModuleOrientEvent( wxCommandEvent& event )
|
||||||
{
|
{
|
||||||
|
bool custom_orientation = false;
|
||||||
|
|
||||||
switch( m_OrientCtrl->GetSelection() )
|
switch( m_OrientCtrl->GetSelection() )
|
||||||
{
|
{
|
||||||
case 0:
|
case 0:
|
||||||
m_OrientValue->Enable( false );
|
m_OrientValue = 0.0;
|
||||||
m_OrientValue->SetValue( wxT( "0" ) );
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 1:
|
case 1:
|
||||||
m_OrientValue->Enable( false );
|
m_OrientValue = 90.0;
|
||||||
m_OrientValue->SetValue( wxT( "900" ) );
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 2:
|
case 2:
|
||||||
m_OrientValue->Enable( false );
|
m_OrientValue = 270.0;
|
||||||
m_OrientValue->SetValue( wxT( "2700" ) );
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 3:
|
case 3:
|
||||||
m_OrientValue->Enable( false );
|
m_OrientValue = 180.0;
|
||||||
m_OrientValue->SetValue( wxT( "1800" ) );
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
m_OrientValue->Enable( true );
|
custom_orientation = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
m_OrientValidator.SetWindow( m_OrientValueCtrl );
|
||||||
|
m_OrientValidator.TransferToWindow();
|
||||||
|
m_OrientValueCtrl->Enable( custom_orientation );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -620,11 +618,36 @@ void DIALOG_MODULE_BOARD_EDITOR::BrowseAndAdd3DShapeFile()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void DIALOG_MODULE_BOARD_EDITOR::OnOkClick( wxCommandEvent& event )
|
bool DIALOG_MODULE_BOARD_EDITOR::TransferDataToWindow()
|
||||||
|
{
|
||||||
|
if( !wxDialog::TransferDataToWindow() )
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if( !m_PanelProperties->TransferDataToWindow() )
|
||||||
|
return false;
|
||||||
|
if( !m_Panel3D->TransferDataToWindow() )
|
||||||
|
return false;
|
||||||
|
|
||||||
|
InitModeditProperties();
|
||||||
|
InitBoardProperties();
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
bool DIALOG_MODULE_BOARD_EDITOR::TransferDataFromWindow()
|
||||||
{
|
{
|
||||||
wxPoint modpos;
|
wxPoint modpos;
|
||||||
wxString msg;
|
wxString msg;
|
||||||
|
|
||||||
|
if( !Validate() || !DIALOG_MODULE_BOARD_EDITOR_BASE::TransferDataFromWindow() )
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if( !m_PanelProperties->TransferDataFromWindow() )
|
||||||
|
return false;
|
||||||
|
if( !m_Panel3D->TransferDataFromWindow() )
|
||||||
|
return false;
|
||||||
|
|
||||||
if( m_CurrentModule->GetFlags() == 0 ) // this is a simple edition, we
|
if( m_CurrentModule->GetFlags() == 0 ) // this is a simple edition, we
|
||||||
// must create an undo entry
|
// must create an undo entry
|
||||||
m_Parent->SaveCopyInUndoList( m_CurrentModule, UR_CHANGED );
|
m_Parent->SaveCopyInUndoList( m_CurrentModule, UR_CHANGED );
|
||||||
|
@ -707,9 +730,7 @@ void DIALOG_MODULE_BOARD_EDITOR::OnOkClick( wxCommandEvent& event )
|
||||||
* because rotation changes fields positions on board according to the new orientation
|
* because rotation changes fields positions on board according to the new orientation
|
||||||
* (relative positions are not modified)
|
* (relative positions are not modified)
|
||||||
*/
|
*/
|
||||||
long orient = 0;
|
int orient = KiROUND( m_OrientValue * 10.0 );
|
||||||
msg = m_OrientValue->GetValue();
|
|
||||||
msg.ToLong( &orient );
|
|
||||||
|
|
||||||
if( m_CurrentModule->GetOrientation() != orient )
|
if( m_CurrentModule->GetOrientation() != orient )
|
||||||
m_CurrentModule->Rotate( m_CurrentModule->GetPosition(),
|
m_CurrentModule->Rotate( m_CurrentModule->GetPosition(),
|
||||||
|
@ -775,13 +796,15 @@ void DIALOG_MODULE_BOARD_EDITOR::OnOkClick( wxCommandEvent& event )
|
||||||
|
|
||||||
m_Parent->OnModify();
|
m_Parent->OnModify();
|
||||||
|
|
||||||
EndModal( PRM_EDITOR_EDIT_OK );
|
SetReturnCode( PRM_EDITOR_EDIT_OK );
|
||||||
|
|
||||||
if( m_DC )
|
if( m_DC )
|
||||||
{
|
{
|
||||||
m_CurrentModule->Draw( m_Parent->GetCanvas(), m_DC, GR_OR );
|
m_CurrentModule->Draw( m_Parent->GetCanvas(), m_DC, GR_OR );
|
||||||
m_Parent->GetCanvas()->CrossHairOn( m_DC );
|
m_Parent->GetCanvas()->CrossHairOn( m_DC );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* This program source code file is part of KiCad, a free EDA CAD application.
|
* This program source code file is part of KiCad, a free EDA CAD application.
|
||||||
*
|
*
|
||||||
* Copyright (C) 2010-2015 Jean-Pierre Charras, jean-pierre.charras at wanadoo.fr
|
* Copyright (C) 2010-2015 Jean-Pierre Charras, jean-pierre.charras at wanadoo.fr
|
||||||
* Copyright (C) 1992-2015 KiCad Developers, see AUTHORS.txt for contributors.
|
* Copyright (C) 1992-2016 KiCad Developers, see AUTHORS.txt for contributors.
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or
|
* This program is free software; you can redistribute it and/or
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
|
@ -29,6 +29,7 @@
|
||||||
|
|
||||||
#include <dialog_edit_module_for_BoardEditor_base.h>
|
#include <dialog_edit_module_for_BoardEditor_base.h>
|
||||||
#include <3d_struct.h>
|
#include <3d_struct.h>
|
||||||
|
#include <wx/valnum.h>
|
||||||
|
|
||||||
class PANEL_PREV_3D;
|
class PANEL_PREV_3D;
|
||||||
|
|
||||||
|
@ -45,6 +46,9 @@ private:
|
||||||
static size_t m_page; // remember the last open page during session
|
static size_t m_page; // remember the last open page during session
|
||||||
PANEL_PREV_3D* m_PreviewPane;
|
PANEL_PREV_3D* m_PreviewPane;
|
||||||
|
|
||||||
|
wxFloatingPointValidator<double> m_OrientValidator;
|
||||||
|
double m_OrientValue;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
// The dialog can be closed for several reasons.
|
// The dialog can be closed for several reasons.
|
||||||
// they are listed here:
|
// they are listed here:
|
||||||
|
@ -83,12 +87,13 @@ private:
|
||||||
{
|
{
|
||||||
BrowseAndAdd3DShapeFile();
|
BrowseAndAdd3DShapeFile();
|
||||||
}
|
}
|
||||||
void OnCancelClick( wxCommandEvent& event );
|
|
||||||
void OnOkClick( wxCommandEvent& event );
|
|
||||||
void GotoModuleEditor( wxCommandEvent& event );
|
void GotoModuleEditor( wxCommandEvent& event );
|
||||||
void ExchangeModule( wxCommandEvent& event );
|
void ExchangeModule( wxCommandEvent& event );
|
||||||
void ModuleOrientEvent( wxCommandEvent& event );
|
void ModuleOrientEvent( wxCommandEvent& event );
|
||||||
void Cfg3DPath( wxCommandEvent& event );
|
void Cfg3DPath( wxCommandEvent& event );
|
||||||
|
|
||||||
|
bool TransferDataToWindow();
|
||||||
|
bool TransferDataFromWindow();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
// C++ code generated with wxFormBuilder (version Mar 2 2016)
|
// C++ code generated with wxFormBuilder (version Apr 9 2016)
|
||||||
// http://www.wxformbuilder.org/
|
// http://www.wxformbuilder.org/
|
||||||
//
|
//
|
||||||
// PLEASE DO "NOT" EDIT THIS FILE!
|
// PLEASE DO "NOT" EDIT THIS FILE!
|
||||||
|
@ -31,7 +31,6 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare
|
||||||
bSizerRef = new wxBoxSizer( wxHORIZONTAL );
|
bSizerRef = new wxBoxSizer( wxHORIZONTAL );
|
||||||
|
|
||||||
m_ReferenceCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
|
m_ReferenceCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
|
||||||
m_ReferenceCtrl->SetMaxLength( 0 );
|
|
||||||
bSizerRef->Add( m_ReferenceCtrl, 1, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
|
bSizerRef->Add( m_ReferenceCtrl, 1, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
|
||||||
|
|
||||||
m_button4 = new wxButton( m_PanelProperties, wxID_ANY, _("Edit"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
|
m_button4 = new wxButton( m_PanelProperties, wxID_ANY, _("Edit"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
|
||||||
|
@ -48,7 +47,6 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare
|
||||||
bSizerVal = new wxBoxSizer( wxHORIZONTAL );
|
bSizerVal = new wxBoxSizer( wxHORIZONTAL );
|
||||||
|
|
||||||
m_ValueCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
|
m_ValueCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
|
||||||
m_ValueCtrl->SetMaxLength( 0 );
|
|
||||||
bSizerVal->Add( m_ValueCtrl, 1, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
|
bSizerVal->Add( m_ValueCtrl, 1, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
|
||||||
|
|
||||||
m_button5 = new wxButton( m_PanelProperties, wxID_ANY, _("Edit"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
|
m_button5 = new wxButton( m_PanelProperties, wxID_ANY, _("Edit"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
|
||||||
|
@ -69,13 +67,12 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare
|
||||||
m_OrientCtrl->SetSelection( 0 );
|
m_OrientCtrl->SetSelection( 0 );
|
||||||
bSizerLeft->Add( m_OrientCtrl, 0, wxEXPAND|wxALL, 5 );
|
bSizerLeft->Add( m_OrientCtrl, 0, wxEXPAND|wxALL, 5 );
|
||||||
|
|
||||||
m_staticTextRotation = new wxStaticText( m_PanelProperties, wxID_ANY, _("Rotation (in 0.1 degrees):"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_staticTextRotation = new wxStaticText( m_PanelProperties, wxID_ANY, _("Rotation (-360 to 360):"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_staticTextRotation->Wrap( -1 );
|
m_staticTextRotation->Wrap( -1 );
|
||||||
bSizerLeft->Add( m_staticTextRotation, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
|
bSizerLeft->Add( m_staticTextRotation, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
|
||||||
|
|
||||||
m_OrientValue = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
m_OrientValueCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_OrientValue->SetMaxLength( 0 );
|
bSizerLeft->Add( m_OrientValueCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
|
||||||
bSizerLeft->Add( m_OrientValue, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
|
|
||||||
|
|
||||||
m_staticTextPos = new wxStaticText( m_PanelProperties, wxID_ANY, _("Position"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_staticTextPos = new wxStaticText( m_PanelProperties, wxID_ANY, _("Position"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_staticTextPos->Wrap( -1 );
|
m_staticTextPos->Wrap( -1 );
|
||||||
|
@ -92,7 +89,6 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare
|
||||||
fgSizerPos->Add( m_XPosLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
|
fgSizerPos->Add( m_XPosLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
|
||||||
|
|
||||||
m_ModPositionX = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
m_ModPositionX = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_ModPositionX->SetMaxLength( 0 );
|
|
||||||
fgSizerPos->Add( m_ModPositionX, 1, wxEXPAND|wxRIGHT, 5 );
|
fgSizerPos->Add( m_ModPositionX, 1, wxEXPAND|wxRIGHT, 5 );
|
||||||
|
|
||||||
m_XPosUnit = new wxStaticText( m_PanelProperties, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_XPosUnit = new wxStaticText( m_PanelProperties, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
@ -104,7 +100,6 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare
|
||||||
fgSizerPos->Add( m_YPosLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
|
fgSizerPos->Add( m_YPosLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
|
||||||
|
|
||||||
m_ModPositionY = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
m_ModPositionY = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_ModPositionY->SetMaxLength( 0 );
|
|
||||||
fgSizerPos->Add( m_ModPositionY, 1, wxEXPAND|wxRIGHT, 5 );
|
fgSizerPos->Add( m_ModPositionY, 1, wxEXPAND|wxRIGHT, 5 );
|
||||||
|
|
||||||
m_YPosUnit = new wxStaticText( m_PanelProperties, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_YPosUnit = new wxStaticText( m_PanelProperties, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
@ -228,7 +223,6 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare
|
||||||
fgSizerClearances->Add( m_staticTextNetClearance, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
|
fgSizerClearances->Add( m_staticTextNetClearance, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
|
||||||
|
|
||||||
m_NetClearanceValueCtrl = new wxTextCtrl( sbSizerLocalProperties->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
m_NetClearanceValueCtrl = new wxTextCtrl( sbSizerLocalProperties->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_NetClearanceValueCtrl->SetMaxLength( 0 );
|
|
||||||
fgSizerClearances->Add( m_NetClearanceValueCtrl, 1, wxALL|wxEXPAND, 5 );
|
fgSizerClearances->Add( m_NetClearanceValueCtrl, 1, wxALL|wxEXPAND, 5 );
|
||||||
|
|
||||||
m_NetClearanceUnits = new wxStaticText( sbSizerLocalProperties->GetStaticBox(), wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_NetClearanceUnits = new wxStaticText( sbSizerLocalProperties->GetStaticBox(), wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
@ -251,7 +245,6 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare
|
||||||
fgSizerClearances->Add( m_MaskClearanceTitle, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
|
fgSizerClearances->Add( m_MaskClearanceTitle, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
|
||||||
|
|
||||||
m_SolderMaskMarginCtrl = new wxTextCtrl( sbSizerLocalProperties->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
m_SolderMaskMarginCtrl = new wxTextCtrl( sbSizerLocalProperties->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_SolderMaskMarginCtrl->SetMaxLength( 0 );
|
|
||||||
fgSizerClearances->Add( m_SolderMaskMarginCtrl, 1, wxALL|wxEXPAND, 5 );
|
fgSizerClearances->Add( m_SolderMaskMarginCtrl, 1, wxALL|wxEXPAND, 5 );
|
||||||
|
|
||||||
m_SolderMaskMarginUnits = new wxStaticText( sbSizerLocalProperties->GetStaticBox(), wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_SolderMaskMarginUnits = new wxStaticText( sbSizerLocalProperties->GetStaticBox(), wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
@ -265,7 +258,6 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare
|
||||||
fgSizerClearances->Add( m_staticTextSolderPaste, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
|
fgSizerClearances->Add( m_staticTextSolderPaste, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
|
||||||
|
|
||||||
m_SolderPasteMarginCtrl = new wxTextCtrl( sbSizerLocalProperties->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
m_SolderPasteMarginCtrl = new wxTextCtrl( sbSizerLocalProperties->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_SolderPasteMarginCtrl->SetMaxLength( 0 );
|
|
||||||
fgSizerClearances->Add( m_SolderPasteMarginCtrl, 1, wxEXPAND|wxLEFT|wxRIGHT, 5 );
|
fgSizerClearances->Add( m_SolderPasteMarginCtrl, 1, wxEXPAND|wxLEFT|wxRIGHT, 5 );
|
||||||
|
|
||||||
m_SolderPasteMarginUnits = new wxStaticText( sbSizerLocalProperties->GetStaticBox(), wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_SolderPasteMarginUnits = new wxStaticText( sbSizerLocalProperties->GetStaticBox(), wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
@ -279,7 +271,6 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare
|
||||||
fgSizerClearances->Add( m_staticTextRatio, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
|
fgSizerClearances->Add( m_staticTextRatio, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
|
||||||
|
|
||||||
m_SolderPasteMarginRatioCtrl = new wxTextCtrl( sbSizerLocalProperties->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
m_SolderPasteMarginRatioCtrl = new wxTextCtrl( sbSizerLocalProperties->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_SolderPasteMarginRatioCtrl->SetMaxLength( 0 );
|
|
||||||
fgSizerClearances->Add( m_SolderPasteMarginRatioCtrl, 1, wxALL|wxEXPAND, 5 );
|
fgSizerClearances->Add( m_SolderPasteMarginRatioCtrl, 1, wxALL|wxEXPAND, 5 );
|
||||||
|
|
||||||
m_SolderPasteRatioMarginUnits = new wxStaticText( sbSizerLocalProperties->GetStaticBox(), wxID_ANY, _("%"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_SolderPasteRatioMarginUnits = new wxStaticText( sbSizerLocalProperties->GetStaticBox(), wxID_ANY, _("%"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
@ -299,7 +290,7 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare
|
||||||
m_PanelProperties->SetSizer( m_PanelPropertiesBoxSizer );
|
m_PanelProperties->SetSizer( m_PanelPropertiesBoxSizer );
|
||||||
m_PanelProperties->Layout();
|
m_PanelProperties->Layout();
|
||||||
m_PanelPropertiesBoxSizer->Fit( m_PanelProperties );
|
m_PanelPropertiesBoxSizer->Fit( m_PanelProperties );
|
||||||
m_NoteBook->AddPage( m_PanelProperties, _("Properties"), false );
|
m_NoteBook->AddPage( m_PanelProperties, _("Properties"), true );
|
||||||
m_Panel3D = new wxPanel( m_NoteBook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
|
m_Panel3D = new wxPanel( m_NoteBook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
|
||||||
bSizerMain3D = new wxBoxSizer( wxVERTICAL );
|
bSizerMain3D = new wxBoxSizer( wxVERTICAL );
|
||||||
|
|
||||||
|
@ -354,7 +345,7 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare
|
||||||
m_Panel3D->SetSizer( bSizerMain3D );
|
m_Panel3D->SetSizer( bSizerMain3D );
|
||||||
m_Panel3D->Layout();
|
m_Panel3D->Layout();
|
||||||
bSizerMain3D->Fit( m_Panel3D );
|
bSizerMain3D->Fit( m_Panel3D );
|
||||||
m_NoteBook->AddPage( m_Panel3D, _("3D Settings"), true );
|
m_NoteBook->AddPage( m_Panel3D, _("3D Settings"), false );
|
||||||
|
|
||||||
m_GeneralBoxSizer->Add( m_NoteBook, 1, wxEXPAND | wxALL, 5 );
|
m_GeneralBoxSizer->Add( m_NoteBook, 1, wxEXPAND | wxALL, 5 );
|
||||||
|
|
||||||
|
@ -384,8 +375,6 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare
|
||||||
m_buttonRemove->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::Remove3DShape ), NULL, this );
|
m_buttonRemove->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::Remove3DShape ), NULL, this );
|
||||||
m_buttonEdit->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::Edit3DShapeFilename ), NULL, this );
|
m_buttonEdit->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::Edit3DShapeFilename ), NULL, this );
|
||||||
m_button8->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::Cfg3DPath ), NULL, this );
|
m_button8->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::Cfg3DPath ), NULL, this );
|
||||||
m_sdbSizerStdButtonsCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::OnCancelClick ), NULL, this );
|
|
||||||
m_sdbSizerStdButtonsOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::OnOkClick ), NULL, this );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
DIALOG_MODULE_BOARD_EDITOR_BASE::~DIALOG_MODULE_BOARD_EDITOR_BASE()
|
DIALOG_MODULE_BOARD_EDITOR_BASE::~DIALOG_MODULE_BOARD_EDITOR_BASE()
|
||||||
|
@ -402,7 +391,5 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::~DIALOG_MODULE_BOARD_EDITOR_BASE()
|
||||||
m_buttonRemove->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::Remove3DShape ), NULL, this );
|
m_buttonRemove->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::Remove3DShape ), NULL, this );
|
||||||
m_buttonEdit->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::Edit3DShapeFilename ), NULL, this );
|
m_buttonEdit->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::Edit3DShapeFilename ), NULL, this );
|
||||||
m_button8->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::Cfg3DPath ), NULL, this );
|
m_button8->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::Cfg3DPath ), NULL, this );
|
||||||
m_sdbSizerStdButtonsCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::OnCancelClick ), NULL, this );
|
|
||||||
m_sdbSizerStdButtonsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::OnOkClick ), NULL, this );
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -178,7 +178,7 @@
|
||||||
<object class="notebookpage" expanded="0">
|
<object class="notebookpage" expanded="0">
|
||||||
<property name="bitmap"></property>
|
<property name="bitmap"></property>
|
||||||
<property name="label">Properties</property>
|
<property name="label">Properties</property>
|
||||||
<property name="select">0</property>
|
<property name="select">1</property>
|
||||||
<object class="wxPanel" expanded="0">
|
<object class="wxPanel" expanded="0">
|
||||||
<property name="BottomDockable">1</property>
|
<property name="BottomDockable">1</property>
|
||||||
<property name="LeftDockable">1</property>
|
<property name="LeftDockable">1</property>
|
||||||
|
@ -1025,7 +1025,7 @@
|
||||||
<property name="gripper">0</property>
|
<property name="gripper">0</property>
|
||||||
<property name="hidden">0</property>
|
<property name="hidden">0</property>
|
||||||
<property name="id">wxID_ANY</property>
|
<property name="id">wxID_ANY</property>
|
||||||
<property name="label">Rotation (in 0.1 degrees):</property>
|
<property name="label">Rotation (-360 to 360):</property>
|
||||||
<property name="max_size"></property>
|
<property name="max_size"></property>
|
||||||
<property name="maximize_button">0</property>
|
<property name="maximize_button">0</property>
|
||||||
<property name="maximum_size"></property>
|
<property name="maximum_size"></property>
|
||||||
|
@ -1116,7 +1116,7 @@
|
||||||
<property name="minimize_button">0</property>
|
<property name="minimize_button">0</property>
|
||||||
<property name="minimum_size"></property>
|
<property name="minimum_size"></property>
|
||||||
<property name="moveable">1</property>
|
<property name="moveable">1</property>
|
||||||
<property name="name">m_OrientValue</property>
|
<property name="name">m_OrientValueCtrl</property>
|
||||||
<property name="pane_border">1</property>
|
<property name="pane_border">1</property>
|
||||||
<property name="pane_position"></property>
|
<property name="pane_position"></property>
|
||||||
<property name="pane_size"></property>
|
<property name="pane_size"></property>
|
||||||
|
@ -1900,7 +1900,7 @@
|
||||||
<property name="max_size"></property>
|
<property name="max_size"></property>
|
||||||
<property name="maximize_button">0</property>
|
<property name="maximize_button">0</property>
|
||||||
<property name="maximum_size"></property>
|
<property name="maximum_size"></property>
|
||||||
<property name="maxlength"></property>
|
<property name="maxlength">0</property>
|
||||||
<property name="min_size"></property>
|
<property name="min_size"></property>
|
||||||
<property name="minimize_button">0</property>
|
<property name="minimize_button">0</property>
|
||||||
<property name="minimum_size"></property>
|
<property name="minimum_size"></property>
|
||||||
|
@ -2344,6 +2344,7 @@
|
||||||
<property name="minimum_size"></property>
|
<property name="minimum_size"></property>
|
||||||
<property name="name">sbSizerAP</property>
|
<property name="name">sbSizerAP</property>
|
||||||
<property name="orient">wxHORIZONTAL</property>
|
<property name="orient">wxHORIZONTAL</property>
|
||||||
|
<property name="parent">1</property>
|
||||||
<property name="permission">none</property>
|
<property name="permission">none</property>
|
||||||
<event name="OnUpdateUI"></event>
|
<event name="OnUpdateUI"></event>
|
||||||
<object class="sizeritem" expanded="0">
|
<object class="sizeritem" expanded="0">
|
||||||
|
@ -2762,6 +2763,7 @@
|
||||||
<property name="minimum_size"></property>
|
<property name="minimum_size"></property>
|
||||||
<property name="name">sbSizerLocalProperties</property>
|
<property name="name">sbSizerLocalProperties</property>
|
||||||
<property name="orient">wxVERTICAL</property>
|
<property name="orient">wxVERTICAL</property>
|
||||||
|
<property name="parent">1</property>
|
||||||
<property name="permission">none</property>
|
<property name="permission">none</property>
|
||||||
<event name="OnUpdateUI"></event>
|
<event name="OnUpdateUI"></event>
|
||||||
<object class="sizeritem" expanded="0">
|
<object class="sizeritem" expanded="0">
|
||||||
|
@ -4339,7 +4341,7 @@
|
||||||
<object class="notebookpage" expanded="1">
|
<object class="notebookpage" expanded="1">
|
||||||
<property name="bitmap"></property>
|
<property name="bitmap"></property>
|
||||||
<property name="label">3D Settings</property>
|
<property name="label">3D Settings</property>
|
||||||
<property name="select">1</property>
|
<property name="select">0</property>
|
||||||
<object class="wxPanel" expanded="1">
|
<object class="wxPanel" expanded="1">
|
||||||
<property name="BottomDockable">1</property>
|
<property name="BottomDockable">1</property>
|
||||||
<property name="LeftDockable">1</property>
|
<property name="LeftDockable">1</property>
|
||||||
|
@ -4429,6 +4431,7 @@
|
||||||
<property name="minimum_size"></property>
|
<property name="minimum_size"></property>
|
||||||
<property name="name">sbSizer3</property>
|
<property name="name">sbSizer3</property>
|
||||||
<property name="orient">wxHORIZONTAL</property>
|
<property name="orient">wxHORIZONTAL</property>
|
||||||
|
<property name="parent">1</property>
|
||||||
<property name="permission">none</property>
|
<property name="permission">none</property>
|
||||||
<event name="OnUpdateUI"></event>
|
<event name="OnUpdateUI"></event>
|
||||||
<object class="sizeritem" expanded="1">
|
<object class="sizeritem" expanded="1">
|
||||||
|
@ -4939,11 +4942,11 @@
|
||||||
<property name="name">m_sdbSizerStdButtons</property>
|
<property name="name">m_sdbSizerStdButtons</property>
|
||||||
<property name="permission">protected</property>
|
<property name="permission">protected</property>
|
||||||
<event name="OnApplyButtonClick"></event>
|
<event name="OnApplyButtonClick"></event>
|
||||||
<event name="OnCancelButtonClick">OnCancelClick</event>
|
<event name="OnCancelButtonClick"></event>
|
||||||
<event name="OnContextHelpButtonClick"></event>
|
<event name="OnContextHelpButtonClick"></event>
|
||||||
<event name="OnHelpButtonClick"></event>
|
<event name="OnHelpButtonClick"></event>
|
||||||
<event name="OnNoButtonClick"></event>
|
<event name="OnNoButtonClick"></event>
|
||||||
<event name="OnOKButtonClick">OnOkClick</event>
|
<event name="OnOKButtonClick"></event>
|
||||||
<event name="OnSaveButtonClick"></event>
|
<event name="OnSaveButtonClick"></event>
|
||||||
<event name="OnYesButtonClick"></event>
|
<event name="OnYesButtonClick"></event>
|
||||||
</object>
|
</object>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
// C++ code generated with wxFormBuilder (version Mar 2 2016)
|
// C++ code generated with wxFormBuilder (version Apr 9 2016)
|
||||||
// http://www.wxformbuilder.org/
|
// http://www.wxformbuilder.org/
|
||||||
//
|
//
|
||||||
// PLEASE DO "NOT" EDIT THIS FILE!
|
// PLEASE DO "NOT" EDIT THIS FILE!
|
||||||
|
@ -66,7 +66,7 @@ class DIALOG_MODULE_BOARD_EDITOR_BASE : public DIALOG_SHIM
|
||||||
wxRadioBox* m_LayerCtrl;
|
wxRadioBox* m_LayerCtrl;
|
||||||
wxRadioBox* m_OrientCtrl;
|
wxRadioBox* m_OrientCtrl;
|
||||||
wxStaticText* m_staticTextRotation;
|
wxStaticText* m_staticTextRotation;
|
||||||
wxTextCtrl* m_OrientValue;
|
wxTextCtrl* m_OrientValueCtrl;
|
||||||
wxStaticText* m_staticTextPos;
|
wxStaticText* m_staticTextPos;
|
||||||
wxStaticText* m_XPosLabel;
|
wxStaticText* m_XPosLabel;
|
||||||
wxTextCtrl* m_ModPositionX;
|
wxTextCtrl* m_ModPositionX;
|
||||||
|
@ -125,8 +125,6 @@ class DIALOG_MODULE_BOARD_EDITOR_BASE : public DIALOG_SHIM
|
||||||
virtual void Add3DShape( wxCommandEvent& event ) { event.Skip(); }
|
virtual void Add3DShape( wxCommandEvent& event ) { event.Skip(); }
|
||||||
virtual void Remove3DShape( wxCommandEvent& event ) { event.Skip(); }
|
virtual void Remove3DShape( wxCommandEvent& event ) { event.Skip(); }
|
||||||
virtual void Cfg3DPath( wxCommandEvent& event ) { event.Skip(); }
|
virtual void Cfg3DPath( wxCommandEvent& event ) { event.Skip(); }
|
||||||
virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); }
|
|
||||||
virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); }
|
|
||||||
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
Loading…
Reference in New Issue