Skip to content

K
kicad-source-mirror
Commit 0409bc8d authored by jean-pierre charras's avatar jean-pierre charras
Browse files
Options

Fix very minor issues and code cleaning

parent 153b1bd0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 197 additions and 264 deletions
eeschema/dialogs/dialog_lib_edit_pin.cpp
View file @ 0409bc8d
...@@ -125,6 +125,7 @@ void DIALOG_LIB_EDIT_PIN::OnPropertiesChange( wxCommandEvent& event ) ...@@ -125,6 +125,7 @@ void DIALOG_LIB_EDIT_PIN::OnPropertiesChange( wxCommandEvent& event )
int pinOrient = LIB_PIN::GetOrientationCode( GetOrientation() ); int pinOrient = LIB_PIN::GetOrientationCode( GetOrientation() );
int pinLength = ReturnValueFromString( g_UserUnit, GetLength(), units ); int pinLength = ReturnValueFromString( g_UserUnit, GetLength(), units );
int pinShape = LIB_PIN::GetStyleCode( GetStyle() ); int pinShape = LIB_PIN::GetStyleCode( GetStyle() );
int pinType = GetElectricalType();
m_dummyPin->SetName( GetName() ); m_dummyPin->SetName( GetName() );
m_dummyPin->SetNameTextSize( pinNameSize ); m_dummyPin->SetNameTextSize( pinNameSize );
...@@ -134,6 +135,7 @@ void DIALOG_LIB_EDIT_PIN::OnPropertiesChange( wxCommandEvent& event ) ...@@ -134,6 +135,7 @@ void DIALOG_LIB_EDIT_PIN::OnPropertiesChange( wxCommandEvent& event )
m_dummyPin->SetLength( pinLength ); m_dummyPin->SetLength( pinLength );
m_dummyPin->SetShape( pinShape ); m_dummyPin->SetShape( pinShape );
m_dummyPin->SetVisible( GetVisible() ); m_dummyPin->SetVisible( GetVisible() );
m_dummyPin->SetType( pinType );
m_panelShowPin->Refresh(); m_panelShowPin->Refresh();
} }
......
pcbnew/dialogs/dialog_edit_module_text.cpp
View file @ 0409bc8d
...@@ -30,17 +30,17 @@ extern wxPoint MoveVector; // Move vector for move edge, imported from edtxtmod ...@@ -30,17 +30,17 @@ extern wxPoint MoveVector; // Move vector for move edge, imported from edtxtmod
class DialogEditModuleText : public DialogEditModuleText_base class DialogEditModuleText : public DialogEditModuleText_base
{ {
private: private:
PCB_BASE_FRAME* m_Parent; PCB_BASE_FRAME* m_parent;
wxDC* m_DC; wxDC* m_dc;
MODULE* m_Module; MODULE* m_module;
TEXTE_MODULE* m_CurrentTextMod; TEXTE_MODULE* m_currentText;
public: public:
DialogEditModuleText( PCB_BASE_FRAME* parent, TEXTE_MODULE* TextMod, wxDC* DC ); DialogEditModuleText( PCB_BASE_FRAME* aParent, TEXTE_MODULE* aTextMod, wxDC* aDC );
~DialogEditModuleText() {}; ~DialogEditModuleText() {};
private: private:
void Init( ); void initDlg( );
void OnOkClick( wxCommandEvent& event ); void OnOkClick( wxCommandEvent& event );
void OnCancelClick( wxCommandEvent& event ); void OnCancelClick( wxCommandEvent& event );
}; };
...@@ -56,24 +56,26 @@ void PCB_BASE_FRAME::InstallTextModOptionsFrame( TEXTE_MODULE* TextMod, wxDC* DC ...@@ -56,24 +56,26 @@ void PCB_BASE_FRAME::InstallTextModOptionsFrame( TEXTE_MODULE* TextMod, wxDC* DC
} }
DialogEditModuleText::DialogEditModuleText( PCB_BASE_FRAME* parent, DialogEditModuleText::DialogEditModuleText( PCB_BASE_FRAME* aParent,
TEXTE_MODULE* TextMod, wxDC* DC ) : TEXTE_MODULE* aTextMod, wxDC* aDC ) :
DialogEditModuleText_base(parent) DialogEditModuleText_base( aParent )
{ {
m_Parent = parent; m_parent = aParent;
m_DC = DC; m_dc = aDC;
m_Module = NULL; m_module = NULL;
m_CurrentTextMod = TextMod; m_currentText = aTextMod;
if( m_CurrentTextMod ) if( m_currentText )
m_Module = (MODULE*) m_CurrentTextMod->GetParent(); m_module = (MODULE*) m_currentText->GetParent();
Init( ); initDlg( );
m_buttonOK->SetDefault(); m_buttonOK->SetDefault();
GetSizer()->Fit( this ); GetSizer()->Fit( this );
GetSizer()->SetSizeHints( this ); GetSizer()->SetSizeHints( this );
Centre();
} }
...@@ -84,20 +86,20 @@ void DialogEditModuleText::OnCancelClick( wxCommandEvent& event ) ...@@ -84,20 +86,20 @@ void DialogEditModuleText::OnCancelClick( wxCommandEvent& event )
/********************************************************/ /********************************************************/
void DialogEditModuleText::Init( ) void DialogEditModuleText::initDlg( )
/********************************************************/ /********************************************************/
{ {
SetFocus(); SetFocus();
wxString msg; wxString msg;
if( m_Module ) if( m_module )
{ {
wxString format = m_ModuleInfoText->GetLabel(); wxString format = m_ModuleInfoText->GetLabel();
msg.Printf( format, msg.Printf( format,
GetChars( m_Module->m_Reference->m_Text ), GetChars( m_module->m_Reference->m_Text ),
GetChars( m_Module->m_Value->m_Text ), GetChars( m_module->m_Value->m_Text ),
(float) m_Module->m_Orient / 10 ); (float) m_module->m_Orient / 10 );
} }
else else
...@@ -106,43 +108,43 @@ void DialogEditModuleText::Init( ) ...@@ -106,43 +108,43 @@ void DialogEditModuleText::Init( )
m_ModuleInfoText->SetLabel( msg ); m_ModuleInfoText->SetLabel( msg );
if( m_CurrentTextMod->m_Type == TEXT_is_VALUE ) if( m_currentText->m_Type == TEXT_is_VALUE )
m_TextDataTitle->SetLabel( _( "Value:" ) ); m_TextDataTitle->SetLabel( _( "Value:" ) );
else if( m_CurrentTextMod->m_Type == TEXT_is_DIVERS ) else if( m_currentText->m_Type == TEXT_is_DIVERS )
m_TextDataTitle->SetLabel( _( "Text:" ) ); m_TextDataTitle->SetLabel( _( "Text:" ) );
else if( m_CurrentTextMod->m_Type != TEXT_is_REFERENCE ) else if( m_currentText->m_Type != TEXT_is_REFERENCE )
m_TextDataTitle->SetLabel( wxT( "???" ) ); m_TextDataTitle->SetLabel( wxT( "???" ) );
m_Name->SetValue( m_CurrentTextMod->m_Text ); m_Name->SetValue( m_currentText->m_Text );
m_Style->SetSelection( m_CurrentTextMod->m_Italic ? 1 : 0 ); m_Style->SetSelection( m_currentText->m_Italic ? 1 : 0 );
AddUnitSymbol( *m_SizeXTitle ); AddUnitSymbol( *m_SizeXTitle );
PutValueInLocalUnits( *m_TxtSizeCtrlX, m_CurrentTextMod->m_Size.x, PutValueInLocalUnits( *m_TxtSizeCtrlX, m_currentText->m_Size.x,
m_Parent->m_InternalUnits ); m_parent->m_InternalUnits );
AddUnitSymbol( *m_SizeYTitle ); AddUnitSymbol( *m_SizeYTitle );
PutValueInLocalUnits( *m_TxtSizeCtrlY, m_CurrentTextMod->m_Size.y, PutValueInLocalUnits( *m_TxtSizeCtrlY, m_currentText->m_Size.y,
m_Parent->m_InternalUnits ); m_parent->m_InternalUnits );
AddUnitSymbol( *m_PosXTitle ); AddUnitSymbol( *m_PosXTitle );
PutValueInLocalUnits( *m_TxtPosCtrlX, m_CurrentTextMod->m_Pos0.x, PutValueInLocalUnits( *m_TxtPosCtrlX, m_currentText->m_Pos0.x,
m_Parent->m_InternalUnits ); m_parent->m_InternalUnits );
AddUnitSymbol( *m_PosYTitle ); AddUnitSymbol( *m_PosYTitle );
PutValueInLocalUnits( *m_TxtPosCtrlY, m_CurrentTextMod->m_Pos0.y, PutValueInLocalUnits( *m_TxtPosCtrlY, m_currentText->m_Pos0.y,
m_Parent->m_InternalUnits ); m_parent->m_InternalUnits );
AddUnitSymbol( *m_WidthTitle ); AddUnitSymbol( *m_WidthTitle );
PutValueInLocalUnits( *m_TxtWidthCtlr, m_CurrentTextMod->m_Thickness, PutValueInLocalUnits( *m_TxtWidthCtlr, m_currentText->m_Thickness,
m_Parent->m_InternalUnits ); m_parent->m_InternalUnits );
int text_orient = m_CurrentTextMod->m_Orient; int text_orient = m_currentText->m_Orient;
NORMALIZE_ANGLE_90(text_orient) NORMALIZE_ANGLE_90(text_orient)
if( (text_orient != 0) ) if( (text_orient != 0) )
m_Orient->SetSelection( 1 ); m_Orient->SetSelection( 1 );
if( m_CurrentTextMod->m_NoShow ) if( m_currentText->m_NoShow )
m_Show->SetSelection( 1 );; m_Show->SetSelection( 1 );;
} }
...@@ -154,65 +156,65 @@ void DialogEditModuleText::OnOkClick( wxCommandEvent& event ) ...@@ -154,65 +156,65 @@ void DialogEditModuleText::OnOkClick( wxCommandEvent& event )
{ {
wxString msg; wxString msg;
if ( m_Module) if ( m_module)
m_Parent->SaveCopyInUndoList( m_Module, UR_CHANGED ); m_parent->SaveCopyInUndoList( m_module, UR_CHANGED );
if( m_DC ) //Erase old text on screen if( m_dc ) //Erase old text on screen
{ {
m_CurrentTextMod->Draw( m_Parent->DrawPanel, m_DC, GR_XOR, m_currentText->Draw( m_parent->DrawPanel, m_dc, GR_XOR,
(m_CurrentTextMod->m_Flags & IS_MOVED) ? MoveVector : wxPoint( 0, 0 ) ); (m_currentText->m_Flags & IS_MOVED) ? MoveVector : wxPoint( 0, 0 ) );
} }
m_CurrentTextMod->m_Text = m_Name->GetValue(); m_currentText->m_Text = m_Name->GetValue();
m_CurrentTextMod->m_Italic = m_Style->GetSelection() == 1 ? true : false; m_currentText->m_Italic = m_Style->GetSelection() == 1 ? true : false;
msg = m_TxtPosCtrlX->GetValue(); msg = m_TxtPosCtrlX->GetValue();
m_CurrentTextMod->m_Pos0.x = ReturnValueFromString( g_UserUnit, msg, m_currentText->m_Pos0.x = ReturnValueFromString( g_UserUnit, msg,
m_Parent->m_InternalUnits ); m_parent->m_InternalUnits );
msg = m_TxtPosCtrlY->GetValue(); msg = m_TxtPosCtrlY->GetValue();
m_CurrentTextMod->m_Pos0.y = ReturnValueFromString( g_UserUnit, msg, m_currentText->m_Pos0.y = ReturnValueFromString( g_UserUnit, msg,
m_Parent->m_InternalUnits ); m_parent->m_InternalUnits );
msg = m_TxtSizeCtrlX->GetValue(); msg = m_TxtSizeCtrlX->GetValue();
m_CurrentTextMod->m_Size.x = ReturnValueFromString( g_UserUnit, msg, m_currentText->m_Size.x = ReturnValueFromString( g_UserUnit, msg,
m_Parent->m_InternalUnits ); m_parent->m_InternalUnits );
msg = m_TxtSizeCtrlY->GetValue(); msg = m_TxtSizeCtrlY->GetValue();
m_CurrentTextMod->m_Size.y = ReturnValueFromString( g_UserUnit, msg, m_currentText->m_Size.y = ReturnValueFromString( g_UserUnit, msg,
m_Parent->m_InternalUnits ); m_parent->m_InternalUnits );
// Test for a reasonnable size: // Test for a reasonnable size:
if( m_CurrentTextMod->m_Size.x< TEXTS_MIN_SIZE ) if( m_currentText->m_Size.x< TEXTS_MIN_SIZE )
m_CurrentTextMod->m_Size.x = TEXTS_MIN_SIZE; m_currentText->m_Size.x = TEXTS_MIN_SIZE;
if( m_CurrentTextMod->m_Size.y< TEXTS_MIN_SIZE ) if( m_currentText->m_Size.y< TEXTS_MIN_SIZE )
m_CurrentTextMod->m_Size.y = TEXTS_MIN_SIZE; m_currentText->m_Size.y = TEXTS_MIN_SIZE;
msg = m_TxtWidthCtlr->GetValue(); msg = m_TxtWidthCtlr->GetValue();
int width = ReturnValueFromString( g_UserUnit, msg, m_Parent->m_InternalUnits ); int width = ReturnValueFromString( g_UserUnit, msg, m_parent->m_InternalUnits );
// Test for a reasonnable width: // Test for a reasonnable width:
if( width <= 1 ) if( width <= 1 )
width = 1; width = 1;
int maxthickness = Clamp_Text_PenSize(width, m_CurrentTextMod->m_Size ); int maxthickness = Clamp_Text_PenSize(width, m_currentText->m_Size );
if( width > maxthickness ) if( width > maxthickness )
{ {
DisplayError(NULL, _("The text thickness is too large for the text size. It will be clamped")); DisplayError(NULL, _("The text thickness is too large for the text size. It will be clamped"));
width = maxthickness; width = maxthickness;
} }
m_CurrentTextMod->SetThickness( width ); m_currentText->SetThickness( width );
m_CurrentTextMod->m_NoShow = (m_Show->GetSelection() == 0) ? 0 : 1; m_currentText->m_NoShow = (m_Show->GetSelection() == 0) ? 0 : 1;
int text_orient = (m_Orient->GetSelection() == 0) ? 0 : 900; int text_orient = (m_Orient->GetSelection() == 0) ? 0 : 900;
m_CurrentTextMod->m_Orient = text_orient; m_currentText->m_Orient = text_orient;
m_CurrentTextMod->SetDrawCoord(); m_currentText->SetDrawCoord();
if( m_DC ) // Display new text if( m_dc ) // Display new text
{ {
m_CurrentTextMod->Draw( m_Parent->DrawPanel, m_DC, GR_XOR, m_currentText->Draw( m_parent->DrawPanel, m_dc, GR_XOR,
(m_CurrentTextMod->m_Flags & IS_MOVED) ? MoveVector : wxPoint( 0, 0 ) ); (m_currentText->m_Flags & IS_MOVED) ? MoveVector : wxPoint( 0, 0 ) );
} }
m_Parent->OnModify(); m_parent->OnModify();
if( m_Module ) if( m_module )
m_Module->m_LastEdit_Time = time( NULL ); m_module->m_LastEdit_Time = time( NULL );
EndModal(1); EndModal(1);
} }
pcbnew/dialogs/dialog_graphic_item_properties.cpp
View file @ 0409bc8d
...@@ -40,7 +40,7 @@ public: ...@@ -40,7 +40,7 @@ public:
~DialogGraphicItemProperties() {}; ~DialogGraphicItemProperties() {};
private: private:
void Init( ); void initDlg( );
void OnOkClick( wxCommandEvent& event ); void OnOkClick( wxCommandEvent& event );
void OnCancelClick( wxCommandEvent& event ); void OnCancelClick( wxCommandEvent& event );
void OnLayerChoice( wxCommandEvent& event ); void OnLayerChoice( wxCommandEvent& event );
...@@ -54,9 +54,10 @@ DialogGraphicItemProperties::DialogGraphicItemProperties( PCB_EDIT_FRAME* aParen ...@@ -54,9 +54,10 @@ DialogGraphicItemProperties::DialogGraphicItemProperties( PCB_EDIT_FRAME* aParen
m_DC = aDC; m_DC = aDC;
m_Item = aItem; m_Item = aItem;
m_BrdSettings = m_Parent->GetBoard()->GetBoardDesignSettings(); m_BrdSettings = m_Parent->GetBoard()->GetBoardDesignSettings();
Init(); initDlg();
Layout(); Layout();
GetSizer()->SetSizeHints( this ); GetSizer()->SetSizeHints( this );
Centre();
} }
...@@ -78,7 +79,7 @@ void PCB_EDIT_FRAME::InstallGraphicItemPropertiesDialog(DRAWSEGMENT * aItem, wxD ...@@ -78,7 +79,7 @@ void PCB_EDIT_FRAME::InstallGraphicItemPropertiesDialog(DRAWSEGMENT * aItem, wxD
} }
/**************************************************************************/ /**************************************************************************/
void DialogGraphicItemProperties::Init( ) void DialogGraphicItemProperties::initDlg( )
/**************************************************************************/ /**************************************************************************/
/* Initialize messages and values in text control, /* Initialize messages and values in text control,
* according to the item parameters values * according to the item parameters values
......
pcbnew/menubar_modedit.cpp
View file @ 0409bc8d
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment