Skip to content

K
kicad-source-mirror
Commit e9921a71 authored by dickelbeck's avatar dickelbeck
Browse files
Options

resizeable borders option

parent dac25cdb
Show whitespace changes
Inline Side-by-side
Showing with 241 additions and 220 deletions
common/common.cpp
View file @ e9921a71
...@@ -319,7 +319,7 @@ END_EVENT_TABLE() ...@@ -319,7 +319,7 @@ END_EVENT_TABLE()
/***************************************************************************/ /***************************************************************************/
WinEDA_TextFrame::WinEDA_TextFrame( wxWindow* parent, const wxString& title ) : WinEDA_TextFrame::WinEDA_TextFrame( wxWindow* parent, const wxString& title ) :
wxDialog( parent, -1, title, wxPoint( -1, -1 ), wxSize( 250, 350 ), wxDialog( parent, -1, title, wxPoint( -1, -1 ), wxSize( 250, 350 ),
wxDEFAULT_DIALOG_STYLE | wxFRAME_FLOAT_ON_PARENT ) wxDEFAULT_DIALOG_STYLE | wxFRAME_FLOAT_ON_PARENT | MAYBE_RESIZE_BORDER )
/***************************************************************************/ /***************************************************************************/
{ {
wxSize size; wxSize size;
......
pcbnew/files.cpp
View file @ e9921a71
...@@ -235,7 +235,7 @@ int WinEDA_PcbFrame::LoadOnePcbFile( const wxString& FullFileName, wxDC* DC, boo ...@@ -235,7 +235,7 @@ int WinEDA_PcbFrame::LoadOnePcbFile( const wxString& FullFileName, wxDC* DC, boo
g_SaveTime = time( NULL ); g_SaveTime = time( NULL );
#if 1 && defined(DEBUG) #if 0 && defined(DEBUG)
// note this seems to freeze up pcbnew when run under the kicad project // note this seems to freeze up pcbnew when run under the kicad project
// manager. runs fine from command prompt. // manager. runs fine from command prompt.
// output the board object tree to stdout: // output the board object tree to stdout:
......
pcbnew/pcbpiste.cpp
View file @ e9921a71
/******************************************************/ /******************************************************/
/* Fonctions diverses (swap..) relatives au pistes */ /* Fonctions diverses (swap..) relatives au pistes */
/* et fonctions de test */ /* et fonctions de test */
/******************************************************/ /******************************************************/
/* Fichier PCBPISTE.CPP */ /* Fichier PCBPISTE.CPP */
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"
...@@ -29,241 +29,264 @@ enum swap_layer_id { ...@@ -29,241 +29,264 @@ enum swap_layer_id {
/* classe pour la frame de selection de layers */ /* classe pour la frame de selection de layers */
/***********************************************/ /***********************************************/
class WinEDA_SwapLayerFrame: public wxDialog class WinEDA_SwapLayerFrame : public wxDialog
{ {
private: private:
WinEDA_BasePcbFrame *m_Parent; WinEDA_BasePcbFrame* m_Parent;
wxRadioBox * m_LayerList; wxRadioBox* m_LayerList;
public: public:
// Constructor and destructor // Constructor and destructor
WinEDA_SwapLayerFrame(WinEDA_BasePcbFrame *parent); WinEDA_SwapLayerFrame( WinEDA_BasePcbFrame * parent );
~WinEDA_SwapLayerFrame() {}; ~WinEDA_SwapLayerFrame() { };
private: private:
void Sel_Layer(wxCommandEvent& event); void Sel_Layer( wxCommandEvent& event );
void Cancel(wxCommandEvent& event); void Cancel( wxCommandEvent& event );
void Execute(wxCommandEvent& event); void Execute( wxCommandEvent& event );
DECLARE_EVENT_TABLE()
DECLARE_EVENT_TABLE()
}; };
/* Table des evenements pour WinEDA_SwapLayerFrame */ /* Table des evenements pour WinEDA_SwapLayerFrame */
BEGIN_EVENT_TABLE(WinEDA_SwapLayerFrame, wxDialog) BEGIN_EVENT_TABLE( WinEDA_SwapLayerFrame, wxDialog )
EVT_BUTTON(ID_SWAP_LAYER_EXECUTE, WinEDA_SwapLayerFrame::Execute) EVT_BUTTON( ID_SWAP_LAYER_EXECUTE, WinEDA_SwapLayerFrame::Execute )
EVT_BUTTON(ID_SWAP_LAYER_CANCEL, WinEDA_SwapLayerFrame::Cancel) EVT_BUTTON( ID_SWAP_LAYER_CANCEL, WinEDA_SwapLayerFrame::Cancel )
EVT_BUTTON(ID_SWAP_LAYER_DESELECT, WinEDA_SwapLayerFrame::Sel_Layer) EVT_BUTTON( ID_SWAP_LAYER_DESELECT, WinEDA_SwapLayerFrame::Sel_Layer )
EVT_BUTTON(ID_SWAP_LAYER_BUTTON_SELECT, WinEDA_SwapLayerFrame::Sel_Layer) EVT_BUTTON( ID_SWAP_LAYER_BUTTON_SELECT, WinEDA_SwapLayerFrame::Sel_Layer )
EVT_RADIOBOX(ID_SWAP_LAYER_SELECT, WinEDA_SwapLayerFrame::Sel_Layer) EVT_RADIOBOX( ID_SWAP_LAYER_SELECT, WinEDA_SwapLayerFrame::Sel_Layer )
END_EVENT_TABLE() END_EVENT_TABLE()
WinEDA_SwapLayerFrame::WinEDA_SwapLayerFrame(WinEDA_BasePcbFrame *parent): WinEDA_SwapLayerFrame::WinEDA_SwapLayerFrame( WinEDA_BasePcbFrame* parent ) :
wxDialog(parent, -1, _("Swap Layers:"),wxPoint(-1,-1), wxDialog( parent, -1, _( "Swap Layers:" ), wxPoint( -1, -1 ),
wxSize(470, 450), DIALOG_STYLE ) wxSize( 470, 450 ), DIALOG_STYLE )
{ {
#define START_Y 15 #define START_Y 15
wxButton * Button; wxButton* Button;
int ii; int ii;
wxPoint pos; wxPoint pos;
wxString g_Layer_Name_Pair[32]; wxString g_Layer_Name_Pair[32];
wxSize winsize; wxSize winsize;
m_Parent = parent; m_Parent = parent;
SetFont(*g_DialogFont); SetFont( *g_DialogFont );
for ( ii = 0; ii < NB_LAYERS; ii++ ) for( ii = 0; ii < NB_LAYERS; ii++ )
{ {
g_Layer_Name_Pair[ii] = ReturnPcbLayerName(ii) + wxT(" -> ") + _("No Change"); g_Layer_Name_Pair[ii] = ReturnPcbLayerName( ii ) + wxT( " -> " ) + _( "No Change" );
} }
pos.x = 5; pos.y = START_Y; pos.x = 5; pos.y = START_Y;
m_LayerList = new wxRadioBox(this, ID_SWAP_LAYER_SELECT, _("Layers"), m_LayerList = new wxRadioBox( this, ID_SWAP_LAYER_SELECT, _( "Layers" ),
pos, wxSize(-1,-1), 29, g_Layer_Name_Pair, 16, wxRA_SPECIFY_ROWS); pos, wxSize( -1,
-1 ), 29, g_Layer_Name_Pair, 16, wxRA_SPECIFY_ROWS );
winsize.y = m_LayerList->GetRect().GetBottom(); winsize.y = m_LayerList->GetRect().GetBottom();
pos.x = m_LayerList->GetRect().GetRight() + 12; pos.x = m_LayerList->GetRect().GetRight() + 12;
Button = new wxButton(this,ID_SWAP_LAYER_CANCEL, Button = new wxButton( this, ID_SWAP_LAYER_CANCEL,
_("Cancel"), pos); _( "Cancel" ), pos );
Button->SetForegroundColour(*wxRED);
winsize.x = MAX(winsize.x,Button->GetRect().GetRight()); Button->SetForegroundColour( *wxRED );
winsize.x = MAX( winsize.x, Button->GetRect().GetRight() );
pos.y += Button->GetSize().y + 5; pos.y += Button->GetSize().y + 5;
Button = new wxButton(this,ID_SWAP_LAYER_EXECUTE, Button = new wxButton( this, ID_SWAP_LAYER_EXECUTE,
_("OK"), pos); _( "OK" ), pos );
Button->SetForegroundColour(*wxBLUE);
winsize.x = MAX(winsize.x,Button->GetRect().GetRight()); Button->SetForegroundColour( *wxBLUE );
winsize.x = MAX( winsize.x, Button->GetRect().GetRight() );
pos.y += Button->GetSize().y + 15; pos.y += Button->GetSize().y + 15;
Button = new wxButton(this,ID_SWAP_LAYER_DESELECT, Button = new wxButton( this, ID_SWAP_LAYER_DESELECT,
_("Deselect"), pos); _( "Deselect" ), pos );
Button->SetForegroundColour(wxColour(0,100,0));
winsize.x = MAX(winsize.x,Button->GetRect().GetRight()); Button->SetForegroundColour( wxColour( 0, 100, 0 ) );
winsize.x = MAX( winsize.x, Button->GetRect().GetRight() );
pos.y += Button->GetSize().y + 5; pos.y += Button->GetSize().y + 5;
Button = new wxButton(this,ID_SWAP_LAYER_BUTTON_SELECT, Button = new wxButton( this, ID_SWAP_LAYER_BUTTON_SELECT,
_("Select"), pos); _( "Select" ), pos );
Button->SetForegroundColour(wxColour(0,100,100));
winsize.x = MAX(winsize.x,Button->GetRect().GetRight());
winsize.x += 10; winsize.y += 10; Button->SetForegroundColour( wxColour( 0, 100, 100 ) );
SetClientSize(winsize); winsize.x = MAX( winsize.x, Button->GetRect().GetRight() );
winsize.x += 10; winsize.y += 10;
SetClientSize( winsize );
} }
/***************************************************************/ /***************************************************************/
void WinEDA_SwapLayerFrame::Sel_Layer(wxCommandEvent& event) void WinEDA_SwapLayerFrame::Sel_Layer( wxCommandEvent& event )
/***************************************************************/ /***************************************************************/
{ {
int ii, jj; int ii, jj;
ii = m_LayerList->GetSelection(); ii = m_LayerList->GetSelection();
switch ( event.GetId()) switch( event.GetId() )
{ {
case ID_SWAP_LAYER_DESELECT: case ID_SWAP_LAYER_DESELECT:
if ( New_Layer[ii] != -1 ) if( New_Layer[ii] != -1 )
{ {
New_Layer[ii] = -1; New_Layer[ii] = -1;
m_LayerList->SetString(ii, ReturnPcbLayerName(ii) + m_LayerList->SetString( ii, ReturnPcbLayerName( ii ) +
+ wxT(" -> ") + _("No Change") ); + wxT( " -> " ) + _( "No Change" ) );
} }
break; break;
case ID_SWAP_LAYER_BUTTON_SELECT: case ID_SWAP_LAYER_BUTTON_SELECT:
case ID_SWAP_LAYER_SELECT: case ID_SWAP_LAYER_SELECT:
jj = m_Parent->SelectLayer(ii, -1, -1); jj = m_Parent->SelectLayer( ii, -1, -1 );
if ( (jj < 0) || (jj >= 29) ) return; if( (jj < 0) || (jj >= 29) )
return;
if ( ii != jj ) if( ii != jj )
{ {
New_Layer[ii] = jj; New_Layer[ii] = jj;
m_LayerList->SetString(ii, m_LayerList->SetString( ii,
ReturnPcbLayerName(ii) + wxT(" -> ") + ReturnPcbLayerName(jj) ); ReturnPcbLayerName( ii ) + wxT( " -> " ) +
ReturnPcbLayerName( jj ) );
} }
break; break;
} }
} }
/*********************************************************/ /*********************************************************/
void WinEDA_SwapLayerFrame::Cancel(wxCommandEvent& event) void WinEDA_SwapLayerFrame::Cancel( wxCommandEvent& event )
/*********************************************************/ /*********************************************************/
{ {
EndModal(-1); EndModal( -1 );
} }
/*********************************************************/ /*********************************************************/
void WinEDA_SwapLayerFrame::Execute(wxCommandEvent& event) void WinEDA_SwapLayerFrame::Execute( wxCommandEvent& event )
/*********************************************************/ /*********************************************************/
{ {
EndModal(1); EndModal( 1 );
} }
/********************************************************/ /********************************************************/
void WinEDA_PcbFrame::Swap_Layers(wxCommandEvent & event) void WinEDA_PcbFrame::Swap_Layers( wxCommandEvent& event )
/********************************************************/ /********************************************************/
/* Swap layers */ /* Swap layers */
{ {
int ii, jj ; int ii, jj;
TRACK * pt_segm ; TRACK* pt_segm;
DRAWSEGMENT * pt_drawsegm; DRAWSEGMENT* pt_drawsegm;
EDA_BaseStruct * PtStruct; EDA_BaseStruct* PtStruct;
/* Init default values */ /* Init default values */
for ( ii = 0 ; ii < 32 ; ii++ ) New_Layer[ii] = -1 ; for( ii = 0; ii < 32; ii++ )
New_Layer[ii] = -1;
WinEDA_SwapLayerFrame* frame = new WinEDA_SwapLayerFrame( this );
WinEDA_SwapLayerFrame * frame = new WinEDA_SwapLayerFrame(this);
ii = frame->ShowModal(); frame->Destroy(); ii = frame->ShowModal(); frame->Destroy();
if ( ii != 1 ) return; if( ii != 1 )
return;
/* Modifications des pistes */ /* Modifications des pistes */
pt_segm = (TRACK*) m_Pcb->m_Track; pt_segm = (TRACK*) m_Pcb->m_Track;
for ( ; pt_segm != NULL;pt_segm = (TRACK*)pt_segm->Pnext ) for( ; pt_segm != NULL; pt_segm = (TRACK*) pt_segm->Pnext )
{ {
m_CurrentScreen->SetModify(); m_CurrentScreen->SetModify();
if( pt_segm->Type() == TYPEVIA ) if( pt_segm->Type() == TYPEVIA )
{ {
SEGVIA * Via = (SEGVIA *) pt_segm; SEGVIA* Via = (SEGVIA*) pt_segm;
if ( Via->Shape() == VIA_NORMALE ) continue; if( Via->Shape() == VIA_NORMALE )
continue;
int top_layer, bottom_layer; int top_layer, bottom_layer;
Via->ReturnLayerPair(&top_layer, &bottom_layer); Via->ReturnLayerPair( &top_layer, &bottom_layer );
if( New_Layer[bottom_layer] >= 0) if( New_Layer[bottom_layer] >= 0 )
bottom_layer = New_Layer[bottom_layer]; bottom_layer = New_Layer[bottom_layer];
if( New_Layer[top_layer] >= 0) if( New_Layer[top_layer] >= 0 )
top_layer = New_Layer[top_layer]; top_layer = New_Layer[top_layer];
Via->SetLayerPair(top_layer, bottom_layer); Via->SetLayerPair( top_layer, bottom_layer );
} }
else else
{ {
jj = pt_segm->m_Layer; jj = pt_segm->m_Layer;
if( New_Layer[jj] >= 0) pt_segm->m_Layer = New_Layer[jj]; if( New_Layer[jj] >= 0 )
pt_segm->m_Layer = New_Layer[jj];
} }
} }
/* Modifications des zones */ /* Modifications des zones */
pt_segm = (TRACK*) m_Pcb->m_Zone; pt_segm = (TRACK*) m_Pcb->m_Zone;
for ( ; pt_segm != NULL;pt_segm = (TRACK*)pt_segm->Pnext ) for( ; pt_segm != NULL; pt_segm = (TRACK*) pt_segm->Pnext )
{ {
m_CurrentScreen->SetModify(); m_CurrentScreen->SetModify();
jj = pt_segm->m_Layer; jj = pt_segm->m_Layer;
if( New_Layer[jj] >= 0) pt_segm->m_Layer = New_Layer[jj]; if( New_Layer[jj] >= 0 )
pt_segm->m_Layer = New_Layer[jj];
} }
/* Modifications des autres segments */ /* Modifications des autres segments */
PtStruct = m_Pcb->m_Drawings; PtStruct = m_Pcb->m_Drawings;
for ( ; PtStruct != NULL ; PtStruct = PtStruct->Pnext ) for( ; PtStruct != NULL; PtStruct = PtStruct->Pnext )
{ {
if( PtStruct->Type() == TYPEDRAWSEGMENT ) if( PtStruct->Type() == TYPEDRAWSEGMENT )
{ {
m_CurrentScreen->SetModify(); m_CurrentScreen->SetModify();
pt_drawsegm = (DRAWSEGMENT *) PtStruct; pt_drawsegm = (DRAWSEGMENT*) PtStruct;
jj = pt_drawsegm->m_Layer; jj = pt_drawsegm->m_Layer;
if( New_Layer[jj] >= 0) pt_drawsegm->m_Layer = New_Layer[jj]; if( New_Layer[jj] >= 0 )
pt_drawsegm->m_Layer = New_Layer[jj];
} }
} }
DrawPanel->Refresh(TRUE);
DrawPanel->Refresh( TRUE );
} }
/*********************************************************/ /*********************************************************/
void WinEDA_PcbFrame::Liste_Equipot(wxCommandEvent & event) void WinEDA_PcbFrame::Liste_Equipot( wxCommandEvent& event )
/*********************************************************/ /*********************************************************/
{ {
EQUIPOT * Equipot ; EQUIPOT* Equipot;
wxString msg; wxString msg;
WinEDA_TextFrame * List; WinEDA_TextFrame* List;
int ii, jj; int ii, jj;
msg = wxT("*"); msg = wxT( "*" );
Get_Message(_("Filter for net names:"),msg, this); Get_Message( _( "Filter for net names:" ), msg, this );
if ( msg.IsEmpty() ) return; if( msg.IsEmpty() )
return;
List = new WinEDA_TextFrame(this, _("List Nets") ); List = new WinEDA_TextFrame( this, _( "List Nets" ) );
Equipot = (EQUIPOT*) m_Pcb->m_Equipots; Equipot = (EQUIPOT*) m_Pcb->m_Equipots;
for ( ; Equipot != NULL; Equipot = (EQUIPOT*)Equipot->Pnext ) for( ; Equipot != NULL; Equipot = (EQUIPOT*) Equipot->Pnext )
{ {
wxString Line; wxString Line;
/* calcul adr relative du nom de la pastille reference de la piste */ /* calcul adr relative du nom de la pastille reference de la piste */
if( ! WildCompareString(msg, Equipot->m_Netname, FALSE ) ) continue ; if( !WildCompareString( msg, Equipot->m_Netname, FALSE ) )
continue;
Line.Printf( wxT("net_code = %3.3d [%.16s] "),Equipot->m_NetCode, Line.Printf( wxT( "net_code = %3.3d [%.16s] " ), Equipot->m_NetCode,
Equipot->m_Netname.GetData()); Equipot->m_Netname.GetData() );
List->Append(Line); List->Append( Line );
} }
ii = List->ShowModal(); List->Destroy(); ii = List->ShowModal(); List->Destroy();
if (ii < 0) return; if( ii < 0 )
return;
/* Recherche du numero de net rellement selectionn */ /* Recherche du numero de net rellement selectionn */
Equipot = (EQUIPOT*) m_Pcb->m_Equipots; Equipot = (EQUIPOT*) m_Pcb->m_Equipots;
for ( jj = 0; Equipot != NULL; Equipot = (EQUIPOT*)Equipot->Pnext ) for( jj = 0; Equipot != NULL; Equipot = (EQUIPOT*) Equipot->Pnext )
{ {
/* calcul adr relative du nom de la pastille reference de la piste */ /* calcul adr relative du nom de la pastille reference de la piste */
if( ! WildCompareString(msg, Equipot->m_Netname, FALSE) ) continue ; if( !WildCompareString( msg, Equipot->m_Netname, FALSE ) )
if ( ii == jj ) continue;
if( ii == jj )
{ {
ii = Equipot->m_NetCode; ii = Equipot->m_NetCode;
break; break;
...@@ -271,14 +294,12 @@ int ii, jj; ...@@ -271,14 +294,12 @@ int ii, jj;
jj++; jj++;
} }
wxClientDC dc( DrawPanel );
wxClientDC dc(DrawPanel); DrawPanel->PrepareGraphicContext( &dc );
DrawPanel->PrepareGraphicContext(&dc);
if(g_HightLigt_Status) Hight_Light(&dc); if( g_HightLigt_Status )
Hight_Light( &dc );
g_HightLigth_NetCode = ii; g_HightLigth_NetCode = ii;
Hight_Light(&dc); Hight_Light( &dc );
} }
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