Commit 6addb79d authored by dickelbeck's avatar dickelbeck

beautified

parent 27bd9c75
/****************************************************/ /****************************************************/
/* Edition des pistes */ /* Edition des pistes */
/* Routines de duplication et deplacement de pistes */ /* Routines de duplication et deplacement de pistes */
/****************************************************/ /****************************************************/
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"
...@@ -22,68 +22,73 @@ extern char marq_bitmap[]; // dans TRACEPCB : bitmap du marqueur "DRC" ...@@ -22,68 +22,73 @@ extern char marq_bitmap[]; // dans TRACEPCB : bitmap du marqueur "DRC"
#if 0 #if 0
/* Routines Locales */ /* Routines Locales */
static void Exit_DuplicTrack(COMMAND * Cmd); static void Exit_DuplicTrack( COMMAND* Cmd );
static void Start_CopieMove_Route(COMMAND * Cmd) ; static void Start_CopieMove_Route( COMMAND* Cmd );
static void Duplic_Track(COMMAND * Cmd); static void Duplic_Track( COMMAND* Cmd );
static void Place_Dupl_Route(COMMAND * Cmd); static void Place_Dupl_Route( COMMAND* Cmd );
static void Show_Move_Piste(wxDC * DC, int flag); static void Show_Move_Piste( wxDC* DC, int flag );
/* variables locales */ /* variables locales */
static int startX, startY; static int startX, startY;
static int PosInitX, PosInitY; static int PosInitX, PosInitY;
static TRACK * NewTrack; /* Nouvelle piste creee ou piste deplacee */ static TRACK* NewTrack; /* Nouvelle piste creee ou piste deplacee */
static int NbPtNewTrack; static int NbPtNewTrack;
static int FlagState; /* memoire de la commande (COPY_ROUTE ou MOVE_ROUTE) */ static int FlagState; /* memoire de la commande (COPY_ROUTE ou MOVE_ROUTE) */
/* variables externes */ /* variables externes */
/**************************************************************/ /**************************************************************/
static void Exit_DuplicTrack(WinEDA_DrawFrame * frame, wxDC *DC) static void Exit_DuplicTrack( WinEDA_DrawFrame* frame, wxDC* DC )
/***************************************************************/ /***************************************************************/
/* routine d'annulation de la Commande Begin_Route si une piste est en cours /* routine d'annulation de la Commande Begin_Route si une piste est en cours
de tracage, ou de sortie de l'application EDITRACK. * de tracage, ou de sortie de l'application EDITRACK.
Appel par la touche ESC * Appel par la touche ESC
*/ */
{ {
TRACK * NextS; TRACK* NextS;
int ii; int ii;
wxDC * DC = Cmd->DC; wxDC* DC = Cmd->DC;
frame->DrawPanel->ManageCurseur = NULL; frame->DrawPanel->ManageCurseur = NULL;
if( NewTrack ) if( NewTrack )
{ {
/* Effacement du trace en cours */ /* Effacement du trace en cours */
DisplayOpt.DisplayPcbTrackFill = FALSE ; DisplayOpt.DisplayPcbTrackFill = FALSE;
Trace_Une_Piste(DC, NewTrack,NbPtNewTrack,GR_XOR); Trace_Une_Piste( DC, NewTrack, NbPtNewTrack, GR_XOR );
DisplayOpt.DisplayPcbTrackFill = Track_fill_copy ; DisplayOpt.DisplayPcbTrackFill = Track_fill_copy;
if (FlagState == COPY_ROUTE ) if( FlagState == COPY_ROUTE )
{ {
for( ii = 0; ii < NbPtNewTrack; ii++, NewTrack = NextS) for( ii = 0; ii < NbPtNewTrack; ii++, NewTrack = NextS )
{ {
if(NewTrack == NULL) break; if( NewTrack == NULL )
break;
NextS = (TRACK*) NewTrack->Pnext; NextS = (TRACK*) NewTrack->Pnext;
delete NewTrack; delete NewTrack;
} }
} }
else /* Move : remise en ancienne position */ else /* Move : remise en ancienne position */
{ {
TRACK * Track = NewTrack; TRACK* Track = NewTrack;
PosInitX -= Track->m_Start.x; PosInitX -= Track->m_Start.x;
PosInitY -= Track->m_Start.y; PosInitY -= Track->m_Start.y;
for( ii = 0; ii < NbPtNewTrack; ii++, Track = (TRACK*) Track->Pnext) for( ii = 0; ii < NbPtNewTrack; ii++, Track = (TRACK*) Track->Pnext )
{ {
if( Track == NULL ) break; if( Track == NULL )
break;
Track->m_Start.x += PosInitX; Track->m_Start.x += PosInitX;
Track->m_Start.y += PosInitY; Track->m_Start.y += PosInitY;
Track->m_End.x += PosInitX; Track->m_End.x += PosInitX;
Track->m_End.y += PosInitY; Track->m_End.y += PosInitY;
} }
Trace_Une_Piste(DC, NewTrack,NbPtNewTrack,GR_OR);
Trace_Une_Piste( DC, NewTrack, NbPtNewTrack, GR_OR );
} }
if(Etat_Surbrillance) Hight_Light(DC); if( Etat_Surbrillance )
Hight_Light( DC );
EraseMsgBox(); EraseMsgBox();
NewTrack = NULL; NewTrack = NULL;
} }
...@@ -95,83 +100,89 @@ wxDC * DC = Cmd->DC; ...@@ -95,83 +100,89 @@ wxDC * DC = Cmd->DC;
/******************************************/ /******************************************/
static void Place_Dupl_Route(COMMAND * Cmd) static void Place_Dupl_Route( COMMAND* Cmd )
/******************************************/ /******************************************/
/* /*
Routine de placement d'une piste (succession de segments) * Routine de placement d'une piste (succession de segments)
*/ */
{ {
D_PAD * pt_pad; D_PAD* pt_pad;
TRACK * pt_track, *Track, * pt_classe, *NextS; TRACK* pt_track, * Track, * pt_classe, * NextS;
int masquelayer; int masquelayer;
EDA_BaseStruct * LockPoint; EDA_BaseStruct* LockPoint;
int ii, old_net_code, new_net_code, DRC_error = 0; int ii, old_net_code, new_net_code, DRC_error = 0;
wxDC * DC = Cmd->DC; wxDC* DC = Cmd->DC;
ActiveDrawPanel->ManageCurseur = NULL; ActiveDrawPanel->ManageCurseur = NULL;
if( NewTrack == NULL ) return ; if( NewTrack == NULL )
return;
old_net_code = NewTrack->net_code; old_net_code = NewTrack->net_code;
/* Placement du flag BUSY de la piste originelle, qui ne doit /* Placement du flag BUSY de la piste originelle, qui ne doit
pas etre vue dans les recherches de raccordement suivantes */ * pas etre vue dans les recherches de raccordement suivantes */
ii = NbPtNewTrack; pt_track = NewTrack; ii = NbPtNewTrack; pt_track = NewTrack;
for ( ; ii > 0; ii --, pt_track = (TRACK*) pt_track->Pnext) for( ; ii > 0; ii--, pt_track = (TRACK*) pt_track->Pnext )
{ {
pt_track->SetState(BUSY, ON); pt_track->SetState( BUSY, ON );
} }
/* Detection du nouveau net_code */ /* Detection du nouveau net_code */
ii = NbPtNewTrack; pt_track = NewTrack; ii = NbPtNewTrack; pt_track = NewTrack;
for ( ; ii > 0; ii --, pt_track = (TRACK*) pt_track->Pnext) for( ; ii > 0; ii--, pt_track = (TRACK*) pt_track->Pnext )
{ {
pt_track->net_code = 0; pt_track->net_code = 0;
} }
new_net_code = 0; new_net_code = 0;
ii = 0; pt_track = NewTrack; ii = 0; pt_track = NewTrack;
for( ; ii < NbPtNewTrack ; ii++, pt_track = (TRACK*)pt_track->Pnext) for( ; ii < NbPtNewTrack; ii++, pt_track = (TRACK*) pt_track->Pnext )
{ {
/* Localisation de la pastille ou segment en debut de segment: */ /* Localisation de la pastille ou segment en debut de segment: */
masquelayer = tab_layer[pt_track->Layer]; masquelayer = tab_layer[pt_track->Layer];
LockPoint = LocateLockPoint(pt_track->m_Start.x,pt_track->m_Start.y,masquelayer); LockPoint = LocateLockPoint( pt_track->m_Start.x, pt_track->m_Start.y, masquelayer );
if( LockPoint ) if( LockPoint )
{ {
if ( LockPoint->m_StructType == TYPEPAD ) if( LockPoint->m_StructType == TYPEPAD )
{ {
pt_pad = (D_PAD*) LockPoint; pt_pad = (D_PAD*) LockPoint;
new_net_code = pt_pad->net_code; new_net_code = pt_pad->net_code;
if ( new_net_code > 0 ) break; if( new_net_code > 0 )
break;
} }
else /* debut de piste sur un segment de piste */ else /* debut de piste sur un segment de piste */
{ {
Track = (TRACK *) LockPoint; Track = (TRACK*) LockPoint;
new_net_code = Track->net_code; new_net_code = Track->net_code;
if ( new_net_code > 0 ) break; if( new_net_code > 0 )
break;
} }
} }
LockPoint = LocateLockPoint(pt_track->m_End.x,pt_track->m_End.y,masquelayer); LockPoint = LocateLockPoint( pt_track->m_End.x, pt_track->m_End.y, masquelayer );
if( LockPoint ) if( LockPoint )
{ {
if ( LockPoint->m_StructType == TYPEPAD ) if( LockPoint->m_StructType == TYPEPAD )
{ {
pt_pad = (D_PAD*) LockPoint; pt_pad = (D_PAD*) LockPoint;
new_net_code = pt_pad->net_code; new_net_code = pt_pad->net_code;
if ( new_net_code > 0 ) break; if( new_net_code > 0 )
break;
} }
else /* debut de piste sur un segment de piste */ else /* debut de piste sur un segment de piste */
{ {
Track = (TRACK *) LockPoint; Track = (TRACK*) LockPoint;
new_net_code = Track->net_code; new_net_code = Track->net_code;
if ( new_net_code > 0 ) break; if( new_net_code > 0 )
break;
} }
} }
} }
/* Mise a jour du nouveau net code de la piste */ /* Mise a jour du nouveau net code de la piste */
ii = 0; pt_track = NewTrack; ii = 0; pt_track = NewTrack;
for( ; ii < NbPtNewTrack; ii++, pt_track = (TRACK*)pt_track->Pnext) for( ; ii < NbPtNewTrack; ii++, pt_track = (TRACK*) pt_track->Pnext )
{ {
pt_track->net_code = new_net_code; pt_track->net_code = new_net_code;
} }
...@@ -181,220 +192,234 @@ wxDC * DC = Cmd->DC; ...@@ -181,220 +192,234 @@ wxDC * DC = Cmd->DC;
for( ; ii < NbPtNewTrack; ii++, pt_track = pt_track->Next() ) for( ; ii < NbPtNewTrack; ii++, pt_track = pt_track->Next() )
{ {
if( Drc_On == RUN ) if( Drc_On == RUN )
if( drc(DC, pt_track, pt_pcb->Track, 1) == BAD_DRC ) if( drc( DC, pt_track, pt_pcb->Track, 1 ) == BAD_DRC )
{ {
if( confirmation(" Erreur DRC, Place piste:") == YES ) continue; if( confirmation( " Erreur DRC, Place piste:" ) == YES )
else { DRC_error = 1; break; } continue;
else
{
DRC_error = 1; break;
}
} }
} }
if( DRC_error == 0) if( DRC_error == 0 )
{ {
if(FlagState == MOVE_ROUTE) if( FlagState == MOVE_ROUTE )
{ {
/* copie nouvelle piste */ /* copie nouvelle piste */
pt_track = NewTrack; pt_track = NewTrack;
NewTrack = pt_track->Copy(NbPtNewTrack); NewTrack = pt_track->Copy( NbPtNewTrack );
/* effacement ancienne ( chainage et liens mauvais */ /* effacement ancienne ( chainage et liens mauvais */
ii = NbPtNewTrack; ii = NbPtNewTrack;
for ( ; ii > 0; ii --, pt_track = NextS) for( ; ii > 0; ii--, pt_track = NextS )
{ {
NextS = (TRACK*) pt_track->Pnext; NextS = (TRACK*) pt_track->Pnext;
DeleteStructure(pt_track); DeleteStructure( pt_track );
} }
test_1_net_connexion(DC, old_net_code );
test_1_net_connexion( DC, old_net_code );
} }
pt_classe = NewTrack->GetBestInsertPoint(); pt_classe = NewTrack->GetBestInsertPoint();
NewTrack->Insert(pt_classe); NewTrack->Insert( pt_classe );
Trace_Une_Piste(DC, NewTrack,NbPtNewTrack,GR_OR) ; Trace_Une_Piste( DC, NewTrack, NbPtNewTrack, GR_OR );
/* Mise a jour des connexions sur pads et sur pistes */ /* Mise a jour des connexions sur pads et sur pistes */
ii = 0; pt_track = NewTrack; ii = 0; pt_track = NewTrack;
for( ; ii < NbPtNewTrack; ii++, pt_track = NextS) for( ; ii < NbPtNewTrack; ii++, pt_track = NextS )
{ {
NextS = (TRACK*)pt_track->Pnext; NextS = (TRACK*) pt_track->Pnext;
pt_track->SetState(BEGIN_ONPAD|END_ONPAD, OFF); pt_track->SetState( BEGIN_ONPAD | END_ONPAD, OFF );
masquelayer = tab_layer[pt_track->Layer]; masquelayer = tab_layer[pt_track->Layer];
/* Localisation de la pastille ou segment sur debut segment: */ /* Localisation de la pastille ou segment sur debut segment: */
LockPoint = LocateLockPoint(pt_track->m_Start.x,pt_track->m_Start.y,masquelayer); LockPoint = LocateLockPoint( pt_track->m_Start.x, pt_track->m_Start.y, masquelayer );
if( LockPoint ) if( LockPoint )
{ {
pt_track->start = LockPoint; pt_track->start = LockPoint;
if ( LockPoint->m_StructType == TYPEPAD ) if( LockPoint->m_StructType == TYPEPAD )
{ /* fin de piste sur un pad */ { /* fin de piste sur un pad */
pt_pad = (D_PAD*) LockPoint; pt_pad = (D_PAD*) LockPoint;
pt_track->SetState(BEGIN_ONPAD, ON); pt_track->SetState( BEGIN_ONPAD, ON );
} }
else /* debut de piste sur un segment de piste */ else /* debut de piste sur un segment de piste */
{ {
Track = (TRACK *) LockPoint; Track = (TRACK*) LockPoint;
CreateLockPoint(&pt_track->m_Start.x,&pt_track->m_Start.y,Track,pt_track); CreateLockPoint( &pt_track->m_Start.x, &pt_track->m_Start.y, Track, pt_track );
} }
} }
/* Localisation de la pastille ou segment sur fin de segment: */ /* Localisation de la pastille ou segment sur fin de segment: */
LockPoint = LocateLockPoint(pt_track->m_End.x,pt_track->m_End.y,masquelayer); LockPoint = LocateLockPoint( pt_track->m_End.x, pt_track->m_End.y, masquelayer );
if( LockPoint ) if( LockPoint )
{ {
pt_track->end = LockPoint; pt_track->end = LockPoint;
if ( LockPoint->m_StructType == TYPEPAD ) if( LockPoint->m_StructType == TYPEPAD )
{ /* fin de piste sur un pad */ { /* fin de piste sur un pad */
pt_pad = (D_PAD*) LockPoint; pt_pad = (D_PAD*) LockPoint;
pt_track->SetState(END_ONPAD, ON); pt_track->SetState( END_ONPAD, ON );
} }
else /* debut de piste sur un segment de piste */ else /* debut de piste sur un segment de piste */
{ {
Track = (TRACK *) LockPoint; Track = (TRACK*) LockPoint;
CreateLockPoint(&pt_track->m_Start.x,&pt_track->m_Start.y,Track,pt_track); CreateLockPoint( &pt_track->m_Start.x, &pt_track->m_Start.y, Track, pt_track );
} }
} }
} }
/* Suppression du flag BUSY */ /* Suppression du flag BUSY */
ii = NbPtNewTrack; pt_track = NewTrack; ii = NbPtNewTrack; pt_track = NewTrack;
for ( ; ii > 0; ii --, pt_track = (TRACK*) pt_track->Pnext) for( ; ii > 0; ii--, pt_track = (TRACK*) pt_track->Pnext )
{ {
pt_track->SetState(BUSY, OFF); pt_track->SetState( BUSY, OFF );
} }
test_1_net_connexion(DC, new_net_code ); test_1_net_connexion( DC, new_net_code );
ActiveScreen->SetModify(); ActiveScreen->SetModify();
} }
else /* Erreur DRC: Annulation commande */ else /* Erreur DRC: Annulation commande */
{ {
DisplayOpt.DisplayPcbTrackFill = FALSE ; DisplayOpt.DisplayPcbTrackFill = FALSE;
Trace_Une_Piste(DC, NewTrack,NbPtNewTrack,GR_XOR); Trace_Une_Piste( DC, NewTrack, NbPtNewTrack, GR_XOR );
DisplayOpt.DisplayPcbTrackFill = Track_fill_copy ; DisplayOpt.DisplayPcbTrackFill = Track_fill_copy;
if(FlagState == MOVE_ROUTE) if( FlagState == MOVE_ROUTE )
{ /* Remise en position de la piste deplacee */ { /* Remise en position de la piste deplacee */
Track = NewTrack; Track = NewTrack;
PosInitX -= Track->m_Start.x; PosInitY -= Track->m_Start.y; PosInitX -= Track->m_Start.x; PosInitY -= Track->m_Start.y;
for( ii = 0; ii < NbPtNewTrack; ii++, Track = (TRACK*) Track->Pnext) for( ii = 0; ii < NbPtNewTrack; ii++, Track = (TRACK*) Track->Pnext )
{ {
if( Track == NULL ) break; if( Track == NULL )
break;
Track->m_Start.x += PosInitX; Track->m_Start.y += PosInitY; Track->m_Start.x += PosInitX; Track->m_Start.y += PosInitY;
Track->m_End.x += PosInitX; Track->m_End.y += PosInitY; Track->m_End.x += PosInitX; Track->m_End.y += PosInitY;
Track->SetState(BUSY,OFF); Track->SetState( BUSY, OFF );
} }
Trace_Une_Piste(DC, NewTrack,NbPtNewTrack,GR_OR);
Trace_Une_Piste( DC, NewTrack, NbPtNewTrack, GR_OR );
} }
if (FlagState == COPY_ROUTE ) if( FlagState == COPY_ROUTE )
{ /* Suppression copie */ { /* Suppression copie */
for( ii = 0; ii < NbPtNewTrack; NewTrack = NextS) for( ii = 0; ii < NbPtNewTrack; NewTrack = NextS )
{ {
if(NewTrack == NULL) break; if( NewTrack == NULL )
break;
NextS = (TRACK*) NewTrack->Pnext; NextS = (TRACK*) NewTrack->Pnext;
delete NewTrack; delete NewTrack;
} }
} }
} }
NewTrack = NULL; NewTrack = NULL;
Affiche_Infos_Status_Pcb(Cmd); Affiche_Infos_Status_Pcb( Cmd );
if(Etat_Surbrillance) Hight_Light(DC); if( Etat_Surbrillance )
Hight_Light( DC );
} }
/***********************************************/ /***********************************************/
static void Show_Move_Piste(wxDC * DC, int flag) static void Show_Move_Piste( wxDC* DC, int flag )
/***********************************************/ /***********************************************/
/* redessin du contour de la piste lors des deplacements de la souris */ /* redessin du contour de la piste lors des deplacements de la souris */
{ {
int ii, dx, dy; int ii, dx, dy;
TRACK * ptsegm; TRACK* ptsegm;
if ( NewTrack == NULL ) return ; /* Pas de piste en cours (Erreur ) */ if( NewTrack == NULL )
return; /* Pas de piste en cours (Erreur ) */
/* efface ancienne position si elle a ete deja dessinee */ /* efface ancienne position si elle a ete deja dessinee */
if( (flag == CURSEUR_MOVED ) && (FlagState == COPY_ROUTE ) ) if( (flag == CURSEUR_MOVED ) && (FlagState == COPY_ROUTE ) )
{ {
DisplayOpt.DisplayPcbTrackFill = FALSE ; DisplayOpt.DisplayPcbTrackFill = FALSE;
Trace_Une_Piste(DC, NewTrack,NbPtNewTrack,GR_XOR) ; Trace_Une_Piste( DC, NewTrack, NbPtNewTrack, GR_XOR );
} }
if( FlagState == MOVE_ROUTE ) if( FlagState == MOVE_ROUTE )
{ {
if( flag == CURSEUR_MOVED) DisplayOpt.DisplayPcbTrackFill = FALSE ; if( flag == CURSEUR_MOVED )
Trace_Une_Piste(DC, NewTrack,NbPtNewTrack,GR_XOR) ; DisplayOpt.DisplayPcbTrackFill = FALSE;
Trace_Une_Piste( DC, NewTrack, NbPtNewTrack, GR_XOR );
} }
/* mise a jour des coordonnees des segments de la piste */ /* mise a jour des coordonnees des segments de la piste */
dx = ActiveScreen->Curseur_X - startX ; dx = ActiveScreen->Curseur_X - startX;
dy = ActiveScreen->Curseur_Y - startY ; dy = ActiveScreen->Curseur_Y - startY;
startX = ActiveScreen->Curseur_X; startX = ActiveScreen->Curseur_X;
startY = ActiveScreen->Curseur_Y; startY = ActiveScreen->Curseur_Y;
ii = NbPtNewTrack, ptsegm = NewTrack; ii = NbPtNewTrack, ptsegm = NewTrack;
for( ; ii > 0; ii--, ptsegm = (TRACK*)ptsegm->Pnext ) for( ; ii > 0; ii--, ptsegm = (TRACK*) ptsegm->Pnext )
{ {
ptsegm->m_Start.x += dx; ptsegm->m_Start.y += dy; ptsegm->m_Start.x += dx; ptsegm->m_Start.y += dy;
ptsegm->m_End.x += dx; ptsegm->m_End.y += dy; ptsegm->m_End.x += dx; ptsegm->m_End.y += dy;
} }
/* dessin de la nouvelle piste */ /* dessin de la nouvelle piste */
DisplayOpt.DisplayPcbTrackFill = FALSE ; DisplayOpt.DisplayPcbTrackFill = FALSE;
Trace_Une_Piste(DC, NewTrack,NbPtNewTrack,GR_XOR) ; Trace_Une_Piste( DC, NewTrack, NbPtNewTrack, GR_XOR );
DisplayOpt.DisplayPcbTrackFill = Track_fill_copy ; DisplayOpt.DisplayPcbTrackFill = Track_fill_copy;
} }
/************************************************/ /************************************************/
/* void Start_CopieMove_Route(COMMAND * Cmd) */ /* void Start_CopieMove_Route(COMMAND * Cmd) */
/************************************************/ /************************************************/
/* Routine permettant la recopie d'une piste deja tracee /* Routine permettant la recopie d'une piste deja tracee
*/ */
static void Start_CopieMove_Route(COMMAND * Cmd) static void Start_CopieMove_Route( COMMAND* Cmd )
{ {
int ii; int ii;
TRACK *pt_segm, *pt_track; TRACK* pt_segm, * pt_track;
int masquelayer = tab_layer[ActiveScreen->Active_Layer]; int masquelayer = tab_layer[ActiveScreen->Active_Layer];
wxDC * DC = Cmd->DC; wxDC* DC = Cmd->DC;
if( NewTrack ) return; if( NewTrack )
return;
FlagState = (int)Cmd->Menu->param_inf; FlagState = (int) Cmd->Menu->param_inf;
/* Recherche de la piste sur la couche active (non zone) */ /* Recherche de la piste sur la couche active (non zone) */
for(pt_segm = pt_pcb->Track; pt_segm != NULL; pt_segm = (TRACK*)pt_segm->Pnext) for( pt_segm = pt_pcb->Track; pt_segm != NULL; pt_segm = (TRACK*) pt_segm->Pnext )
{ {
pt_segm = Locate_Pistes(pt_segm,masquelayer, CURSEUR_OFF_GRILLE); pt_segm = Locate_Pistes( pt_segm, masquelayer, CURSEUR_OFF_GRILLE );
if( pt_segm == NULL ) break ; if( pt_segm == NULL )
break ; break;
break;
} }
if( pt_segm != NULL ) if( pt_segm != NULL )
{ {
if (FlagState == COPY_ROUTE ) if( FlagState == COPY_ROUTE )
pt_track = Marque_Une_Piste(DC, pt_segm, &NbPtNewTrack, 0); pt_track = Marque_Une_Piste( DC, pt_segm, &NbPtNewTrack, 0 );
else pt_track = Marque_Une_Piste(DC, pt_segm, &NbPtNewTrack, GR_XOR); else
pt_track = Marque_Une_Piste( DC, pt_segm, &NbPtNewTrack, GR_XOR );
if(NbPtNewTrack) /* Il y a NbPtNewTrack segments de piste a traiter */ if( NbPtNewTrack ) /* Il y a NbPtNewTrack segments de piste a traiter */
{ {
/* effacement du flag BUSY de la piste originelle */ /* effacement du flag BUSY de la piste originelle */
ii = NbPtNewTrack; pt_segm = pt_track; ii = NbPtNewTrack; pt_segm = pt_track;
for ( ; ii > 0; ii --, pt_segm = (TRACK*) pt_segm->Pnext) for( ; ii > 0; ii--, pt_segm = (TRACK*) pt_segm->Pnext )
{ {
pt_segm->SetState(BUSY, OFF); pt_segm->SetState( BUSY, OFF );
} }
if (FlagState == COPY_ROUTE ) if( FlagState == COPY_ROUTE )
NewTrack = pt_track->Copy(NbPtNewTrack); NewTrack = pt_track->Copy( NbPtNewTrack );
else NewTrack = pt_track; else
NewTrack = pt_track;
Affiche_Infos_Piste(Cmd, pt_track) ; Affiche_Infos_Piste( Cmd, pt_track );
startX = ActiveScreen->Curseur_X; startX = ActiveScreen->Curseur_X;
startY = ActiveScreen->Curseur_Y; startY = ActiveScreen->Curseur_Y;
Place_Dupl_Route_Item.State = WAIT; Place_Dupl_Route_Item.State = WAIT;
ActiveDrawPanel->ManageCurseur = Show_Move_Piste; ActiveDrawPanel->ManageCurseur = Show_Move_Piste;
DisplayOpt.DisplayPcbTrackFill = FALSE ; DisplayOpt.DisplayPcbTrackFill = FALSE;
Trace_Une_Piste(DC, NewTrack,NbPtNewTrack,GR_XOR) ; Trace_Une_Piste( DC, NewTrack, NbPtNewTrack, GR_XOR );
DisplayOpt.DisplayPcbTrackFill = Track_fill_copy ; DisplayOpt.DisplayPcbTrackFill = Track_fill_copy;
PosInitX = NewTrack->m_Start.x; PosInitY = NewTrack->m_Start.y; PosInitX = NewTrack->m_Start.x; PosInitY = NewTrack->m_Start.y;
} }
} }
...@@ -404,84 +429,89 @@ wxDC * DC = Cmd->DC; ...@@ -404,84 +429,89 @@ wxDC * DC = Cmd->DC;
#endif #endif
/************************************************************************/ /************************************************************************/
EDA_BaseStruct * LocateLockPoint(BOARD * Pcb, wxPoint pos, int LayerMask) EDA_BaseStruct* LocateLockPoint( BOARD* Pcb, wxPoint pos, int LayerMask )
/************************************************************************/ /************************************************************************/
/* Routine trouvant le point " d'accrochage " d'une extremite de piste. /* Routine trouvant le point " d'accrochage " d'une extremite de piste.
Ce point peut etre un PAD ou un autre segment de piste * Ce point peut etre un PAD ou un autre segment de piste
Retourne: * Retourne:
- pointeur sur ce PAD ou: * - pointeur sur ce PAD ou:
- pointeur sur le segment ou: * - pointeur sur le segment ou:
- NULL * - NULL
Parametres d'appel: * Parametres d'appel:
coord pX, pY du point tst * coord pX, pY du point tst
masque des couches a tester * masque des couches a tester
*/ */
{ {
D_PAD * pt_pad; D_PAD* pt_pad;
TRACK * ptsegm; TRACK* ptsegm;
MODULE * Module; MODULE* Module;
/* detection du point type PAD */ /* detection du point type PAD */
pt_pad = NULL; pt_pad = NULL;
Module = Pcb->m_Modules; Module = Pcb->m_Modules;
for( ; Module != NULL; Module = (MODULE*)Module->Pnext ) for( ; Module != NULL; Module = (MODULE*) Module->Pnext )
{ {
pt_pad = Locate_Pads(Module,pos.x, pos.y, LayerMask); pt_pad = Locate_Pads( Module, pos.x, pos.y, LayerMask );
if (pt_pad) return(pt_pad); if( pt_pad )
return pt_pad;
} }
/* ici aucun pad n'a ete localise: detection d'un segment de piste */ /* ici aucun pad n'a ete localise: detection d'un segment de piste */
ptsegm = Fast_Locate_Piste( Pcb->m_Track, NULL, pos.x, pos.y, LayerMask); ptsegm = Fast_Locate_Piste( Pcb->m_Track, NULL, pos.x, pos.y, LayerMask );
if( ptsegm == NULL ) if( ptsegm == NULL )
ptsegm = Locate_Pistes( Pcb->m_Track, pos.x, pos.y, LayerMask); ptsegm = Locate_Pistes( Pcb->m_Track, pos.x, pos.y, LayerMask );
return(ptsegm); return ptsegm;
} }
/******************************************************************************/ /******************************************************************************/
TRACK * CreateLockPoint(int *pX, int *pY, TRACK * ptsegm, TRACK * refsegm) TRACK* CreateLockPoint( int* pX, int* pY, TRACK* ptsegm, TRACK* refsegm )
/******************************************************************************/ /******************************************************************************/
/* Routine de creation d'un point intermediaire sur un segment /* Routine de creation d'un point intermediaire sur un segment
le segment ptsegm est casse en 2 segments se raccordant au point pX, pY * le segment ptsegm est casse en 2 segments se raccordant au point pX, pY
retourne: * retourne:
NULL si pas de nouveau point ( c.a.d si pX, pY correspondait deja * NULL si pas de nouveau point ( c.a.d si pX, pY correspondait deja
a une extremite ou: * a une extremite ou:
pointeur sur le segment cree * pointeur sur le segment cree
si refsegm != NULL refsegm est pointeur sur le segment incident, * si refsegm != NULL refsegm est pointeur sur le segment incident,
et le point cree est l'intersection des 2 axes des segments ptsegm et * et le point cree est l'intersection des 2 axes des segments ptsegm et
refsegm * refsegm
retourne la valeur exacte de pX et pY * retourne la valeur exacte de pX et pY
Si ptsegm pointe sur une via: * Si ptsegm pointe sur une via:
retourne la valeur exacte de pX et pY et ptsegm, * retourne la valeur exacte de pX et pY et ptsegm,
mais ne cree pas de point supplementaire * mais ne cree pas de point supplementaire
*
*/ */
{ {
int cX, cY; int cX, cY;
int dx, dy; /* Coord de l'extremite du segm ptsegm / origine */ int dx, dy; /* Coord de l'extremite du segm ptsegm / origine */
int ox, oy, fx , fy; /* coord de refsegm / origine de prsegm */ int ox, oy, fx, fy; /* coord de refsegm / origine de prsegm */
TRACK * NewTrack; TRACK* NewTrack;
if( (ptsegm->m_Start.x == *pX) && (ptsegm->m_Start.y == *pY) ) return(NULL); if( (ptsegm->m_Start.x == *pX) && (ptsegm->m_Start.y == *pY) )
if( (ptsegm->m_End.x == *pX) && (ptsegm->m_End.y == *pY) ) return(NULL); return NULL;
if( (ptsegm->m_End.x == *pX) && (ptsegm->m_End.y == *pY) )
return NULL;
/* le point n'est pas sur une extremite de piste */ /* le point n'est pas sur une extremite de piste */
if(ptsegm->m_StructType == TYPEVIA ) if( ptsegm->m_StructType == TYPEVIA )
{ {
*pX = ptsegm->m_Start.x; *pY = ptsegm->m_Start.y; *pX = ptsegm->m_Start.x; *pY = ptsegm->m_Start.y;
return(ptsegm); return ptsegm;
} }
/* calcul des coord vraies du point intermediaire dans le repere d'origine /* calcul des coord vraies du point intermediaire dans le repere d'origine
= origine de ptsegm */ * = origine de ptsegm */
cX = *pX - ptsegm->m_Start.x; cX = *pX - ptsegm->m_Start.x;
cY = *pY - ptsegm->m_Start.y; cY = *pY - ptsegm->m_Start.y;
dx = ptsegm->m_End.x - ptsegm->m_Start.x; dx = ptsegm->m_End.x - ptsegm->m_Start.x;
dy = ptsegm->m_End.y - ptsegm->m_Start.y; dy = ptsegm->m_End.y - ptsegm->m_Start.y;
// ***** A COMPLETER : non utilise // ***** A COMPLETER : non utilise
if ( refsegm ) if( refsegm )
{ {
ox = refsegm->m_Start.x - ptsegm->m_Start.x; ox = refsegm->m_Start.x - ptsegm->m_Start.x;
oy = refsegm->m_Start.y - ptsegm->m_Start.y; oy = refsegm->m_Start.y - ptsegm->m_Start.y;
...@@ -490,31 +520,30 @@ TRACK * NewTrack; ...@@ -490,31 +520,30 @@ TRACK * NewTrack;
} }
/* pour que le point soit sur le segment ptsegm: cY/cX = dy/dx */ /* pour que le point soit sur le segment ptsegm: cY/cX = dy/dx */
if ( dx == 0 ) cX = 0; /* segm horizontal */ if( dx == 0 )
else cY = (cX * dy) / dx; cX = 0; /* segm horizontal */
else
cY = (cX * dy) / dx;
/* creation du point intermediaire ( c'est a dire creation d'un nouveau /* creation du point intermediaire ( c'est a dire creation d'un nouveau
segment, debutant au point intermediaire */ * segment, debutant au point intermediaire */
cX += ptsegm->m_Start.x; cY += ptsegm->m_Start.y; cX += ptsegm->m_Start.x; cY += ptsegm->m_Start.y;
NewTrack = ptsegm->Copy(); NewTrack = ptsegm->Copy();
NewTrack->Insert(NULL, ptsegm); NewTrack->Insert( NULL, ptsegm );
/* correction du pointeur de fin du nouveau segment */ /* correction du pointeur de fin du nouveau segment */
NewTrack->end = ptsegm->end; NewTrack->end = ptsegm->end;
/* le segment primitif finit au nouveau point : */ /* le segment primitif finit au nouveau point : */
ptsegm->m_End.x = cX; ptsegm->m_End.y = cY; ptsegm->m_End.x = cX; ptsegm->m_End.y = cY;
ptsegm->SetState(END_ONPAD, OFF); ptsegm->SetState( END_ONPAD, OFF );
/* le nouveau segment debute au nouveau point : */ /* le nouveau segment debute au nouveau point : */
ptsegm = NewTrack;; ptsegm = NewTrack;;
ptsegm->m_Start.x = cX; ptsegm->m_Start.y = cY; ptsegm->m_Start.x = cX; ptsegm->m_Start.y = cY;
ptsegm->SetState(BEGIN_ONPAD, OFF); ptsegm->SetState( BEGIN_ONPAD, OFF );
*pX = cX; *pY = cY; *pX = cX; *pY = cY;
return(ptsegm); return ptsegm;
} }
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