Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kicad-source-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
kicad-source-mirror
Commits
148a574e
Commit
148a574e
authored
Aug 08, 2009
by
charras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More about undo/redo in pcbnew
parent
42b1020d
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
475 additions
and
321 deletions
+475
-321
class_undoredo_container.cpp
common/class_undoredo_container.cpp
+21
-0
class_undoredo_container.h
include/class_undoredo_container.h
+9
-0
wxPcbStruct.h
include/wxPcbStruct.h
+37
-2
block.cpp
pcbnew/block.cpp
+7
-11
board_undo_redo.cpp
pcbnew/board_undo_redo.cpp
+33
-18
class_zone.cpp
pcbnew/class_zone.cpp
+2
-2
edit.cpp
pcbnew/edit.cpp
+6
-20
edit_track_width.cpp
pcbnew/edit_track_width.cpp
+156
-76
editrack.cpp
pcbnew/editrack.cpp
+17
-6
initpcb.cpp
pcbnew/initpcb.cpp
+5
-5
ioascii.cpp
pcbnew/ioascii.cpp
+2
-2
move_or_drag_track.cpp
pcbnew/move_or_drag_track.cpp
+120
-86
onleftclick.cpp
pcbnew/onleftclick.cpp
+1
-1
protos.h
pcbnew/protos.h
+15
-56
tr_modif.cpp
pcbnew/tr_modif.cpp
+44
-36
No files found.
common/class_undoredo_container.cpp
View file @
148a574e
...
@@ -314,6 +314,25 @@ void PICKED_ITEMS_LIST::CopyList( const PICKED_ITEMS_LIST& aSource )
...
@@ -314,6 +314,25 @@ void PICKED_ITEMS_LIST::CopyList( const PICKED_ITEMS_LIST& aSource )
m_ItemsList
=
aSource
.
m_ItemsList
;
// Vector's copy
m_ItemsList
=
aSource
.
m_ItemsList
;
// Vector's copy
}
}
/** function ReversePickersListOrder()
* reverses the order of pickers stored in this list
* Useful when pop a list from Undo to Redo (and vice-versa)
* because sometimes undo (or redo) a command needs to keep the
* order of successive changes.
* and obviously, undo and redo are in reverse order
*/
void
PICKED_ITEMS_LIST
::
ReversePickersListOrder
()
{
std
::
vector
<
ITEM_PICKER
>
tmp
;
while
(
!
m_ItemsList
.
empty
()
)
{
tmp
.
push_back
(
m_ItemsList
.
back
()
);
m_ItemsList
.
pop_back
();
}
m_ItemsList
.
swap
(
tmp
);
}
/**********************************************/
/**********************************************/
/********** UNDO_REDO_CONTAINER ***************/
/********** UNDO_REDO_CONTAINER ***************/
...
@@ -355,3 +374,5 @@ PICKED_ITEMS_LIST* UNDO_REDO_CONTAINER::PopCommand()
...
@@ -355,3 +374,5 @@ PICKED_ITEMS_LIST* UNDO_REDO_CONTAINER::PopCommand()
}
}
return
NULL
;
return
NULL
;
}
}
include/class_undoredo_container.h
View file @
148a574e
...
@@ -137,6 +137,15 @@ public:
...
@@ -137,6 +137,15 @@ public:
return
m_ItemsList
.
size
();
return
m_ItemsList
.
size
();
}
}
/** function ReversePickersListOrder()
* reverses the order of pickers stored in this list
* Useful when pop a list from Undo to Redo (and vice-versa)
* because sometimes undo (or redo) a command needs to keep the
* order of successive changes.
* and obviously, undo and redo are in reverse order
*/
void
ReversePickersListOrder
();
/** function GetItemWrapper
/** function GetItemWrapper
* @return the picker of a picked item
* @return the picker of a picked item
...
...
include/wxPcbStruct.h
View file @
148a574e
...
@@ -386,8 +386,21 @@ public:
...
@@ -386,8 +386,21 @@ public:
void
Remove_One_Track
(
wxDC
*
DC
,
TRACK
*
pt_segm
);
void
Remove_One_Track
(
wxDC
*
DC
,
TRACK
*
pt_segm
);
bool
Resize_Pistes_Vias
(
wxDC
*
DC
,
bool
Track
,
bool
Via
);
bool
Resize_Pistes_Vias
(
wxDC
*
DC
,
bool
Track
,
bool
Via
);
void
Edit_Net_Width
(
wxDC
*
DC
,
int
Netcode
);
void
Edit_Net_Width
(
wxDC
*
DC
,
int
Netcode
);
/** Function Edit_Track_Width
* Modify a full track width (using DRC control).
* a full track is the set of track segments between 2 ends: pads or a point that has more than 2 segments ends connected
* @param DC = the curred device context (can be NULL)
* @param aTrackSegment = a segment or via on the track to change
*/
void
Edit_Track_Width
(
wxDC
*
DC
,
TRACK
*
Track
);
void
Edit_Track_Width
(
wxDC
*
DC
,
TRACK
*
Track
);
int
Edit_TrackSegm_Width
(
wxDC
*
DC
,
TRACK
*
segm
);
/** Function Edit_TrackSegm_Width
* Modify one track segment width or one via diameter (using DRC control).
* @param DC = the curred device context (can be NULL)
* @param aTrackItem = the track segment or via to modify
*/
void
Edit_TrackSegm_Width
(
wxDC
*
DC
,
TRACK
*
segm
);
TRACK
*
Begin_Route
(
TRACK
*
track
,
wxDC
*
DC
);
TRACK
*
Begin_Route
(
TRACK
*
track
,
wxDC
*
DC
);
void
End_Route
(
TRACK
*
track
,
wxDC
*
DC
);
void
End_Route
(
TRACK
*
track
,
wxDC
*
DC
);
void
ExChange_Track_Layer
(
TRACK
*
pt_segm
,
wxDC
*
DC
);
void
ExChange_Track_Layer
(
TRACK
*
pt_segm
,
wxDC
*
DC
);
...
@@ -395,13 +408,35 @@ public:
...
@@ -395,13 +408,35 @@ public:
void
Attribut_Track
(
TRACK
*
track
,
wxDC
*
DC
,
bool
Flag_On
);
void
Attribut_Track
(
TRACK
*
track
,
wxDC
*
DC
,
bool
Flag_On
);
void
Attribut_net
(
wxDC
*
DC
,
int
net_code
,
bool
Flag_On
);
void
Attribut_net
(
wxDC
*
DC
,
int
net_code
,
bool
Flag_On
);
void
Start_MoveOneNodeOrSegment
(
TRACK
*
track
,
wxDC
*
DC
,
int
command
);
void
Start_MoveOneNodeOrSegment
(
TRACK
*
track
,
wxDC
*
DC
,
int
command
);
bool
PlaceDraggedTrackSegment
(
TRACK
*
Track
,
wxDC
*
DC
);
bool
PlaceDragged
OrMoved
TrackSegment
(
TRACK
*
Track
,
wxDC
*
DC
);
bool
MergeCollinearTracks
(
TRACK
*
track
,
wxDC
*
DC
,
int
end
);
bool
MergeCollinearTracks
(
TRACK
*
track
,
wxDC
*
DC
,
int
end
);
void
Start_DragTrackSegmentAndKeepSlope
(
TRACK
*
track
,
wxDC
*
DC
);
void
Start_DragTrackSegmentAndKeepSlope
(
TRACK
*
track
,
wxDC
*
DC
);
void
SwitchLayer
(
wxDC
*
DC
,
int
layer
);
void
SwitchLayer
(
wxDC
*
DC
,
int
layer
);
bool
Add_45_degrees_Segment
(
wxDC
*
DC
);
bool
Add_45_degrees_Segment
(
wxDC
*
DC
);
bool
Genere_Pad_Connexion
(
wxDC
*
DC
,
int
layer
);
bool
Genere_Pad_Connexion
(
wxDC
*
DC
,
int
layer
);
/** function EraseRedundantTrack
* Called after creating a track
* Remove (if exists) the old track that have the same starting and the same ending point as the new created track
* (this is the redunding track)
* @param aDC = the current device context (can be NULL)
* @param aNewTrack = the new created track (a pointer to a segment of the track list)
* @param aNewTrackSegmentsCount = number of segments in this new track
* @param aItemsListPicker = the list picker to use for an undo command (can be NULL)
*/
int
EraseRedundantTrack
(
wxDC
*
aDC
,
TRACK
*
aNewTrack
,
int
aNewTrackSegmentsCount
,
PICKED_ITEMS_LIST
*
aItemsListPicker
);
/** Function SetTrackSegmentWidth
* Modify one track segment width or one via diameter (using DRC control).
* Basic routine used by other routines when editing tracks or vias
* @param aTrackItem = the track segment or via to modify
* @param aItemsListPicker = the list picker to use for an undo command (can be NULL)
* @return true if done, false if no not change (because DRC error)
*/
bool
SetTrackSegmentWidth
(
TRACK
*
aTrackItem
,
PICKED_ITEMS_LIST
*
aItemsListPicker
);
// zone handling
// zone handling
/** Function Delete_Zone_Fill
/** Function Delete_Zone_Fill
...
...
pcbnew/block.cpp
View file @
148a574e
...
@@ -513,7 +513,7 @@ void WinEDA_PcbFrame::Block_SelectItems()
...
@@ -513,7 +513,7 @@ void WinEDA_PcbFrame::Block_SelectItems()
/* Zone selection */
/* Zone selection */
if
(
Block_Include_Zones
)
if
(
Block_Include_Zones
)
{
{
#if 0
#if 0
/* This section can creates problems if selected:
/* This section can creates problems if selected:
* m_Pcb->m_Zone can have a *lot* of items (100 000 is easily possible)
* m_Pcb->m_Zone can have a *lot* of items (100 000 is easily possible)
* so it is not selected (and TODO: will be removed, one day)
* so it is not selected (and TODO: will be removed, one day)
...
@@ -641,7 +641,7 @@ void WinEDA_PcbFrame::Block_Delete()
...
@@ -641,7 +641,7 @@ void WinEDA_PcbFrame::Block_Delete()
// These items are deleted, but not put in undo list
// These items are deleted, but not put in undo list
case
TYPE_MARKER_PCB
:
// a marker used to show something
case
TYPE_MARKER_PCB
:
// a marker used to show something
case
TYPE_ZONE
:
//
a segment used to fill a zome area (segment on a copper layer)
case
TYPE_ZONE
:
//
SEG_ZONE items are now deprecated
item
->
UnLink
();
item
->
UnLink
();
itemsList
->
RemovePicker
(
ii
);
itemsList
->
RemovePicker
(
ii
);
ii
--
;
ii
--
;
...
@@ -715,7 +715,7 @@ void WinEDA_PcbFrame::Block_Rotate()
...
@@ -715,7 +715,7 @@ void WinEDA_PcbFrame::Block_Rotate()
break
;
break
;
// This item is not put in undo list
// This item is not put in undo list
case
TYPE_ZONE
:
//
a segment used to fill a zome area (segment on a copper layer)
case
TYPE_ZONE
:
//
SEG_ZONE items are now deprecated
itemsList
->
RemovePicker
(
ii
);
itemsList
->
RemovePicker
(
ii
);
ii
--
;
ii
--
;
break
;
break
;
...
@@ -786,7 +786,7 @@ void WinEDA_PcbFrame::Block_Flip()
...
@@ -786,7 +786,7 @@ void WinEDA_PcbFrame::Block_Flip()
break
;
break
;
// This item is not put in undo list
// This item is not put in undo list
case
TYPE_ZONE
:
//
a segment used to fill a zome area (segment on a copper layer)
case
TYPE_ZONE
:
//
SEG_ZONE items are now deprecated
itemsList
->
RemovePicker
(
ii
);
itemsList
->
RemovePicker
(
ii
);
ii
--
;
ii
--
;
break
;
break
;
...
@@ -853,7 +853,7 @@ void WinEDA_PcbFrame::Block_Move()
...
@@ -853,7 +853,7 @@ void WinEDA_PcbFrame::Block_Move()
break
;
break
;
// This item is not put in undo list
// This item is not put in undo list
case
TYPE_ZONE
:
//
a segment used to fill a zome area (segment on a copper layer)
case
TYPE_ZONE
:
//
SEG_ZONE items are now deprecated
itemsList
->
RemovePicker
(
ii
);
itemsList
->
RemovePicker
(
ii
);
ii
--
;
ii
--
;
break
;
break
;
...
@@ -928,12 +928,8 @@ void WinEDA_PcbFrame::Block_Duplicate()
...
@@ -928,12 +928,8 @@ void WinEDA_PcbFrame::Block_Duplicate()
}
}
break
;
break
;
case
TYPE_ZONE
:
// a segment used to fill a zome area (segment on a copper layer)
case
TYPE_ZONE
:
// SEG_ZONE items are now deprecated
{
break
;
// SEG_ZONE items are not copied or put in undo list
// they must be recreated by zone filling
}
break
;
case
TYPE_ZONE_CONTAINER
:
case
TYPE_ZONE_CONTAINER
:
{
{
...
...
pcbnew/board_undo_redo.cpp
View file @
148a574e
...
@@ -126,7 +126,7 @@ void SwapData( BOARD_ITEM* aItem, BOARD_ITEM* aImage )
...
@@ -126,7 +126,7 @@ void SwapData( BOARD_ITEM* aItem, BOARD_ITEM* aImage )
}
}
// Swap layers:
// Swap layers:
if
(
aItem
->
Type
()
!=
TYPE_MODULE
)
// Module
s have a global swap function
if
(
aItem
->
Type
()
!=
TYPE_MODULE
&&
aItem
->
Type
()
!=
TYPE_ZONE_CONTAINER
)
// these item
s have a global swap function
{
{
int
layer
,
layerimg
;
int
layer
,
layerimg
;
layer
=
aItem
->
GetLayer
();
layer
=
aItem
->
GetLayer
();
...
@@ -139,16 +139,21 @@ void SwapData( BOARD_ITEM* aItem, BOARD_ITEM* aImage )
...
@@ -139,16 +139,21 @@ void SwapData( BOARD_ITEM* aItem, BOARD_ITEM* aImage )
{
{
case
TYPE_MODULE
:
case
TYPE_MODULE
:
{
{
MODULE
*
m_
tmp
=
(
MODULE
*
)
DuplicateStruct
(
aImage
);
MODULE
*
tmp
=
(
MODULE
*
)
DuplicateStruct
(
aImage
);
(
(
MODULE
*
)
aImage
)
->
Copy
(
(
MODULE
*
)
aItem
);
(
(
MODULE
*
)
aImage
)
->
Copy
(
(
MODULE
*
)
aItem
);
(
(
MODULE
*
)
aItem
)
->
Copy
(
m_
tmp
);
(
(
MODULE
*
)
aItem
)
->
Copy
(
tmp
);
delete
m_
tmp
;
delete
tmp
;
}
}
break
;
break
;
case
TYPE_ZONE_CONTAINER
:
case
TYPE_ZONE_CONTAINER
:
wxMessageBox
(
wxT
(
"SwapData(): TYPE_ZONE_CONTAINER not handled"
)
);
{
break
;
ZONE_CONTAINER
*
tmp
=
(
ZONE_CONTAINER
*
)
DuplicateStruct
(
aImage
);
(
(
ZONE_CONTAINER
*
)
aImage
)
->
Copy
(
(
ZONE_CONTAINER
*
)
aItem
);
(
(
ZONE_CONTAINER
*
)
aItem
)
->
Copy
(
tmp
);
delete
tmp
;
}
break
;
case
TYPE_DRAWSEGMENT
:
case
TYPE_DRAWSEGMENT
:
EXCHG
(
(
(
TRACK
*
)
aItem
)
->
m_Start
,
(
(
TRACK
*
)
aImage
)
->
m_Start
);
EXCHG
(
(
(
TRACK
*
)
aItem
)
->
m_Start
,
(
(
TRACK
*
)
aImage
)
->
m_Start
);
...
@@ -189,13 +194,13 @@ void SwapData( BOARD_ITEM* aItem, BOARD_ITEM* aImage )
...
@@ -189,13 +194,13 @@ void SwapData( BOARD_ITEM* aItem, BOARD_ITEM* aImage )
case
TYPE_COTATION
:
case
TYPE_COTATION
:
{
{
wxString
txt
=
(
(
COTATION
*
)
aItem
)
->
GetText
();
wxString
txt
=
(
(
COTATION
*
)
aItem
)
->
GetText
();
(
(
COTATION
*
)
aItem
)
->
SetText
(
((
COTATION
*
)
aImage
)
->
GetText
()
);
(
(
COTATION
*
)
aItem
)
->
SetText
(
(
(
COTATION
*
)
aImage
)
->
GetText
()
);
(
(
COTATION
*
)
aImage
)
->
SetText
(
txt
);
(
(
COTATION
*
)
aImage
)
->
SetText
(
txt
);
EXCHG
(
(
(
COTATION
*
)
aItem
)
->
m_Text
->
m_Size
,
(
(
COTATION
*
)
aImage
)
->
m_Text
->
m_Size
);
EXCHG
(
(
(
COTATION
*
)
aItem
)
->
m_Text
->
m_Size
,
(
(
COTATION
*
)
aImage
)
->
m_Text
->
m_Size
);
EXCHG
(
(
(
COTATION
*
)
aItem
)
->
m_Text
->
m_Width
,
(
(
COTATION
*
)
aImage
)
->
m_Text
->
m_Width
);
EXCHG
(
(
(
COTATION
*
)
aItem
)
->
m_Text
->
m_Width
,
(
(
COTATION
*
)
aImage
)
->
m_Text
->
m_Width
);
EXCHG
(
(
(
COTATION
*
)
aItem
)
->
m_Text
->
m_Mirror
,
(
(
COTATION
*
)
aImage
)
->
m_Text
->
m_Mirror
);
EXCHG
(
(
(
COTATION
*
)
aItem
)
->
m_Text
->
m_Mirror
,
(
(
COTATION
*
)
aImage
)
->
m_Text
->
m_Mirror
);
}
}
break
;
break
;
default
:
default
:
wxMessageBox
(
wxT
(
"SwapData() error: unexpected type"
)
);
wxMessageBox
(
wxT
(
"SwapData() error: unexpected type"
)
);
...
@@ -334,7 +339,7 @@ void WinEDA_PcbFrame::SaveCopyInUndoList( BOARD_ITEM* aItem,
...
@@ -334,7 +339,7 @@ void WinEDA_PcbFrame::SaveCopyInUndoList( BOARD_ITEM* aItem,
switch
(
aCommandType
)
switch
(
aCommandType
)
{
{
case
UR_CHANGED
:
/* Create a copy of schematic */
case
UR_CHANGED
:
/* Create a copy of schematic */
if
(
itemWrapper
.
m_Link
==
NULL
)
// When not null, the copy is already done
if
(
itemWrapper
.
m_Link
==
NULL
)
// When not null, the copy is already done
itemWrapper
.
m_Link
=
DuplicateStruct
(
aItem
);;
itemWrapper
.
m_Link
=
DuplicateStruct
(
aItem
);;
if
(
itemWrapper
.
m_Link
)
if
(
itemWrapper
.
m_Link
)
...
@@ -383,6 +388,7 @@ void WinEDA_PcbFrame::SaveCopyInUndoList( PICKED_ITEMS_LIST& aItemsList,
...
@@ -383,6 +388,7 @@ void WinEDA_PcbFrame::SaveCopyInUndoList( PICKED_ITEMS_LIST& aItemsList,
PICKED_ITEMS_LIST
*
commandToUndo
=
new
PICKED_ITEMS_LIST
();
PICKED_ITEMS_LIST
*
commandToUndo
=
new
PICKED_ITEMS_LIST
();
commandToUndo
->
m_TransformPoint
=
aTransformPoint
;
commandToUndo
->
m_TransformPoint
=
aTransformPoint
;
// Copy picker list:
// Copy picker list:
commandToUndo
->
CopyList
(
aItemsList
);
commandToUndo
->
CopyList
(
aItemsList
);
...
@@ -394,20 +400,21 @@ void WinEDA_PcbFrame::SaveCopyInUndoList( PICKED_ITEMS_LIST& aItemsList,
...
@@ -394,20 +400,21 @@ void WinEDA_PcbFrame::SaveCopyInUndoList( PICKED_ITEMS_LIST& aItemsList,
if
(
command
==
UR_UNSPECIFIED
)
if
(
command
==
UR_UNSPECIFIED
)
{
{
command
=
aTypeCommand
;
command
=
aTypeCommand
;
commandToUndo
->
SetPickedItemStatus
(
command
,
ii
);
commandToUndo
->
SetPickedItemStatus
(
command
,
ii
);
}
}
wxASSERT
(
item
);
wxASSERT
(
item
);
switch
(
command
)
switch
(
command
)
{
{
case
UR_CHANGED
:
case
UR_CHANGED
:
/* If needed, create a copy of item, and put in undo list
/* If needed, create a copy of item, and put in undo list
* in the picker, as link
* in the picker, as link
* If this link is not null, the copy is already done
* If this link is not null, the copy is already done
*/
*/
if
(
commandToUndo
->
GetPickedItemLink
(
ii
)
==
NULL
)
if
(
commandToUndo
->
GetPickedItemLink
(
ii
)
==
NULL
)
commandToUndo
->
SetPickedItemLink
(
DuplicateStruct
(
item
),
ii
);
commandToUndo
->
SetPickedItemLink
(
DuplicateStruct
(
item
),
ii
);
wxASSERT
(
commandToUndo
->
GetPickedItemLink
(
ii
)
);
wxASSERT
(
commandToUndo
->
GetPickedItemLink
(
ii
)
);
break
;
break
;
case
UR_MOVED
:
case
UR_MOVED
:
...
@@ -453,7 +460,9 @@ void WinEDA_PcbFrame::PutDataInPreviousState( PICKED_ITEMS_LIST* aList, bool aRe
...
@@ -453,7 +460,9 @@ void WinEDA_PcbFrame::PutDataInPreviousState( PICKED_ITEMS_LIST* aList, bool aRe
bool
not_found
=
false
;
bool
not_found
=
false
;
bool
reBuild_ratsnest
=
false
;
bool
reBuild_ratsnest
=
false
;
for
(
unsigned
ii
=
0
;
ii
<
aList
->
GetCount
();
ii
++
)
// Undo in the reverse order of list creation: (this can allow stacked changes
// like the same item can be changes and deleted in the same complex command
for
(
int
ii
=
aList
->
GetCount
()
-
1
;
ii
>=
0
;
ii
--
)
{
{
item
=
(
BOARD_ITEM
*
)
aList
->
GetPickedItem
(
ii
);
item
=
(
BOARD_ITEM
*
)
aList
->
GetPickedItem
(
ii
);
wxASSERT
(
item
);
wxASSERT
(
item
);
...
@@ -464,7 +473,7 @@ void WinEDA_PcbFrame::PutDataInPreviousState( PICKED_ITEMS_LIST* aList, bool aRe
...
@@ -464,7 +473,7 @@ void WinEDA_PcbFrame::PutDataInPreviousState( PICKED_ITEMS_LIST* aList, bool aRe
{
{
// Remove this non existant item
// Remove this non existant item
aList
->
RemovePicker
(
ii
);
aList
->
RemovePicker
(
ii
);
ii
--
;
// the current item was removed, ii points now the next item
ii
++
;
// the current item was removed, ii points now the next item
// whe must decrement it because it will be incremented
// whe must decrement it because it will be incremented
not_found
=
true
;
not_found
=
true
;
continue
;
continue
;
...
@@ -557,12 +566,15 @@ void WinEDA_PcbFrame::GetBoardFromUndoList( wxCommandEvent& event )
...
@@ -557,12 +566,15 @@ void WinEDA_PcbFrame::GetBoardFromUndoList( wxCommandEvent& event )
if
(
GetScreen
()
->
GetUndoCommandCount
()
<=
0
)
if
(
GetScreen
()
->
GetUndoCommandCount
()
<=
0
)
return
;
return
;
/* Get the old
wrapper and put it in RedoL
ist */
/* Get the old
l
ist */
PICKED_ITEMS_LIST
*
List
=
GetScreen
()
->
PopCommandFromUndoList
();
PICKED_ITEMS_LIST
*
List
=
GetScreen
()
->
PopCommandFromUndoList
();
GetScreen
()
->
PushCommandToRedoList
(
List
);
/* Undo the command */
/* Undo the command */
PutDataInPreviousState
(
List
,
false
);
PutDataInPreviousState
(
List
,
false
);
/* Pu the old list in RedoList */
List
->
ReversePickersListOrder
();
GetScreen
()
->
PushCommandToRedoList
(
List
);
GetScreen
()
->
SetModify
();
GetScreen
()
->
SetModify
();
ReCreateHToolbar
();
ReCreateHToolbar
();
SetToolbars
();
SetToolbars
();
...
@@ -583,13 +595,16 @@ void WinEDA_PcbFrame::GetBoardFromRedoList( wxCommandEvent& event )
...
@@ -583,13 +595,16 @@ void WinEDA_PcbFrame::GetBoardFromRedoList( wxCommandEvent& event )
return
;
return
;
/* Get the old
wrapper and put it in UndoL
ist */
/* Get the old
l
ist */
PICKED_ITEMS_LIST
*
List
=
GetScreen
()
->
PopCommandFromRedoList
();
PICKED_ITEMS_LIST
*
List
=
GetScreen
()
->
PopCommandFromRedoList
();
GetScreen
()
->
PushCommandToUndoList
(
List
);
/* Redo the command: */
/* Redo the command: */
PutDataInPreviousState
(
List
,
true
);
PutDataInPreviousState
(
List
,
true
);
/* Put the old list in UndoList */
List
->
ReversePickersListOrder
();
GetScreen
()
->
PushCommandToUndoList
(
List
);
GetScreen
()
->
SetModify
();
GetScreen
()
->
SetModify
();
ReCreateHToolbar
();
ReCreateHToolbar
();
SetToolbars
();
SetToolbars
();
...
...
pcbnew/class_zone.cpp
View file @
148a574e
...
@@ -1145,8 +1145,8 @@ void ZONE_CONTAINER::Copy( ZONE_CONTAINER* src )
...
@@ -1145,8 +1145,8 @@ void ZONE_CONTAINER::Copy( ZONE_CONTAINER* src )
/**
/**
* Function SetNetNameFromNetCode
* Function SetNetNameFromNetCode
* Fin
the na
t name corresponding to the net code.
* Fin
d the ne
t name corresponding to the net code.
* @param aPcb: the curren board
* @param aPcb: the curren
t
board
* @return bool - true if net found, else false
* @return bool - true if net found, else false
*/
*/
bool
ZONE_CONTAINER
::
SetNetNameFromNetCode
(
void
)
bool
ZONE_CONTAINER
::
SetNetNameFromNetCode
(
void
)
...
...
pcbnew/edit.cpp
View file @
148a574e
...
@@ -165,22 +165,11 @@ void WinEDA_PcbFrame::Process_Special_Functions( wxCommandEvent& event )
...
@@ -165,22 +165,11 @@ void WinEDA_PcbFrame::Process_Special_Functions( wxCommandEvent& event )
break
;
break
;
case
ID_TOGGLE_PRESENT_COMMAND
:
case
ID_TOGGLE_PRESENT_COMMAND
:
/* if( DrawPanel->ManageCurseur
* && DrawPanel->ForceCloseManageCurseur )
* {
* DrawPanel->ForceCloseManageCurseur( DrawPanel, &dc );
* }
*/
break
;
break
;
default
:
// Finish (abort ) the command
default
:
// Finish (abort ) the command
if
(
DrawPanel
->
ManageCurseur
if
(
DrawPanel
->
ManageCurseur
&&
DrawPanel
->
ForceCloseManageCurseur
)
&&
DrawPanel
->
ForceCloseManageCurseur
)
{
DrawPanel
->
ForceCloseManageCurseur
(
DrawPanel
,
&
dc
);
DrawPanel
->
ForceCloseManageCurseur
(
DrawPanel
,
&
dc
);
}
if
(
m_ID_current_state
!=
id
)
if
(
m_ID_current_state
!=
id
)
{
{
...
@@ -286,11 +275,6 @@ void WinEDA_PcbFrame::Process_Special_Functions( wxCommandEvent& event )
...
@@ -286,11 +275,6 @@ void WinEDA_PcbFrame::Process_Special_Functions( wxCommandEvent& event )
m_ModuleEditFrame
->
Iconize
(
false
);
m_ModuleEditFrame
->
Iconize
(
false
);
break
;
break
;
case
ID_NEW_PROJECT
:
case
ID_LOAD_PROJECT
:
Files_io
(
event
);
break
;
case
ID_PCB_GLOBAL_DELETE
:
case
ID_PCB_GLOBAL_DELETE
:
InstallPcbGlobalDeleteFrame
(
pos
);
InstallPcbGlobalDeleteFrame
(
pos
);
break
;
break
;
...
@@ -470,7 +454,7 @@ void WinEDA_PcbFrame::Process_Special_Functions( wxCommandEvent& event )
...
@@ -470,7 +454,7 @@ void WinEDA_PcbFrame::Process_Special_Functions( wxCommandEvent& event )
DrawPanel
->
MouseToCursorSchema
();
DrawPanel
->
MouseToCursorSchema
();
if
(
GetCurItem
()
->
m_Flags
&
IS_DRAGGED
)
if
(
GetCurItem
()
->
m_Flags
&
IS_DRAGGED
)
{
{
PlaceDraggedTrackSegment
(
(
TRACK
*
)
GetCurItem
(),
&
dc
);
PlaceDragged
OrMoved
TrackSegment
(
(
TRACK
*
)
GetCurItem
(),
&
dc
);
}
}
break
;
break
;
...
@@ -482,7 +466,7 @@ void WinEDA_PcbFrame::Process_Special_Functions( wxCommandEvent& event )
...
@@ -482,7 +466,7 @@ void WinEDA_PcbFrame::Process_Special_Functions( wxCommandEvent& event )
DrawPanel
->
MouseToCursorSchema
();
DrawPanel
->
MouseToCursorSchema
();
if
(
GetCurItem
()
->
m_Flags
&
IS_DRAGGED
)
if
(
GetCurItem
()
->
m_Flags
&
IS_DRAGGED
)
{
{
PlaceDraggedTrackSegment
(
(
TRACK
*
)
GetCurItem
(),
&
dc
);
PlaceDragged
OrMoved
TrackSegment
(
(
TRACK
*
)
GetCurItem
(),
&
dc
);
}
}
else
else
{
{
...
@@ -1131,7 +1115,9 @@ void WinEDA_PcbFrame::Process_Special_Functions( wxCommandEvent& event )
...
@@ -1131,7 +1115,9 @@ void WinEDA_PcbFrame::Process_Special_Functions( wxCommandEvent& event )
TRACK
*
track
=
(
TRACK
*
)
GetScreen
()
->
GetCurItem
();
TRACK
*
track
=
(
TRACK
*
)
GetScreen
()
->
GetCurItem
();
wxPoint
pos
=
GetScreen
()
->
m_Curseur
;
wxPoint
pos
=
GetScreen
()
->
m_Curseur
;
track
->
Draw
(
DrawPanel
,
&
dc
,
GR_XOR
);
track
->
Draw
(
DrawPanel
,
&
dc
,
GR_XOR
);
TRACK
*
newtrack
=
CreateLockPoint
(
&
pos
.
x
,
&
pos
.
y
,
track
,
NULL
);
PICKED_ITEMS_LIST
itemsListPicker
;
TRACK
*
newtrack
=
CreateLockPoint
(
pos
,
track
,
NULL
,
&
itemsListPicker
);
SaveCopyInUndoList
(
itemsListPicker
,
UR_UNSPECIFIED
);
track
->
Draw
(
DrawPanel
,
&
dc
,
GR_XOR
);
track
->
Draw
(
DrawPanel
,
&
dc
,
GR_XOR
);
newtrack
->
Draw
(
DrawPanel
,
&
dc
,
GR_XOR
);
newtrack
->
Draw
(
DrawPanel
,
&
dc
,
GR_XOR
);
}
}
...
...
pcbnew/edit_track_width.cpp
View file @
148a574e
...
@@ -12,72 +12,131 @@
...
@@ -12,72 +12,131 @@
#include "wxPcbStruct.h"
#include "wxPcbStruct.h"
#include "protos.h"
#include "protos.h"
/* Routines Locales */
/*********************************************************************/
int
WinEDA_PcbFrame
::
Edit_TrackSegm_Width
(
wxDC
*
DC
,
TRACK
*
pt_segm
)
/*********************************************************************/
/* Routine to modify one track segment width or one via diameter.
/** Function SetTrackSegmentWidth
* Modify one track segment width or one via diameter (using DRC control).
* Basic routine used by other routines when editing tracks or vias
* Basic routine used by other routines when editing tracks or vias
* @param aTrackItem = the track segment or via to modify
* @param aItemsListPicker = the list picker to use for an undo command (can be NULL)
* @return true if done, false if no not change (because DRC error)
*/
*/
bool
WinEDA_PcbFrame
::
SetTrackSegmentWidth
(
TRACK
*
aTrackItem
,
PICKED_ITEMS_LIST
*
aItemsListPicker
)
{
{
int
errdrc
=
OK_DRC
;
int
initial_width
,
new_width
;
int
old_w
,
consign
e
;
bool
change_ok
=
fals
e
;
DrawPanel
->
CursorOff
(
DC
);
// Erase cursor shape
initial_width
=
aTrackItem
->
m_Width
;
pt_segm
->
Draw
(
DrawPanel
,
DC
,
GR_XOR
);
// Erase old track shape
new_width
=
aTrackItem
->
m_Width
=
g_DesignSettings
.
m_CurrentTrackWidth
;
if
(
aTrackItem
->
Type
()
==
TYPE_VIA
)
/* Test DRC and width change */
old_w
=
pt_segm
->
m_Width
;
consigne
=
pt_segm
->
m_Width
=
g_DesignSettings
.
m_CurrentTrackWidth
;
if
(
pt_segm
->
Type
()
==
TYPE_VIA
)
{
{
consigne
=
pt_seg
m
->
m_Width
=
g_DesignSettings
.
m_CurrentViaSize
;
new_width
=
aTrackIte
m
->
m_Width
=
g_DesignSettings
.
m_CurrentViaSize
;
if
(
pt_seg
m
->
m_Shape
==
VIA_MICROVIA
)
if
(
aTrackIte
m
->
m_Shape
==
VIA_MICROVIA
)
consigne
=
pt_seg
m
->
m_Width
=
g_DesignSettings
.
m_CurrentMicroViaSize
;
new_width
=
aTrackIte
m
->
m_Width
=
g_DesignSettings
.
m_CurrentMicroViaSize
;
}
}
if
(
old_w
<
consigne
)
/* DRC utile puisque augm de dimension
*/
if
(
initial_width
<
new_width
)
/* make a DRC test because the new size is bigger than the old size
*/
{
{
int
diagdrc
=
OK_DRC
;
if
(
Drc_On
)
if
(
Drc_On
)
errdrc
=
m_drc
->
Drc
(
pt_segm
,
GetBoard
()
->
m_Track
);
diagdrc
=
m_drc
->
Drc
(
aTrackItem
,
GetBoard
()
->
m_Track
);
if
(
errdrc
==
BAD_DRC
)
if
(
diagdrc
==
OK_DRC
)
pt_segm
->
m_Width
=
old_w
;
change_ok
=
true
;
else
}
GetScreen
()
->
SetModify
();
else
if
(
initial_width
>
new_width
)
change_ok
=
true
;
// if new width == initial_width: do nothing
if
(
change_ok
)
{
GetScreen
()
->
SetModify
();
if
(
aItemsListPicker
)
{
aTrackItem
->
m_Width
=
initial_width
;
ITEM_PICKER
picker
(
aTrackItem
,
UR_CHANGED
);
picker
.
m_Link
=
aTrackItem
->
Copy
();
aItemsListPicker
->
PushItem
(
picker
);
aTrackItem
->
m_Width
=
new_width
;
}
}
}
else
else
GetScreen
()
->
SetModify
();
/* Correction systematiquement faite si reduction */
aTrackItem
->
m_Width
=
initial_width
;
pt_segm
->
Draw
(
DrawPanel
,
DC
,
GR_OR
);
// Display new track shape
return
change_ok
;
DrawPanel
->
CursorOn
(
DC
);
// Display cursor shape
return
errdrc
;
}
}
/*****************************************************************/
/** Function Edit_TrackSegm_Width
void
WinEDA_PcbFrame
::
Edit_Track_Width
(
wxDC
*
DC
,
TRACK
*
pt_segm
)
* Modify one track segment width or one via diameter (using DRC control).
/*****************************************************************/
* @param DC = the curred device context (can be NULL)
* @param aTrackItem = the track segment or via to modify
*/
void
WinEDA_PcbFrame
::
Edit_TrackSegm_Width
(
wxDC
*
DC
,
TRACK
*
aTrackItem
)
{
PICKED_ITEMS_LIST
itemsListPicker
;
bool
change
=
SetTrackSegmentWidth
(
aTrackItem
,
&
itemsListPicker
);
if
(
change
==
0
||
aTrackItem
->
m_Flags
)
return
;
// No change
// The segment has changed: redraw it and save it in undo list
TRACK
*
oldsegm
=
(
TRACK
*
)
itemsListPicker
.
GetPickedItem
(
0
);
if
(
DC
)
{
DrawPanel
->
CursorOff
(
DC
);
// Erase cursor shape
oldsegm
->
Draw
(
DrawPanel
,
DC
,
GR_XOR
);
// Erase old track shape
aTrackItem
->
Draw
(
DrawPanel
,
DC
,
GR_OR
);
// Display new track shape
DrawPanel
->
CursorOn
(
DC
);
// Display cursor shape
}
SaveCopyInUndoList
(
itemsListPicker
,
UR_CHANGED
);
}
/** Function Edit_Track_Width
* Modify a full track width (using DRC control).
* a full track is the set of track segments between 2 ends: pads or a point that has more than 2 segments ends connected
* @param DC = the curred device context (can be NULL)
* @param aTrackSegment = a segment or via on the track to change
* @return none
*/
void
WinEDA_PcbFrame
::
Edit_Track_Width
(
wxDC
*
DC
,
TRACK
*
aTrackSegment
)
{
{
int
ii
;
TRACK
*
pt_track
;
TRACK
*
pt_track
;
int
errdrc
;
int
nb_segm
;
int
nb_segm
,
nb_segm_modifies
=
0
,
nb_segm_non_modifies
=
0
;
if
(
pt_segm
==
NULL
)
if
(
aTrackSegment
==
NULL
)
return
;
return
;
pt_track
=
Marque_Une_Piste
(
this
,
DC
,
pt_segm
,
&
nb_segm
,
0
);
pt_track
=
Marque_Une_Piste
(
this
,
DC
,
aTrackSegment
,
&
nb_segm
,
0
);
for
(
ii
=
0
;
ii
<
nb_segm
;
ii
++
,
pt_track
=
pt_track
->
Next
()
)
PICKED_ITEMS_LIST
itemsListPicker
;
bool
change
=
false
;
for
(
int
ii
=
0
;
ii
<
nb_segm
;
ii
++
,
pt_track
=
pt_track
->
Next
()
)
{
{
pt_track
->
SetState
(
BUSY
,
OFF
);
pt_track
->
SetState
(
BUSY
,
OFF
);
errdrc
=
Edit_TrackSegm_Width
(
DC
,
pt_track
);
if
(
SetTrackSegmentWidth
(
pt_track
,
&
itemsListPicker
)
)
if
(
errdrc
==
BAD_DRC
)
change
=
true
;
nb_segm_non_modifies
++
;
}
else
nb_segm_modifies
++
;
if
(
!
change
)
return
;
// Some segment have changed: redraw them and save in undo list
if
(
DC
)
{
DrawPanel
->
CursorOff
(
DC
);
// Erase cursor shape
for
(
unsigned
ii
=
0
;
ii
<
itemsListPicker
.
GetCount
();
ii
++
)
{
TRACK
*
segm
=
(
TRACK
*
)
itemsListPicker
.
GetPickedItemLink
(
ii
);
segm
->
Draw
(
DrawPanel
,
DC
,
GR_XOR
);
// Erase old track shape
segm
=
(
TRACK
*
)
itemsListPicker
.
GetPickedItem
(
ii
);
segm
->
Draw
(
DrawPanel
,
DC
,
GR_OR
);
// Display new track shape
}
DrawPanel
->
CursorOn
(
DC
);
// Display cursor shape
}
}
SaveCopyInUndoList
(
itemsListPicker
,
UR_CHANGED
);
}
}
...
@@ -86,9 +145,6 @@ void WinEDA_PcbFrame::Edit_Net_Width( wxDC* DC, int Netcode )
...
@@ -86,9 +145,6 @@ void WinEDA_PcbFrame::Edit_Net_Width( wxDC* DC, int Netcode )
/***********************************************************/
/***********************************************************/
{
{
TRACK
*
pt_segm
;
TRACK
*
pt_segm
;
int
errdrc
;
int
nb_segm_modifies
=
0
;
int
nb_segm_non_modifies
=
0
;
if
(
Netcode
<=
0
)
if
(
Netcode
<=
0
)
return
;
return
;
...
@@ -97,17 +153,36 @@ void WinEDA_PcbFrame::Edit_Net_Width( wxDC* DC, int Netcode )
...
@@ -97,17 +153,36 @@ void WinEDA_PcbFrame::Edit_Net_Width( wxDC* DC, int Netcode )
return
;
return
;
/* balayage des segments */
/* balayage des segments */
PICKED_ITEMS_LIST
itemsListPicker
;
bool
change
=
false
;
for
(
pt_segm
=
GetBoard
()
->
m_Track
;
pt_segm
!=
NULL
;
pt_segm
=
pt_segm
->
Next
()
)
for
(
pt_segm
=
GetBoard
()
->
m_Track
;
pt_segm
!=
NULL
;
pt_segm
=
pt_segm
->
Next
()
)
{
{
if
(
Netcode
!=
pt_segm
->
GetNet
()
)
/* mauvaise piste */
if
(
Netcode
!=
pt_segm
->
GetNet
()
)
/* mauvaise piste */
continue
;
continue
;
/* piste d'un net trouvee */
/* piste d'un net trouvee */
errdrc
=
Edit_TrackSegm_Width
(
DC
,
pt_segm
);
if
(
SetTrackSegmentWidth
(
pt_segm
,
&
itemsListPicker
)
)
if
(
errdrc
==
BAD_DRC
)
change
=
true
;
nb_segm_non_modifies
++
;
}
else
nb_segm_modifies
++
;
if
(
!
change
)
return
;
// Some segment have changed: redraw them and save in undo list
if
(
DC
)
{
DrawPanel
->
CursorOff
(
DC
);
// Erase cursor shape
for
(
unsigned
ii
=
0
;
ii
<
itemsListPicker
.
GetCount
();
ii
++
)
{
TRACK
*
segm
=
(
TRACK
*
)
itemsListPicker
.
GetPickedItemLink
(
ii
);
segm
->
Draw
(
DrawPanel
,
DC
,
GR_XOR
);
// Erase old track shape
segm
=
(
TRACK
*
)
itemsListPicker
.
GetPickedItem
(
ii
);
segm
->
Draw
(
DrawPanel
,
DC
,
GR_OR
);
// Display new track shape
}
DrawPanel
->
CursorOn
(
DC
);
// Display cursor shape
}
}
SaveCopyInUndoList
(
itemsListPicker
,
UR_CHANGED
);
}
}
...
@@ -121,9 +196,6 @@ bool WinEDA_PcbFrame::Resize_Pistes_Vias( wxDC* DC, bool Track, bool Via )
...
@@ -121,9 +196,6 @@ bool WinEDA_PcbFrame::Resize_Pistes_Vias( wxDC* DC, bool Track, bool Via )
*/
*/
{
{
TRACK
*
pt_segm
;
TRACK
*
pt_segm
;
int
errdrc
;
int
nb_segm_modifies
=
0
;
int
nb_segm_non_modifies
=
0
;
if
(
Track
&&
Via
)
if
(
Track
&&
Via
)
{
{
...
@@ -141,34 +213,42 @@ bool WinEDA_PcbFrame::Resize_Pistes_Vias( wxDC* DC, bool Track, bool Via )
...
@@ -141,34 +213,42 @@ bool WinEDA_PcbFrame::Resize_Pistes_Vias( wxDC* DC, bool Track, bool Via )
return
FALSE
;
return
FALSE
;
}
}
pt_segm
=
GetBoard
()
->
m_Track
;
/* balayage des segments */
for
(
;
pt_segm
!=
NULL
;
pt_segm
=
pt_segm
->
Next
()
)
PICKED_ITEMS_LIST
itemsListPicker
;
bool
change
=
false
;
for
(
pt_segm
=
GetBoard
()
->
m_Track
;
pt_segm
!=
NULL
;
pt_segm
=
pt_segm
->
Next
()
)
{
{
if
(
pt_segm
->
Type
()
==
TYPE_VIA
)
/* mise a jour du diametre de la via */
if
(
(
pt_segm
->
Type
()
==
TYPE_VIA
)
&&
Via
)
{
{
if
(
Via
)
if
(
SetTrackSegmentWidth
(
pt_segm
,
&
itemsListPicker
)
)
{
change
=
true
;
errdrc
=
Edit_TrackSegm_Width
(
DC
,
pt_segm
);
if
(
errdrc
==
BAD_DRC
)
nb_segm_non_modifies
++
;
else
nb_segm_modifies
++
;
}
}
}
else
/* mise a jour de la largeur du segment */
}
if
(
(
pt_segm
->
Type
()
==
TYPE_TRACK
)
&&
Track
)
{
if
(
SetTrackSegmentWidth
(
pt_segm
,
&
itemsListPicker
)
)
change
=
true
;;
}
if
(
!
change
)
return
false
;
// Some segment have changed: redraw them and save in undo list
if
(
DC
)
{
DrawPanel
->
CursorOff
(
DC
);
// Erase cursor shape
for
(
unsigned
ii
=
0
;
ii
<
itemsListPicker
.
GetCount
();
ii
++
)
{
{
if
(
Track
)
TRACK
*
segm
=
(
TRACK
*
)
itemsListPicker
.
GetPickedItemLink
(
ii
);
{
segm
->
Draw
(
DrawPanel
,
DC
,
GR_XOR
);
// Erase old track shape
errdrc
=
Edit_TrackSegm_Width
(
DC
,
pt_segm
);
segm
=
(
TRACK
*
)
itemsListPicker
.
GetPickedItem
(
ii
);
if
(
errdrc
==
BAD_DRC
)
segm
->
Draw
(
DrawPanel
,
DC
,
GR_OR
);
// Display new track shape
nb_segm_non_modifies
++
;
else
nb_segm_modifies
++
;
}
}
}
DrawPanel
->
CursorOn
(
DC
);
// Display cursor shape
}
}
if
(
nb_segm_modifies
)
SaveCopyInUndoList
(
itemsListPicker
,
UR_CHANGED
);
return
TRUE
;
return
FALSE
;
return
true
;
}
}
pcbnew/editrack.cpp
View file @
148a574e
...
@@ -27,6 +27,7 @@ static void EnsureEndTrackOnPad( D_PAD* Pad );
...
@@ -27,6 +27,7 @@ static void EnsureEndTrackOnPad( D_PAD* Pad );
/* variables locales */
/* variables locales */
static
int
OldNetCodeSurbrillance
;
static
int
OldNetCodeSurbrillance
;
static
int
OldEtatSurbrillance
;
static
int
OldEtatSurbrillance
;
static
PICKED_ITEMS_LIST
s_ItemsListPicker
;
/************************************************************/
/************************************************************/
...
@@ -53,6 +54,9 @@ static void Exit_Editrack( WinEDA_DrawPanel* Panel, wxDC* DC )
...
@@ -53,6 +54,9 @@ static void Exit_Editrack( WinEDA_DrawPanel* Panel, wxDC* DC )
frame
->
MsgPanel
->
EraseMsgBox
();
frame
->
MsgPanel
->
EraseMsgBox
();
// Clear the undo picker list:
s_ItemsListPicker
.
ClearListAndDeleteItems
();
// Delete current (new) track
// Delete current (new) track
g_CurrentTrackList
.
DeleteAll
();
g_CurrentTrackList
.
DeleteAll
();
}
}
...
@@ -95,6 +99,9 @@ TRACK* WinEDA_PcbFrame::Begin_Route( TRACK* aTrack, wxDC* DC )
...
@@ -95,6 +99,9 @@ TRACK* WinEDA_PcbFrame::Begin_Route( TRACK* aTrack, wxDC* DC )
if
(
aTrack
==
NULL
)
/* Starting a new track */
if
(
aTrack
==
NULL
)
/* Starting a new track */
{
{
// Prepare the undo command info
s_ItemsListPicker
.
ClearListAndDeleteItems
();
// Should not be necessary, but...
/* erase old highlight */
/* erase old highlight */
OldNetCodeSurbrillance
=
g_HightLigth_NetCode
;
OldNetCodeSurbrillance
=
g_HightLigth_NetCode
;
OldEtatSurbrillance
=
g_HightLigt_Status
;
OldEtatSurbrillance
=
g_HightLigt_Status
;
...
@@ -126,7 +133,7 @@ TRACK* WinEDA_PcbFrame::Begin_Route( TRACK* aTrack, wxDC* DC )
...
@@ -126,7 +133,7 @@ TRACK* WinEDA_PcbFrame::Begin_Route( TRACK* aTrack, wxDC* DC )
{
{
TrackOnStartPoint
=
(
TRACK
*
)
LockPoint
;
TrackOnStartPoint
=
(
TRACK
*
)
LockPoint
;
g_HightLigth_NetCode
=
TrackOnStartPoint
->
GetNet
();
g_HightLigth_NetCode
=
TrackOnStartPoint
->
GetNet
();
CreateLockPoint
(
&
pos
.
x
,
&
pos
.
y
,
TrackOnStartPoint
,
NULL
);
CreateLockPoint
(
pos
,
TrackOnStartPoint
,
NULL
,
&
s_ItemsListPicker
);
}
}
}
}
else
// no starting point, but a filled zone area can exist. This is also a good starting point.
else
// no starting point, but a filled zone area can exist. This is also a good starting point.
...
@@ -471,10 +478,10 @@ void WinEDA_PcbFrame::End_Route( TRACK* aTrack, wxDC* DC )
...
@@ -471,10 +478,10 @@ void WinEDA_PcbFrame::End_Route( TRACK* aTrack, wxDC* DC )
g_HightLigth_NetCode
=
adr_buf
->
GetNet
();
g_HightLigth_NetCode
=
adr_buf
->
GetNet
();
/* creation eventuelle d'un point d'accrochage */
/* creation eventuelle d'un point d'accrochage */
LockPoint
=
CreateLockPoint
(
&
g_CurrentTrackSegment
->
m_End
.
x
,
LockPoint
=
CreateLockPoint
(
g_CurrentTrackSegment
->
m_End
,
&
g_CurrentTrackSegment
->
m_End
.
y
,
adr_buf
,
adr_buf
,
g_CurrentTrackSegment
);
g_CurrentTrackSegment
,
&
s_ItemsListPicker
);
}
}
}
}
...
@@ -488,11 +495,13 @@ void WinEDA_PcbFrame::End_Route( TRACK* aTrack, wxDC* DC )
...
@@ -488,11 +495,13 @@ void WinEDA_PcbFrame::End_Route( TRACK* aTrack, wxDC* DC )
TRACK
*
firstTrack
=
g_FirstTrackSegment
;
TRACK
*
firstTrack
=
g_FirstTrackSegment
;
int
newCount
=
g_CurrentTrackList
.
GetCount
();
int
newCount
=
g_CurrentTrackList
.
GetCount
();
// Put entire new current segment list in BOARD
// Put entire new current segment list in BOARD
, ans prepare undo command
TRACK
*
track
;
TRACK
*
track
;
TRACK
*
insertBeforeMe
=
g_CurrentTrackSegment
->
GetBestInsertPoint
(
GetBoard
()
);
TRACK
*
insertBeforeMe
=
g_CurrentTrackSegment
->
GetBestInsertPoint
(
GetBoard
()
);
while
(
(
track
=
g_CurrentTrackList
.
PopFront
()
)
!=
NULL
)
while
(
(
track
=
g_CurrentTrackList
.
PopFront
()
)
!=
NULL
)
{
{
ITEM_PICKER
picker
(
track
,
UR_NEW
);
s_ItemsListPicker
.
PushItem
(
picker
);
GetBoard
()
->
m_Track
.
Insert
(
track
,
insertBeforeMe
);
GetBoard
()
->
m_Track
.
Insert
(
track
,
insertBeforeMe
);
}
}
...
@@ -510,8 +519,10 @@ void WinEDA_PcbFrame::End_Route( TRACK* aTrack, wxDC* DC )
...
@@ -510,8 +519,10 @@ void WinEDA_PcbFrame::End_Route( TRACK* aTrack, wxDC* DC )
// erase the old track, if exists
// erase the old track, if exists
if
(
g_AutoDeleteOldTrack
)
if
(
g_AutoDeleteOldTrack
)
{
{
Erase
OldTrack
(
this
,
GetBoard
(),
DC
,
firstTrack
,
newCount
);
Erase
RedundantTrack
(
DC
,
firstTrack
,
newCount
,
&
s_ItemsListPicker
);
}
}
SaveCopyInUndoList
(
s_ItemsListPicker
,
UR_UNSPECIFIED
);
s_ItemsListPicker
.
ClearItemsList
();
// s_ItemsListPicker is no more owner of picked items
/* compute the new rastnest : */
/* compute the new rastnest : */
test_1_net_connexion
(
DC
,
netcode
);
test_1_net_connexion
(
DC
,
netcode
);
...
...
pcbnew/initpcb.cpp
View file @
148a574e
...
@@ -55,11 +55,11 @@ void WinEDA_PcbGlobalDeleteFrame::AcceptPcbDelete( wxCommandEvent& event )
...
@@ -55,11 +55,11 @@ void WinEDA_PcbGlobalDeleteFrame::AcceptPcbDelete( wxCommandEvent& event )
{
{
gen_rastnest
=
true
;
gen_rastnest
=
true
;
/*
Segments used in Zone filling selection */
/*
ZEG_ZONE items used in Zone filling selection are now deprecated :
// for many reasons saving these items can create problems so they are not saved
* and are deleted but not put in undo buffer if exist
// (because they are numerous and can be deleted in zones operation)
*/
pcb
->
m_Zone
.
DeleteAll
();
pcb
->
m_Zone
.
DeleteAll
();
while
(
pcb
->
GetAreaCount
()
)
while
(
pcb
->
GetAreaCount
()
)
{
{
item
=
pcb
->
GetArea
(
0
);
item
=
pcb
->
GetArea
(
0
);
...
@@ -216,7 +216,7 @@ bool WinEDA_ModuleEditFrame::Clear_Pcb( bool aQuery )
...
@@ -216,7 +216,7 @@ bool WinEDA_ModuleEditFrame::Clear_Pcb( bool aQuery )
// Clear undo and redo lists
// Clear undo and redo lists
GetScreen
()
->
ClearUndoRedoList
();
GetScreen
()
->
ClearUndoRedoList
();
// Delete the current footprint
// Delete the current footprint
GetBoard
()
->
m_Modules
.
DeleteAll
();
GetBoard
()
->
m_Modules
.
DeleteAll
();
...
...
pcbnew/ioascii.cpp
View file @
148a574e
...
@@ -139,7 +139,7 @@ int WinEDA_BasePcbFrame::ReadListeSegmentDescr( FILE* File,
...
@@ -139,7 +139,7 @@ int WinEDA_BasePcbFrame::ReadListeSegmentDescr( FILE* File,
GetBoard
()
->
m_Track
.
Insert
(
newTrack
,
insertBeforeMe
);
GetBoard
()
->
m_Track
.
Insert
(
newTrack
,
insertBeforeMe
);
break
;
break
;
case
TYPE_ZONE
:
case
TYPE_ZONE
:
// this is now deprecated, but exits in old boards
newTrack
=
new
SEGZONE
(
GetBoard
()
);
newTrack
=
new
SEGZONE
(
GetBoard
()
);
GetBoard
()
->
m_Zone
.
Insert
(
(
SEGZONE
*
)
newTrack
,
(
SEGZONE
*
)
insertBeforeMe
);
GetBoard
()
->
m_Zone
.
Insert
(
(
SEGZONE
*
)
newTrack
,
(
SEGZONE
*
)
insertBeforeMe
);
break
;
break
;
...
@@ -846,7 +846,7 @@ int WinEDA_PcbFrame::ReadPcbFile( FILE* File, bool Append )
...
@@ -846,7 +846,7 @@ int WinEDA_PcbFrame::ReadPcbFile( FILE* File, bool Append )
{
{
ZONE_CONTAINER
*
zone_descr
=
new
ZONE_CONTAINER
(
GetBoard
());
ZONE_CONTAINER
*
zone_descr
=
new
ZONE_CONTAINER
(
GetBoard
());
zone_descr
->
ReadDescr
(
File
,
&
LineNum
);
zone_descr
->
ReadDescr
(
File
,
&
LineNum
);
if
(
zone_descr
->
GetNumCorners
(
)
>
2
)
// should
not
occur
if
(
zone_descr
->
GetNumCorners
(
)
>
2
)
// should
always
occur
GetBoard
()
->
Add
(
zone_descr
);
GetBoard
()
->
Add
(
zone_descr
);
else
delete
zone_descr
;
else
delete
zone_descr
;
continue
;
continue
;
...
...
pcbnew/move_or_drag_track.cpp
View file @
148a574e
...
@@ -38,12 +38,13 @@ bool s_StartPointVertical, s_EndPointVertical,
...
@@ -38,12 +38,13 @@ bool s_StartPointVertical, s_EndPointVertical,
s_StartPointHorizontal
,
s_EndPointHorizontal
;
// vertical or horizontal line indicators
s_StartPointHorizontal
,
s_EndPointHorizontal
;
// vertical or horizontal line indicators
bool
s_StartSegmentPresent
,
s_EndSegmentPresent
;
bool
s_StartSegmentPresent
,
s_EndSegmentPresent
;
static
PICKED_ITEMS_LIST
s_ItemsListPicker
;
/**************************************************************/
/**************************************************************/
static
void
Abort_MoveTrack
(
WinEDA_DrawPanel
*
Panel
,
wxDC
*
DC
)
static
void
Abort_MoveTrack
(
WinEDA_DrawPanel
*
Panel
,
wxDC
*
DC
)
/***************************************************************/
/***************************************************************/
/* routine d'annulation de la commande drag, copy ou move track si une piste est en cours
/** Abort function for commandes drag, copy ou move track
* de tracage, ou de sortie de l'application EDITRACK.
*/
*/
{
{
TRACK
*
NextS
;
TRACK
*
NextS
;
...
@@ -55,7 +56,7 @@ static void Abort_MoveTrack( WinEDA_DrawPanel* Panel, wxDC* DC )
...
@@ -55,7 +56,7 @@ static void Abort_MoveTrack( WinEDA_DrawPanel* Panel, wxDC* DC )
Panel
->
GetScreen
()
->
m_Curseur
=
PosInit
;
Panel
->
GetScreen
()
->
m_Curseur
=
PosInit
;
if
(
Panel
->
ManageCurseur
)
if
(
Panel
->
ManageCurseur
)
Panel
->
ManageCurseur
(
Panel
,
DC
,
TRUE
);
Panel
->
ManageCurseur
(
Panel
,
DC
,
true
);
Panel
->
GetScreen
()
->
m_Curseur
=
oldpos
;
Panel
->
GetScreen
()
->
m_Curseur
=
oldpos
;
g_HightLigt_Status
=
FALSE
;
g_HightLigt_Status
=
FALSE
;
...
@@ -116,6 +117,9 @@ static void Abort_MoveTrack( WinEDA_DrawPanel* Panel, wxDC* DC )
...
@@ -116,6 +117,9 @@ static void Abort_MoveTrack( WinEDA_DrawPanel* Panel, wxDC* DC )
Track
->
Draw
(
Panel
,
DC
,
GR_OR
);
Track
->
Draw
(
Panel
,
DC
,
GR_OR
);
}
}
// Clear the undo picker list:
s_ItemsListPicker
.
ClearListAndDeleteItems
();
g_HightLigth_NetCode
=
Old_HightLigth_NetCode
;
g_HightLigth_NetCode
=
Old_HightLigth_NetCode
;
g_HightLigt_Status
=
Old_HightLigt_Status
;
g_HightLigt_Status
=
Old_HightLigt_Status
;
if
(
g_HightLigt_Status
)
if
(
g_HightLigt_Status
)
...
@@ -132,7 +136,8 @@ static void Show_MoveNode( WinEDA_DrawPanel* panel, wxDC* DC, bool erase )
...
@@ -132,7 +136,8 @@ static void Show_MoveNode( WinEDA_DrawPanel* panel, wxDC* DC, bool erase )
/*************************************************************************/
/*************************************************************************/
/* Redraw the moved node according to the mouse cursor position */
/* Redraw the moved node according to the mouse cursor position */
{
{
int
ii
,
dx
,
dy
;
int
ii
;
wxPoint
moveVector
;
TRACK
*
Track
;
TRACK
*
Track
;
BASE_SCREEN
*
screen
=
panel
->
GetScreen
();
BASE_SCREEN
*
screen
=
panel
->
GetScreen
();
int
track_fill_copy
=
DisplayOpt
.
DisplayPcbTrackFill
;
int
track_fill_copy
=
DisplayOpt
.
DisplayPcbTrackFill
;
...
@@ -140,7 +145,7 @@ static void Show_MoveNode( WinEDA_DrawPanel* panel, wxDC* DC, bool erase )
...
@@ -140,7 +145,7 @@ static void Show_MoveNode( WinEDA_DrawPanel* panel, wxDC* DC, bool erase )
DisplayOpt
.
DisplayPcbTrackFill
=
FALSE
;
DisplayOpt
.
DisplayPcbTrackFill
=
FALSE
;
erase
=
TRUE
;
erase
=
true
;
/* erase the current moved track segments from screen */
/* erase the current moved track segments from screen */
if
(
erase
)
if
(
erase
)
...
@@ -152,9 +157,7 @@ static void Show_MoveNode( WinEDA_DrawPanel* panel, wxDC* DC, bool erase )
...
@@ -152,9 +157,7 @@ static void Show_MoveNode( WinEDA_DrawPanel* panel, wxDC* DC, bool erase )
/* set the new track coordinates */
/* set the new track coordinates */
wxPoint
Pos
=
screen
->
m_Curseur
;
wxPoint
Pos
=
screen
->
m_Curseur
;
dx
=
Pos
.
x
-
s_LastPos
.
x
;
moveVector
=
Pos
-
s_LastPos
;
dy
=
Pos
.
y
-
s_LastPos
.
y
;
s_LastPos
=
Pos
;
s_LastPos
=
Pos
;
ii
=
NbPtNewTrack
;
ii
=
NbPtNewTrack
;
...
@@ -162,15 +165,9 @@ static void Show_MoveNode( WinEDA_DrawPanel* panel, wxDC* DC, bool erase )
...
@@ -162,15 +165,9 @@ static void Show_MoveNode( WinEDA_DrawPanel* panel, wxDC* DC, bool erase )
for
(
;
(
ii
>
0
)
&&
(
Track
!=
NULL
);
ii
--
,
Track
=
Track
->
Next
()
)
for
(
;
(
ii
>
0
)
&&
(
Track
!=
NULL
);
ii
--
,
Track
=
Track
->
Next
()
)
{
{
if
(
Track
->
m_Flags
&
STARTPOINT
)
if
(
Track
->
m_Flags
&
STARTPOINT
)
{
Track
->
m_Start
+=
moveVector
;
Track
->
m_Start
.
x
+=
dx
;
Track
->
m_Start
.
y
+=
dy
;
}
if
(
Track
->
m_Flags
&
ENDPOINT
)
if
(
Track
->
m_Flags
&
ENDPOINT
)
{
Track
->
m_End
+=
moveVector
;
Track
->
m_End
.
x
+=
dx
;
Track
->
m_End
.
y
+=
dy
;
}
}
}
/* Redraw the current moved track segments */
/* Redraw the current moved track segments */
...
@@ -184,16 +181,10 @@ static void Show_MoveNode( WinEDA_DrawPanel* panel, wxDC* DC, bool erase )
...
@@ -184,16 +181,10 @@ static void Show_MoveNode( WinEDA_DrawPanel* panel, wxDC* DC, bool erase )
Track
->
Draw
(
panel
,
DC
,
draw_mode
);
Track
->
Draw
(
panel
,
DC
,
draw_mode
);
if
(
Track
->
m_Flags
&
STARTPOINT
)
if
(
Track
->
m_Flags
&
STARTPOINT
)
{
Track
->
m_Start
+=
moveVector
;
Track
->
m_Start
.
x
+=
dx
;
Track
->
m_Start
.
y
+=
dy
;
}
if
(
Track
->
m_Flags
&
ENDPOINT
)
if
(
Track
->
m_Flags
&
ENDPOINT
)
{
Track
->
m_End
+=
moveVector
;
Track
->
m_End
.
x
+=
dx
;
Track
->
m_End
.
y
+=
dy
;
}
Track
->
Draw
(
panel
,
DC
,
draw_mode
);
Track
->
Draw
(
panel
,
DC
,
draw_mode
);
}
}
...
@@ -456,7 +447,7 @@ bool InitialiseDragParameters()
...
@@ -456,7 +447,7 @@ bool InitialiseDragParameters()
/**********************************/
/**********************************/
/* Init variables (slope, Y intersect point, flags) for Show_Drag_Track_Segment_With_Cte_Slope()
/* Init variables (slope, Y intersect point, flags) for Show_Drag_Track_Segment_With_Cte_Slope()
* return
TRUE
if Ok, FALSE if dragging is not possible
* return
true
if Ok, FALSE if dragging is not possible
* (2 colinear segments)
* (2 colinear segments)
*/
*/
{
{
...
@@ -614,7 +605,7 @@ bool InitialiseDragParameters()
...
@@ -614,7 +605,7 @@ bool InitialiseDragParameters()
return
false
;
return
false
;
}
}
return
TRUE
;
return
true
;
}
}
...
@@ -685,15 +676,32 @@ void WinEDA_PcbFrame::Start_MoveOneNodeOrSegment( TRACK* track, wxDC* DC, int co
...
@@ -685,15 +676,32 @@ void WinEDA_PcbFrame::Start_MoveOneNodeOrSegment( TRACK* track, wxDC* DC, int co
track
->
m_Flags
|=
IS_DRAGGED
;
track
->
m_Flags
|=
IS_DRAGGED
;
}
}
// Prepare the Undo command
ITEM_PICKER
picker
(
track
,
UR_CHANGED
);
picker
.
m_Link
=
track
->
Copy
();
s_ItemsListPicker
.
PushItem
(
picker
);
DRAG_SEGM
*
pt_drag
=
g_DragSegmentList
;
for
(
;
pt_drag
!=
NULL
;
pt_drag
=
pt_drag
->
Pnext
)
{
TRACK
*
draggedtrack
=
pt_drag
->
m_Segm
;
picker
.
m_PickedItem
=
draggedtrack
;
picker
.
m_Link
=
draggedtrack
->
Copy
();
s_ItemsListPicker
.
PushItem
(
picker
);
draggedtrack
=
(
TRACK
*
)
picker
.
m_Link
;
draggedtrack
->
SetStatus
(
0
);
draggedtrack
->
m_Flags
=
0
;
}
s_LastPos
=
PosInit
;
s_LastPos
=
PosInit
;
DrawPanel
->
ManageCurseur
=
Show_MoveNode
;
DrawPanel
->
ManageCurseur
=
Show_MoveNode
;
DrawPanel
->
ForceCloseManageCurseur
=
Abort_MoveTrack
;
DrawPanel
->
ForceCloseManageCurseur
=
Abort_MoveTrack
;
g_HightLigth_NetCode
=
track
->
GetNet
();
g_HightLigth_NetCode
=
track
->
GetNet
();
g_HightLigt_Status
=
TRUE
;
g_HightLigt_Status
=
true
;
GetBoard
()
->
DrawHighLight
(
DrawPanel
,
DC
,
g_HightLigth_NetCode
);
GetBoard
()
->
DrawHighLight
(
DrawPanel
,
DC
,
g_HightLigth_NetCode
);
DrawPanel
->
ManageCurseur
(
DrawPanel
,
DC
,
TRUE
);
DrawPanel
->
ManageCurseur
(
DrawPanel
,
DC
,
true
);
}
}
...
@@ -727,7 +735,7 @@ bool WinEDA_PcbFrame::MergeCollinearTracks( TRACK* track, wxDC* DC, int end )
...
@@ -727,7 +735,7 @@ bool WinEDA_PcbFrame::MergeCollinearTracks( TRACK* track, wxDC* DC, int end )
/***********************************************************************************/
/***********************************************************************************/
/**
/**
* @todo: this function is broken, because it merge segments having different width or without any connectivity test.
* @todo: this function is broken, because it merge segments having different width or without any connectivity test.
* 2 collinear segments can be merged only in no other segment or v
ais
is connected to the common point
* 2 collinear segments can be merged only in no other segment or v
ia
is connected to the common point
* and if they have the same width. See cleanup.cpp for merge functions,
* and if they have the same width. See cleanup.cpp for merge functions,
* and consider Marque_Une_Piste() to locate segments that can be merged
* and consider Marque_Une_Piste() to locate segments that can be merged
*/
*/
...
@@ -796,30 +804,32 @@ void WinEDA_PcbFrame::Start_DragTrackSegmentAndKeepSlope( TRACK* track, wxDC* DC
...
@@ -796,30 +804,32 @@ void WinEDA_PcbFrame::Start_DragTrackSegmentAndKeepSlope( TRACK* track, wxDC* DC
};
};
#endif
#endif
s_StartSegmentPresent
=
s_EndSegmentPresent
=
TRUE
;
s_StartSegmentPresent
=
s_EndSegmentPresent
=
true
;
if
(
(
track
->
start
==
NULL
)
||
(
track
->
start
->
Type
()
==
TYPE_TRACK
)
)
if
(
(
track
->
start
==
NULL
)
||
(
track
->
start
->
Type
()
==
TYPE_TRACK
)
)
TrackToStartPoint
=
(
TRACK
*
)
Locate_Piste_Connectee
(
track
,
TrackToStartPoint
=
Locate_Piste_Connectee
(
track
,
GetBoard
()
->
m_Track
,
NULL
,
START
);
GetBoard
()
->
m_Track
,
NULL
,
START
);
// Test if more than one segment is connected to this point
// Test if more than one segment is connected to this point
if
(
TrackToStartPoint
)
if
(
TrackToStartPoint
)
{
{
TrackToStartPoint
->
SetState
(
BUSY
,
ON
);
TrackToStartPoint
->
SetState
(
BUSY
,
ON
);
if
(
Locate_Piste_Connectee
(
track
,
GetBoard
()
->
m_Track
,
NULL
,
START
)
)
if
(
(
TrackToStartPoint
->
Type
()
==
TYPE_VIA
)
||
error
=
TRUE
;
Locate_Piste_Connectee
(
track
,
GetBoard
()
->
m_Track
,
NULL
,
START
)
)
error
=
true
;
TrackToStartPoint
->
SetState
(
BUSY
,
OFF
);
TrackToStartPoint
->
SetState
(
BUSY
,
OFF
);
}
}
if
(
(
track
->
end
==
NULL
)
||
(
track
->
end
->
Type
()
==
TYPE_TRACK
)
)
if
(
(
track
->
end
==
NULL
)
||
(
track
->
end
->
Type
()
==
TYPE_TRACK
)
)
TrackToEndPoint
=
(
TRACK
*
)
Locate_Piste_Connectee
(
track
,
GetBoard
()
->
m_Track
,
NULL
,
END
);
TrackToEndPoint
=
Locate_Piste_Connectee
(
track
,
GetBoard
()
->
m_Track
,
NULL
,
END
);
// Test if more than one segment is connected to this point
// Test if more than one segment is connected to this point
if
(
TrackToEndPoint
)
if
(
TrackToEndPoint
)
{
{
TrackToEndPoint
->
SetState
(
BUSY
,
ON
);
TrackToEndPoint
->
SetState
(
BUSY
,
ON
);
if
(
Locate_Piste_Connectee
(
track
,
GetBoard
()
->
m_Track
,
NULL
,
END
)
)
if
(
(
TrackToStartPoint
->
Type
()
==
TYPE_VIA
)
||
error
=
TRUE
;
Locate_Piste_Connectee
(
track
,
GetBoard
()
->
m_Track
,
NULL
,
END
)
)
error
=
true
;
TrackToEndPoint
->
SetState
(
BUSY
,
OFF
);
TrackToEndPoint
->
SetState
(
BUSY
,
OFF
);
}
}
...
@@ -874,9 +884,23 @@ void WinEDA_PcbFrame::Start_DragTrackSegmentAndKeepSlope( TRACK* track, wxDC* DC
...
@@ -874,9 +884,23 @@ void WinEDA_PcbFrame::Start_DragTrackSegmentAndKeepSlope( TRACK* track, wxDC* DC
DrawPanel
->
ForceCloseManageCurseur
=
Abort_MoveTrack
;
DrawPanel
->
ForceCloseManageCurseur
=
Abort_MoveTrack
;
g_HightLigth_NetCode
=
track
->
GetNet
();
g_HightLigth_NetCode
=
track
->
GetNet
();
g_HightLigt_Status
=
TRUE
;
g_HightLigt_Status
=
true
;
GetBoard
()
->
DrawHighLight
(
DrawPanel
,
DC
,
g_HightLigth_NetCode
);
GetBoard
()
->
DrawHighLight
(
DrawPanel
,
DC
,
g_HightLigth_NetCode
);
// Prepare the Undo command
DRAG_SEGM
*
pt_drag
=
g_DragSegmentList
;
ITEM_PICKER
picker
(
NULL
,
UR_CHANGED
);
for
(
;
pt_drag
!=
NULL
;
pt_drag
=
pt_drag
->
Pnext
)
{
TRACK
*
draggedtrack
=
pt_drag
->
m_Segm
;
picker
.
m_PickedItem
=
draggedtrack
;
picker
.
m_Link
=
draggedtrack
->
Copy
();
s_ItemsListPicker
.
PushItem
(
picker
);
draggedtrack
=
(
TRACK
*
)
picker
.
m_Link
;
draggedtrack
->
SetStatus
(
0
);
draggedtrack
->
m_Flags
=
0
;
}
if
(
!
InitialiseDragParameters
()
)
if
(
!
InitialiseDragParameters
()
)
{
{
DisplayError
(
this
,
_
(
"Unable to drag this segment: two collinear segments"
)
);
DisplayError
(
this
,
_
(
"Unable to drag this segment: two collinear segments"
)
);
...
@@ -888,7 +912,7 @@ void WinEDA_PcbFrame::Start_DragTrackSegmentAndKeepSlope( TRACK* track, wxDC* DC
...
@@ -888,7 +912,7 @@ void WinEDA_PcbFrame::Start_DragTrackSegmentAndKeepSlope( TRACK* track, wxDC* DC
/**********************************************************************/
/**********************************************************************/
bool
WinEDA_PcbFrame
::
PlaceDraggedTrackSegment
(
TRACK
*
Track
,
wxDC
*
DC
)
bool
WinEDA_PcbFrame
::
PlaceDragged
OrMoved
TrackSegment
(
TRACK
*
Track
,
wxDC
*
DC
)
/**********************************************************************/
/**********************************************************************/
/* Place a dragged (or moved) track segment or via */
/* Place a dragged (or moved) track segment or via */
{
{
...
@@ -923,7 +947,7 @@ bool WinEDA_PcbFrame::PlaceDraggedTrackSegment( TRACK* Track, wxDC* DC )
...
@@ -923,7 +947,7 @@ bool WinEDA_PcbFrame::PlaceDraggedTrackSegment( TRACK* Track, wxDC* DC )
Track
->
SetState
(
EDIT
,
OFF
);
Track
->
SetState
(
EDIT
,
OFF
);
Track
->
Draw
(
DrawPanel
,
DC
,
draw_mode
);
Track
->
Draw
(
DrawPanel
,
DC
,
draw_mode
);
/* Draw d
d
ragged tracks */
/* Draw dragged tracks */
pt_drag
=
g_DragSegmentList
;
pt_drag
=
g_DragSegmentList
;
for
(
;
pt_drag
;
pt_drag
=
pt_drag
->
Pnext
)
for
(
;
pt_drag
;
pt_drag
=
pt_drag
->
Pnext
)
{
{
...
@@ -941,6 +965,9 @@ bool WinEDA_PcbFrame::PlaceDraggedTrackSegment( TRACK* Track, wxDC* DC )
...
@@ -941,6 +965,9 @@ bool WinEDA_PcbFrame::PlaceDraggedTrackSegment( TRACK* Track, wxDC* DC )
EraseDragListe
();
EraseDragListe
();
SaveCopyInUndoList
(
s_ItemsListPicker
,
UR_UNSPECIFIED
);
s_ItemsListPicker
.
ClearItemsList
();
// s_ItemsListPicker is no more owner of picked items
GetScreen
()
->
SetModify
();
GetScreen
()
->
SetModify
();
DrawPanel
->
ManageCurseur
=
NULL
;
DrawPanel
->
ManageCurseur
=
NULL
;
DrawPanel
->
ForceCloseManageCurseur
=
NULL
;
DrawPanel
->
ForceCloseManageCurseur
=
NULL
;
...
@@ -948,7 +975,7 @@ bool WinEDA_PcbFrame::PlaceDraggedTrackSegment( TRACK* Track, wxDC* DC )
...
@@ -948,7 +975,7 @@ bool WinEDA_PcbFrame::PlaceDraggedTrackSegment( TRACK* Track, wxDC* DC )
if
(
current_net_code
>
0
)
if
(
current_net_code
>
0
)
test_1_net_connexion
(
DC
,
current_net_code
);
test_1_net_connexion
(
DC
,
current_net_code
);
return
TRUE
;
return
true
;
}
}
...
@@ -985,60 +1012,55 @@ BOARD_ITEM* LocateLockPoint( BOARD* Pcb, wxPoint pos, int LayerMask )
...
@@ -985,60 +1012,55 @@ BOARD_ITEM* LocateLockPoint( BOARD* Pcb, wxPoint pos, int LayerMask )
/******************************************************************************/
/******************************************************************************/
TRACK
*
CreateLockPoint
(
int
*
pX
,
int
*
pY
,
TRACK
*
ptsegm
,
TRACK
*
refsegm
)
TRACK
*
CreateLockPoint
(
wxPoint
&
aRefPoint
,
TRACK
*
aSegm
,
TRACK
*
aRefSegm
,
PICKED_ITEMS_LIST
*
aItemsListPicker
)
/******************************************************************************/
/******************************************************************************/
/* Routine de creation d'un point intermediaire sur un segment
/* Routine de creation d'un point intermediaire sur un segment
* le segment
pts
egm est casse en 2 segments se raccordant au point pX, pY
* le segment
aS
egm 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
aRefPoint
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,
* et le point cree est l'intersection des 2 axes des segments aSegm et refsegm
* et le point cree est l'intersection des 2 axes des segments ptsegm et
* retourne la valeur exacte de aRefPoint
* refsegm
* Si aSegm pointe sur une via:
* retourne la valeur exacte de pX et pY
* retourne la valeur exacte de aRefPoint et ptsegm,
* Si ptsegm pointe sur une via:
* 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 */
if
(
(
ptsegm
->
m_Start
.
x
==
*
pX
)
&&
(
ptsegm
->
m_Start
.
y
==
*
pY
)
)
return
NULL
;
if
(
(
ptsegm
->
m_End
.
x
==
*
pX
)
&&
(
ptsegm
->
m_End
.
y
==
*
pY
)
)
if
(
aSegm
->
m_Start
==
aRefPoint
||
aSegm
->
m_End
==
aRefPoint
)
return
NULL
;
return
NULL
;
/*
le point n'est pas sur une extremite de piste
*/
/*
A via is a good lock point
*/
if
(
pts
egm
->
Type
()
==
TYPE_VIA
)
if
(
aS
egm
->
Type
()
==
TYPE_VIA
)
{
{
*
pX
=
ptsegm
->
m_Start
.
x
;
aRefPoint
=
aSegm
->
m_Start
;
*
pY
=
ptsegm
->
m_Start
.
y
;
return
aSegm
;
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
-
pts
egm
->
m_Start
.
x
;
cX
=
aRefPoint
.
x
-
aS
egm
->
m_Start
.
x
;
cY
=
*
pY
-
pts
egm
->
m_Start
.
y
;
cY
=
aRefPoint
.
y
-
aS
egm
->
m_Start
.
y
;
dx
=
ptsegm
->
m_End
.
x
-
pts
egm
->
m_Start
.
x
;
dx
=
aSegm
->
m_End
.
x
-
aS
egm
->
m_Start
.
x
;
dy
=
ptsegm
->
m_End
.
y
-
pts
egm
->
m_Start
.
y
;
dy
=
aSegm
->
m_End
.
y
-
aS
egm
->
m_Start
.
y
;
// ***** A COMPLETER : non utilise
// Not yet used:
if
(
refsegm
)
#if 0
int ox, oy, fx, fy; /* coord de refsegm / origine de prsegm */
if( aRefSegm )
{
{
ox
=
refsegm
->
m_Start
.
x
-
pts
egm
->
m_Start
.
x
;
ox =
aRefSegm->m_Start.x - aS
egm->m_Start.x;
oy
=
refsegm
->
m_Start
.
y
-
pts
egm
->
m_Start
.
y
;
oy =
aRefSegm->m_Start.y - aS
egm->m_Start.y;
fx
=
refsegm
->
m_End
.
x
-
pts
egm
->
m_Start
.
x
;
fx =
aRefSegm->m_End.x - aS
egm->m_Start.x;
fy
=
refsegm
->
m_End
.
y
-
pts
egm
->
m_Start
.
y
;
fy =
aRefSegm->m_End.y - aS
egm->m_Start.y;
}
}
#endif
/* 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
)
if
(
dx
==
0
)
...
@@ -1050,32 +1072,44 @@ TRACK* CreateLockPoint( int* pX, int* pY, TRACK* ptsegm, TRACK* refsegm )
...
@@ -1050,32 +1072,44 @@ TRACK* CreateLockPoint( int* pX, int* pY, TRACK* ptsegm, TRACK* refsegm )
* segment, debutant au point intermediaire
* segment, debutant au point intermediaire
*/
*/
cX
+=
pts
egm
->
m_Start
.
x
;
cX
+=
aS
egm
->
m_Start
.
x
;
cY
+=
pts
egm
->
m_Start
.
y
;
cY
+=
aS
egm
->
m_Start
.
y
;
TRACK
*
newTrack
=
ptsegm
->
Copy
();
TRACK
*
newTrack
=
aSegm
->
Copy
();
if
(
aItemsListPicker
)
{
ITEM_PICKER
picker
(
newTrack
,
UR_NEW
);
aItemsListPicker
->
PushItem
(
picker
);
}
DLIST
<
TRACK
>*
list
=
(
DLIST
<
TRACK
>*
)
ptsegm
->
GetList
();
DLIST
<
TRACK
>*
list
=
(
DLIST
<
TRACK
>*
)
aSegm
->
GetList
();
wxASSERT
(
list
);
wxASSERT
(
list
);
list
->
Insert
(
newTrack
,
pts
egm
->
Next
()
);
list
->
Insert
(
newTrack
,
aS
egm
->
Next
()
);
/* correction du pointeur de fin du nouveau segment */
/* correction du pointeur de fin du nouveau segment */
newTrack
->
end
=
pts
egm
->
end
;
newTrack
->
end
=
aS
egm
->
end
;
/* le segment primitif finit au nouveau point : */
/* le segment primitif finit au nouveau point : */
ptsegm
->
m_End
.
x
=
cX
;
if
(
aItemsListPicker
)
ptsegm
->
m_End
.
y
=
cY
;
{
ITEM_PICKER
picker
(
aSegm
,
UR_CHANGED
);
picker
.
m_Link
=
aSegm
->
Copy
();
aItemsListPicker
->
PushItem
(
picker
);
}
aSegm
->
m_End
.
x
=
cX
;
aSegm
->
m_End
.
y
=
cY
;
pts
egm
->
SetState
(
END_ONPAD
,
OFF
);
aS
egm
->
SetState
(
END_ONPAD
,
OFF
);
/* le nouveau segment debute au nouveau point : */
/* le nouveau segment debute au nouveau point : */
pts
egm
=
newTrack
;;
aS
egm
=
newTrack
;;
pts
egm
->
m_Start
.
x
=
cX
;
aS
egm
->
m_Start
.
x
=
cX
;
pts
egm
->
m_Start
.
y
=
cY
;
aS
egm
->
m_Start
.
y
=
cY
;
pts
egm
->
SetState
(
BEGIN_ONPAD
,
OFF
);
aS
egm
->
SetState
(
BEGIN_ONPAD
,
OFF
);
*
pX
=
cX
;
aRefPoint
.
x
=
cX
;
*
pY
=
cY
;
aRefPoint
.
y
=
cY
;
return
pts
egm
;
return
aS
egm
;
}
}
pcbnew/onleftclick.cpp
View file @
148a574e
...
@@ -50,7 +50,7 @@ void WinEDA_PcbFrame::OnLeftClick( wxDC* DC, const wxPoint& MousePos )
...
@@ -50,7 +50,7 @@ void WinEDA_PcbFrame::OnLeftClick( wxDC* DC, const wxPoint& MousePos )
case
TYPE_VIA
:
case
TYPE_VIA
:
if
(
DrawStruct
->
m_Flags
&
IS_DRAGGED
)
if
(
DrawStruct
->
m_Flags
&
IS_DRAGGED
)
{
{
PlaceDraggedTrackSegment
(
(
TRACK
*
)
DrawStruct
,
DC
);
PlaceDragged
OrMoved
TrackSegment
(
(
TRACK
*
)
DrawStruct
,
DC
);
exit
=
true
;
exit
=
true
;
}
}
break
;
break
;
...
...
pcbnew/protos.h
View file @
148a574e
...
@@ -208,9 +208,7 @@ TRACK* Locate_Pistes( TRACK* start_adresse, int typeloc );
...
@@ -208,9 +208,7 @@ TRACK* Locate_Pistes( TRACK* start_adresse, int typeloc );
DRAWSEGMENT
*
Locate_Segment_Pcb
(
BOARD
*
Pcb
,
int
LayerSearch
,
int
typeloc
);
DRAWSEGMENT
*
Locate_Segment_Pcb
(
BOARD
*
Pcb
,
int
LayerSearch
,
int
typeloc
);
D_PAD
*
Fast_Locate_Pad_Connecte
(
BOARD
*
Pcb
,
const
wxPoint
&
ref_pos
,
int
layer
);
D_PAD
*
Fast_Locate_Pad_Connecte
(
BOARD
*
Pcb
,
const
wxPoint
&
ref_pos
,
int
layer
);
/* Routine cherchant le pad contenant le point px,py, sur la couche layer
/* Routine cherchant le pad contenant le point px,py, sur la couche layer
* ( extremite de piste )
* ( extremite de piste )
* La liste des pads doit deja exister.
* La liste des pads doit deja exister.
...
@@ -290,30 +288,6 @@ void ListSetState( EDA_BaseStruct* Start, int Nbitem, int State, int onoff );
...
@@ -290,30 +288,6 @@ void ListSetState( EDA_BaseStruct* Start, int Nbitem, int State, int onoff );
/* Met a jour le membre .state d'une chaine de structures */
/* Met a jour le membre .state d'une chaine de structures */
/************/
/* DRC.CPP : */
/************/
int
Drc
(
WinEDA_BasePcbFrame
*
frame
,
wxDC
*
DC
,
TRACK
*
pt_segment
,
TRACK
*
pt_start_buffer
,
int
show_err
);
/* Teste le segment pointe par pt_segment:
* debsegment = adresse du segment a tester
* pt_start_buffer = adresse de la zone piste
* show_err (flag) si 0 pas d'affichage d'erreur sur ecran
* retourne :
* BAD_DRC (1) si Violation DRC
* OK_DRC (0) si OK */
/*****************/
/* TR_MODIF.CPP : */
/*****************/
int
EraseOldTrack
(
WinEDA_BasePcbFrame
*
frame
,
BOARD
*
Pcb
,
wxDC
*
DC
,
TRACK
*
pt_new_track
,
int
nbptnewpiste
);
void
Modif_Auto_Route
(
TRACK
*
pt_debut_new_piste
);
/**************/
/**************/
/* CLEAN.CPP : */
/* CLEAN.CPP : */
/**************/
/**************/
...
@@ -324,21 +298,6 @@ int Netliste_Controle_piste( WinEDA_PcbFrame* frame, wxDC* DC, int affiche );
...
@@ -324,21 +298,6 @@ int Netliste_Controle_piste( WinEDA_PcbFrame* frame, wxDC* DC, int affiche );
* de net_code differents */
* de net_code differents */
/************/
/* BLOCK.CPP */
/************/
void
Block_Affiche
(
int
on_off
);
/*
* routine de trace du cadre d'un Block en cours de delimitation
* Si on_off = 0 : effacement du cadre
* Si on_off = 1 : affichage du cadre */
void
Trace_Block
(
WinEDA_DrawPanel
*
panel
,
wxDC
*
DC
,
int
ox
,
int
oy
,
int
fx
,
int
fy
,
int
color
);
/* Routine de trace d'un rectangle symbolisant un block
* (toujours en mode XOR) */
/************/
/************/
/* ZONES.CPP */
/* ZONES.CPP */
/************/
/************/
...
@@ -362,8 +321,6 @@ void MasqueAttributs( int* masque_set, int* masque_clr );
...
@@ -362,8 +321,6 @@ void MasqueAttributs( int* masque_set, int* masque_clr );
/* DUPLTRAC.CPP */
/* DUPLTRAC.CPP */
/***************/
/***************/
BOARD_ITEM
*
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:
...
@@ -371,24 +328,26 @@ BOARD_ITEM* LocateLockPoint( BOARD* Pcb, wxPoint pos, int LayerMask );
...
@@ -371,24 +328,26 @@ BOARD_ITEM* LocateLockPoint( BOARD* Pcb, wxPoint pos, int LayerMask );
* - 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
aPos
du point tst
* masque des couches a tester
*
aLayerMask
masque des couches a tester
*/
*/
BOARD_ITEM
*
LocateLockPoint
(
BOARD
*
aPcb
,
wxPoint
aPos
,
int
aLayerMask
);
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 aSegm 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 aRefPoint 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 aRefSegm != NULL refsegm est pointeur sur le segment incident,
* et le point cree est l'ntersection des 2 axes des segments ptsegm et
* et le point cree est l'intersection des 2 axes des segments ptsegm et aRefSegm
* refsegm
* retourne la valeur exacte de aRefPoint
* retourne la valeur exacte de pX et pY
* Si aSegm pointe sur une via:
* retourne la valeur exacte de aRefPoint et aSegm,
* mais ne cree pas de point supplementaire
*/
*/
TRACK
*
CreateLockPoint
(
wxPoint
&
aRefPoint
,
TRACK
*
aSegm
,
TRACK
*
aRefSegm
,
PICKED_ITEMS_LIST
*
aItemsListPicker
);
/****************/
/****************/
/* CONTROLE.CPP */
/* CONTROLE.CPP */
...
...
pcbnew/tr_modif.cpp
View file @
148a574e
...
@@ -4,25 +4,23 @@
...
@@ -4,25 +4,23 @@
/**************************************************/
/**************************************************/
#include "fctsys.h"
#include "fctsys.h"
#include "gr_basic.h"
#include "common.h"
#include "common.h"
#include "pcbnew.h"
#include "pcbnew.h"
#include "wxPcbStruct.h"
#include "protos.h"
#include "protos.h"
/*********************************************************************/
/** function EraseRedundantTrack
int
EraseOldTrack
(
WinEDA_BasePcbFrame
*
frame
,
BOARD
*
Pcb
,
wxDC
*
DC
,
* Called after creating a track
TRACK
*
pt_new_track
,
int
nbptnewpiste
)
* Remove (if exists) the old track that have the same starting and the same ending point as the new created track
/*********************************************************************/
* (this is the redunding track)
* @param aDC = the current device context (can be NULL)
/* Routine d'effacement de la piste redondante a la piste nouvellement cree
* @param aNewTrack = the new created track (a pointer to a segment of the track list)
* pointee par pt_new_track (nbptnewpiste segments)
* @param aNewTrackSegmentsCount = number of segments in this new track
*
* @param aItemsListPicker = the list picker to use for an undo command (can be NULL)
* la piste cree est supposee constituee de segments contigus en memoire avec:
* point de depart pt_newtrack->m_Start.x,y
* point d'arrivee pt_newtrack->m_End.x,y
*/
*/
int
WinEDA_PcbFrame
::
EraseRedundantTrack
(
wxDC
*
aDC
,
TRACK
*
aNewTrack
,
int
aNewTrackSegmentsCount
,
PICKED_ITEMS_LIST
*
aItemsListPicker
)
{
{
TRACK
*
StartTrack
,
*
EndTrack
;
/* Pointeurs des segments de debut et fin
TRACK
*
StartTrack
,
*
EndTrack
;
/* Pointeurs des segments de debut et fin
* (extremites) de la nouvelle piste */
* (extremites) de la nouvelle piste */
...
@@ -35,31 +33,31 @@ int EraseOldTrack( WinEDA_BasePcbFrame* frame, BOARD* Pcb, wxDC* DC,
...
@@ -35,31 +33,31 @@ int EraseOldTrack( WinEDA_BasePcbFrame* frame, BOARD* Pcb, wxDC* DC,
TRACK
*
BufDeb
,
*
BufEnd
;
/* Pointeurs de debut et de fin de la zone
TRACK
*
BufDeb
,
*
BufEnd
;
/* Pointeurs de debut et de fin de la zone
* des pistes equipotentielles */
* des pistes equipotentielles */
int
netcode
=
pt_new_t
rack
->
GetNet
();
int
netcode
=
aNewT
rack
->
GetNet
();
/* Reconstitution de la piste complete ( la nouvelle piste
/* Reconstitution de la piste complete ( la nouvelle piste
* a pu demarrer sur un segment de piste en l'air
* a pu demarrer sur un segment de piste en l'air
*/
*/
ListSetState
(
pt_new_track
,
nbptnewpiste
,
BUSY
,
OFF
);
ListSetState
(
aNewTrack
,
aNewTrackSegmentsCount
,
BUSY
,
OFF
);
/* si la novelle piste commence par une via, il est plus sur de rechercher
/* si la no
u
velle piste commence par une via, il est plus sur de rechercher
* la piste complete en utilisant le segment suivant comme reference, car
* la piste complete en utilisant le segment suivant comme reference, car
* une via est souvent sur un carrefour de segments, et ne caracterise pas
* une via est souvent sur un carrefour de segments, et ne caracterise pas
* une piste */
* une piste */
if
(
pt_new_track
->
Type
()
==
TYPE_VIA
&&
(
nbptnewpiste
>
1
)
)
if
(
aNewTrack
->
Type
()
==
TYPE_VIA
&&
(
aNewTrackSegmentsCount
>
1
)
)
pt_new_track
=
pt_new_t
rack
->
Next
();
aNewTrack
=
aNewT
rack
->
Next
();
pt_new_track
=
Marque_Une_Piste
(
frame
,
DC
,
pt_new_track
,
&
nbptnewpiste
,
0
);
aNewTrack
=
Marque_Une_Piste
(
this
,
aDC
,
aNewTrack
,
&
aNewTrackSegmentsCount
,
0
);
wxASSERT
(
pt_new_t
rack
);
wxASSERT
(
aNewT
rack
);
#if 0 && defined(DEBUG)
#if 0 && defined(DEBUG)
TRACK* EndNewTrack; /* Pointeur sur le dernier segment de la liste
TRACK* EndNewTrack; /* Pointeur sur le dernier segment de la liste
* chainee de la mouvelle piste */
* chainee de la mouvelle piste */
EndNewTrack =
pt_new_t
rack;
EndNewTrack =
aNewT
rack;
for( ii = 1; ii <
nbptnewpiste
; ii++ )
for( ii = 1; ii <
aNewTrackSegmentsCount
; ii++ )
{
{
wxASSERT( EndNewTrack->GetState(-1) != 0 );
wxASSERT( EndNewTrack->GetState(-1) != 0 );
D(printf("track %p is newly part of net %d\n", EndNewTrack, netcode );)
D(printf("track %p is newly part of net %d\n", EndNewTrack, netcode );)
...
@@ -69,13 +67,13 @@ int EraseOldTrack( WinEDA_BasePcbFrame* frame, BOARD* Pcb, wxDC* DC,
...
@@ -69,13 +67,13 @@ int EraseOldTrack( WinEDA_BasePcbFrame* frame, BOARD* Pcb, wxDC* DC,
wxASSERT( EndNewTrack->GetState(-1) != 0 );
wxASSERT( EndNewTrack->GetState(-1) != 0 );
D(printf("track %p is newly part of net %d\n", EndNewTrack, netcode );)
D(printf("track %p is newly part of net %d\n", EndNewTrack, netcode );)
for( TRACK* track = Pcb->m_Track; track; track = track->Next() )
for( TRACK* track =
m_
Pcb->m_Track; track; track = track->Next() )
track->Show( 0, std::cout );
track->Show( 0, std::cout );
#endif
#endif
/* Calcul des limites de recherche des segments de piste */
/* Calcul des limites de recherche des segments de piste */
/* BufDeb pointe le 1er segment utile */
/* BufDeb pointe le 1er segment utile */
BufDeb
=
Pcb
->
m_Track
->
GetStartNetCode
(
netcode
);
BufDeb
=
m_
Pcb
->
m_Track
->
GetStartNetCode
(
netcode
);
/* BufEnd Pointe le dernier segment */
/* BufEnd Pointe le dernier segment */
BufEnd
=
BufDeb
->
GetEndNetCode
(
netcode
);
BufEnd
=
BufDeb
->
GetEndNetCode
(
netcode
);
...
@@ -90,7 +88,7 @@ int EraseOldTrack( WinEDA_BasePcbFrame* frame, BOARD* Pcb, wxDC* DC,
...
@@ -90,7 +88,7 @@ int EraseOldTrack( WinEDA_BasePcbFrame* frame, BOARD* Pcb, wxDC* DC,
}
}
/* Calcul des points limites de la nouvelle piste */
/* Calcul des points limites de la nouvelle piste */
if
(
ReturnEndsTrack
(
pt_new_track
,
nbptnewpiste
,
if
(
ReturnEndsTrack
(
aNewTrack
,
aNewTrackSegmentsCount
,
&
StartTrack
,
&
EndTrack
)
==
0
)
&
StartTrack
,
&
EndTrack
)
==
0
)
return
0
;
return
0
;
...
@@ -110,7 +108,7 @@ int EraseOldTrack( WinEDA_BasePcbFrame* frame, BOARD* Pcb, wxDC* DC,
...
@@ -110,7 +108,7 @@ int EraseOldTrack( WinEDA_BasePcbFrame* frame, BOARD* Pcb, wxDC* DC,
endmasklayer
=
EndTrack
->
ReturnMaskLayer
();
endmasklayer
=
EndTrack
->
ReturnMaskLayer
();
/* Il peut y avoir une via ou un pad sur les extremites: */
/* Il peut y avoir une via ou un pad sur les extremites: */
pt_segm
=
Fast_Locate_Via
(
Pcb
->
m_Track
,
NULL
,
start
,
startmasklayer
);
pt_segm
=
Fast_Locate_Via
(
m_
Pcb
->
m_Track
,
NULL
,
start
,
startmasklayer
);
if
(
pt_segm
)
if
(
pt_segm
)
startmasklayer
|=
pt_segm
->
ReturnMaskLayer
();
startmasklayer
|=
pt_segm
->
ReturnMaskLayer
();
...
@@ -121,7 +119,7 @@ int EraseOldTrack( WinEDA_BasePcbFrame* frame, BOARD* Pcb, wxDC* DC,
...
@@ -121,7 +119,7 @@ int EraseOldTrack( WinEDA_BasePcbFrame* frame, BOARD* Pcb, wxDC* DC,
startmasklayer
|=
pt_pad
->
m_Masque_Layer
;
startmasklayer
|=
pt_pad
->
m_Masque_Layer
;
}
}
pt_segm
=
Fast_Locate_Via
(
Pcb
->
m_Track
,
NULL
,
end
,
endmasklayer
);
pt_segm
=
Fast_Locate_Via
(
m_
Pcb
->
m_Track
,
NULL
,
end
,
endmasklayer
);
if
(
pt_segm
)
if
(
pt_segm
)
endmasklayer
|=
pt_segm
->
ReturnMaskLayer
();
endmasklayer
|=
pt_segm
->
ReturnMaskLayer
();
...
@@ -134,7 +132,7 @@ int EraseOldTrack( WinEDA_BasePcbFrame* frame, BOARD* Pcb, wxDC* DC,
...
@@ -134,7 +132,7 @@ int EraseOldTrack( WinEDA_BasePcbFrame* frame, BOARD* Pcb, wxDC* DC,
/* Marquage a DELETED de la piste nouvelle (qui ne doit pas intervenir
/* Marquage a DELETED de la piste nouvelle (qui ne doit pas intervenir
* dans la recherche d'autres connexions)
* dans la recherche d'autres connexions)
*/
*/
ListSetState
(
pt_new_track
,
nbptnewpiste
,
DELETED
,
ON
);
ListSetState
(
aNewTrack
,
aNewTrackSegmentsCount
,
DELETED
,
ON
);
/* test : un segment doit etre connecte au point de depart car sinon
/* test : un segment doit etre connecte au point de depart car sinon
* il est inutile d'analyser l'autre point
* il est inutile d'analyser l'autre point
...
@@ -145,7 +143,7 @@ int EraseOldTrack( WinEDA_BasePcbFrame* frame, BOARD* Pcb, wxDC* DC,
...
@@ -145,7 +143,7 @@ int EraseOldTrack( WinEDA_BasePcbFrame* frame, BOARD* Pcb, wxDC* DC,
if
(
pt_segm
==
NULL
)
/* Pas de piste reliee au point de depart */
if
(
pt_segm
==
NULL
)
/* Pas de piste reliee au point de depart */
{
{
/* Suppression du flag DELETED */
/* Suppression du flag DELETED */
ListSetState
(
pt_new_track
,
nbptnewpiste
,
DELETED
,
OFF
);
ListSetState
(
aNewTrack
,
aNewTrackSegmentsCount
,
DELETED
,
OFF
);
return
0
;
return
0
;
}
}
...
@@ -188,9 +186,9 @@ int EraseOldTrack( WinEDA_BasePcbFrame* frame, BOARD* Pcb, wxDC* DC,
...
@@ -188,9 +186,9 @@ int EraseOldTrack( WinEDA_BasePcbFrame* frame, BOARD* Pcb, wxDC* DC,
/* Marquage a EDIT de la piste nouvelle (qui ne doit pas intervenir
/* Marquage a EDIT de la piste nouvelle (qui ne doit pas intervenir
* dans la recherche d'autres pistes) */
* dans la recherche d'autres pistes) */
ListSetState
(
pt_new_track
,
nbptnewpiste
,
DELETED
,
OFF
);
ListSetState
(
aNewTrack
,
aNewTrackSegmentsCount
,
DELETED
,
OFF
);
ListSetState
(
pt_new_track
,
nbptnewpiste
,
EDIT
,
ON
);
ListSetState
(
aNewTrack
,
aNewTrackSegmentsCount
,
EDIT
,
ON
);
/* Examen de tous les segments marques */
/* Examen de tous les segments marques */
while
(
nbconnect
)
while
(
nbconnect
)
...
@@ -206,7 +204,7 @@ int EraseOldTrack( WinEDA_BasePcbFrame* frame, BOARD* Pcb, wxDC* DC,
...
@@ -206,7 +204,7 @@ int EraseOldTrack( WinEDA_BasePcbFrame* frame, BOARD* Pcb, wxDC* DC,
nbconnect
--
;
nbconnect
--
;
pt_del
->
SetState
(
CHAIN
,
OFF
);
pt_del
->
SetState
(
CHAIN
,
OFF
);
pt_del
=
Marque_Une_Piste
(
frame
,
DC
,
pt_del
,
&
nb_segm
,
0
);
pt_del
=
Marque_Une_Piste
(
this
,
a
DC
,
pt_del
,
&
nb_segm
,
0
);
/* Test si La piste marquee est redondante, c'est a dire si l'un des
/* Test si La piste marquee est redondante, c'est a dire si l'un des
* segments marques est connecte au point de depart de la piste nouvelle
* segments marques est connecte au point de depart de la piste nouvelle
...
@@ -222,21 +220,31 @@ int EraseOldTrack( WinEDA_BasePcbFrame* frame, BOARD* Pcb, wxDC* DC,
...
@@ -222,21 +220,31 @@ int EraseOldTrack( WinEDA_BasePcbFrame* frame, BOARD* Pcb, wxDC* DC,
{
{
/* la piste marquee peut etre effacee */
/* la piste marquee peut etre effacee */
TRACK
*
NextS
;
TRACK
*
NextS
;
Trace_Une_Piste
(
frame
->
DrawPanel
,
DC
,
pt_del
,
nb_segm
,
GR_XOR
|
GR_SURBRILL
);
Trace_Une_Piste
(
DrawPanel
,
a
DC
,
pt_del
,
nb_segm
,
GR_XOR
|
GR_SURBRILL
);
for
(
jj
=
0
;
jj
<
nb_segm
;
jj
++
,
pt_del
=
NextS
)
for
(
jj
=
0
;
jj
<
nb_segm
;
jj
++
,
pt_del
=
NextS
)
{
{
NextS
=
pt_del
->
Next
();
NextS
=
pt_del
->
Next
();
pt_del
->
DeleteStructure
();
if
(
aItemsListPicker
)
{
pt_del
->
UnLink
();
pt_del
->
SetStatus
(
0
);
pt_del
->
m_Flags
=
0
;
ITEM_PICKER
picker
(
pt_del
,
UR_DELETED
);
aItemsListPicker
->
PushItem
(
picker
);
}
else
pt_del
->
DeleteStructure
();
}
}
/* nettoyage des flags */
/* nettoyage des flags */
for
(
pt_del
=
Pcb
->
m_Track
;
pt_del
!=
NULL
;
pt_del
=
pt_del
->
Next
()
)
for
(
pt_del
=
m_
Pcb
->
m_Track
;
pt_del
!=
NULL
;
pt_del
=
pt_del
->
Next
()
)
{
{
if
(
pt_del
->
GetState
(
EDIT
)
)
if
(
pt_del
->
GetState
(
EDIT
)
)
{
{
pt_del
->
SetState
(
EDIT
,
OFF
);
pt_del
->
SetState
(
EDIT
,
OFF
);
pt_del
->
Draw
(
frame
->
DrawPanel
,
DC
,
GR_OR
);
if
(
aDC
)
pt_del
->
Draw
(
DrawPanel
,
aDC
,
GR_OR
);
}
}
pt_del
->
SetState
(
EDIT
|
CHAIN
,
OFF
);
pt_del
->
SetState
(
EDIT
|
CHAIN
,
OFF
);
}
}
...
@@ -251,7 +259,7 @@ int EraseOldTrack( WinEDA_BasePcbFrame* frame, BOARD* Pcb, wxDC* DC,
...
@@ -251,7 +259,7 @@ int EraseOldTrack( WinEDA_BasePcbFrame* frame, BOARD* Pcb, wxDC* DC,
}
}
/* Clear used flags */
/* Clear used flags */
for
(
pt_del
=
Pcb
->
m_Track
;
pt_del
;
pt_del
=
pt_del
->
Next
()
)
for
(
pt_del
=
m_
Pcb
->
m_Track
;
pt_del
;
pt_del
=
pt_del
->
Next
()
)
{
{
pt_del
->
SetState
(
BUSY
|
DELETED
|
EDIT
|
CHAIN
,
OFF
);
pt_del
->
SetState
(
BUSY
|
DELETED
|
EDIT
|
CHAIN
,
OFF
);
if
(
pt_del
==
BufEnd
)
// Last segment reached
if
(
pt_del
==
BufEnd
)
// Last segment reached
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment