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
3d7bd8d2
Commit
3d7bd8d2
authored
Apr 09, 2011
by
jean-pierre charras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix a compil warning
parent
c2ff1d94
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
40 additions
and
40 deletions
+40
-40
lib_polyline.cpp
eeschema/lib_polyline.cpp
+40
-40
No files found.
eeschema/lib_polyline.cpp
View file @
3d7bd8d2
...
@@ -134,7 +134,7 @@ int LIB_POLYLINE::DoCompare( const LIB_DRAW_ITEM& aOther ) const
...
@@ -134,7 +134,7 @@ int LIB_POLYLINE::DoCompare( const LIB_DRAW_ITEM& aOther ) const
{
{
wxASSERT
(
aOther
.
Type
()
==
LIB_POLYLINE_T
);
wxASSERT
(
aOther
.
Type
()
==
LIB_POLYLINE_T
);
const
LIB_POLYLINE
*
tmp
=
(
LIB_POLYLINE
*
)
&
aOther
;
const
LIB_POLYLINE
*
tmp
=
(
LIB_POLYLINE
*
)
&
aOther
;
if
(
m_PolyPoints
.
size
()
!=
tmp
->
m_PolyPoints
.
size
()
)
if
(
m_PolyPoints
.
size
()
!=
tmp
->
m_PolyPoints
.
size
()
)
return
m_PolyPoints
.
size
()
-
tmp
->
m_PolyPoints
.
size
();
return
m_PolyPoints
.
size
()
-
tmp
->
m_PolyPoints
.
size
();
...
@@ -204,10 +204,9 @@ void LIB_POLYLINE::DoPlot( PLOTTER* aPlotter, const wxPoint& aOffset, bool aFill
...
@@ -204,10 +204,9 @@ void LIB_POLYLINE::DoPlot( PLOTTER* aPlotter, const wxPoint& aOffset, bool aFill
for
(
i
=
0
;
i
<
m_PolyPoints
.
size
();
i
++
)
for
(
i
=
0
;
i
<
m_PolyPoints
.
size
();
i
++
)
{
{
wxPoint
pos
=
m_PolyPoints
[
i
];
wxPoint
pos
=
m_PolyPoints
[
i
];
pos
=
aTransform
.
TransformCoordinate
(
pos
)
+
aOffset
;
pos
=
aTransform
.
TransformCoordinate
(
pos
)
+
aOffset
;
Poly
[
i
*
2
]
=
pos
.
x
;
Poly
[
i
*
2
]
=
pos
.
x
;
Poly
[
i
*
2
+
1
]
=
pos
.
y
;
Poly
[
i
*
2
+
1
]
=
pos
.
y
;
}
}
if
(
aFill
&&
m_Fill
==
FILLED_WITH_BG_BODYCOLOR
)
if
(
aFill
&&
m_Fill
==
FILLED_WITH_BG_BODYCOLOR
)
...
@@ -292,15 +291,15 @@ void LIB_POLYLINE::drawGraphic( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint
...
@@ -292,15 +291,15 @@ void LIB_POLYLINE::drawGraphic( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint
if
(
fill
==
FILLED_WITH_BG_BODYCOLOR
)
if
(
fill
==
FILLED_WITH_BG_BODYCOLOR
)
GRPoly
(
&
aPanel
->
m_ClipBox
,
aDC
,
m_PolyPoints
.
size
(),
GRPoly
(
&
aPanel
->
m_ClipBox
,
aDC
,
m_PolyPoints
.
size
(),
Buf_Poly_Drawings
,
1
,
GetPenSize
(
),
Buf_Poly_Drawings
,
1
,
GetPenSize
(
),
(
m_Flags
&
IS_MOVED
)
?
color
:
ReturnLayerColor
(
LAYER_DEVICE_BACKGROUND
),
(
m_Flags
&
IS_MOVED
)
?
color
:
ReturnLayerColor
(
LAYER_DEVICE_BACKGROUND
),
ReturnLayerColor
(
LAYER_DEVICE_BACKGROUND
)
);
ReturnLayerColor
(
LAYER_DEVICE_BACKGROUND
)
);
else
if
(
fill
==
FILLED_SHAPE
)
else
if
(
fill
==
FILLED_SHAPE
)
GRPoly
(
&
aPanel
->
m_ClipBox
,
aDC
,
m_PolyPoints
.
size
(),
GRPoly
(
&
aPanel
->
m_ClipBox
,
aDC
,
m_PolyPoints
.
size
(),
Buf_Poly_Drawings
,
1
,
GetPenSize
(
),
color
,
color
);
Buf_Poly_Drawings
,
1
,
GetPenSize
(),
color
,
color
);
else
else
GRPoly
(
&
aPanel
->
m_ClipBox
,
aDC
,
m_PolyPoints
.
size
(),
GRPoly
(
&
aPanel
->
m_ClipBox
,
aDC
,
m_PolyPoints
.
size
(),
Buf_Poly_Drawings
,
0
,
GetPenSize
(
),
color
,
color
);
Buf_Poly_Drawings
,
0
,
GetPenSize
(),
color
,
color
);
/* Set to one (1) to draw bounding box around polyline to validate
/* Set to one (1) to draw bounding box around polyline to validate
* bounding box calculation. */
* bounding box calculation. */
...
@@ -394,7 +393,7 @@ void LIB_POLYLINE::DisplayInfo( EDA_DRAW_FRAME* aFrame )
...
@@ -394,7 +393,7 @@ void LIB_POLYLINE::DisplayInfo( EDA_DRAW_FRAME* aFrame )
msg
=
ReturnStringFromValue
(
g_UserUnit
,
m_Width
,
EESCHEMA_INTERNAL_UNIT
,
true
);
msg
=
ReturnStringFromValue
(
g_UserUnit
,
m_Width
,
EESCHEMA_INTERNAL_UNIT
,
true
);
aFrame
->
AppendMsgPanel
(
_
(
"Line width"
),
msg
,
BLUE
);
aFrame
->
AppendMsgPanel
(
_
(
"Line width"
),
msg
,
BLUE
);
msg
.
Printf
(
wxT
(
"(%d, %d, %d, %d)"
),
bBox
.
GetOrigin
().
x
,
msg
.
Printf
(
wxT
(
"(%d, %d, %d, %d)"
),
bBox
.
GetOrigin
().
x
,
bBox
.
GetOrigin
().
y
,
bBox
.
GetEnd
().
x
,
bBox
.
GetEnd
().
y
);
bBox
.
GetOrigin
().
y
,
bBox
.
GetEnd
().
x
,
bBox
.
GetEnd
().
y
);
...
@@ -431,8 +430,7 @@ void LIB_POLYLINE::BeginEdit( int aEditMode, const wxPoint aPosition )
...
@@ -431,8 +430,7 @@ void LIB_POLYLINE::BeginEdit( int aEditMode, const wxPoint aPosition )
wxPoint
prevPoint
=
startPoint
;
wxPoint
prevPoint
=
startPoint
;
// Find the right index of the point to be dragged
// Find the right index of the point to be dragged
BOOST_FOREACH
(
wxPoint
point
,
m_PolyPoints
)
BOOST_FOREACH
(
wxPoint
point
,
m_PolyPoints
)
{
{
int
distancePoint
=
(
aPosition
-
point
).
x
*
(
aPosition
-
point
).
x
+
int
distancePoint
=
(
aPosition
-
point
).
x
*
(
aPosition
-
point
).
x
+
(
aPosition
-
point
).
y
*
(
aPosition
-
point
).
y
;
(
aPosition
-
point
).
y
*
(
aPosition
-
point
).
y
;
...
@@ -443,6 +441,7 @@ void LIB_POLYLINE::BeginEdit( int aEditMode, const wxPoint aPosition )
...
@@ -443,6 +441,7 @@ void LIB_POLYLINE::BeginEdit( int aEditMode, const wxPoint aPosition )
m_ModifyIndex
=
index
;
m_ModifyIndex
=
index
;
distanceMin
=
distancePoint
;
distanceMin
=
distancePoint
;
}
}
// check middle of an edge
// check middle of an edge
wxPoint
offset
=
(
aPosition
+
aPosition
-
point
-
prevPoint
);
wxPoint
offset
=
(
aPosition
+
aPosition
-
point
-
prevPoint
);
distancePoint
=
(
offset
.
x
*
offset
.
x
+
offset
.
y
*
offset
.
y
)
/
4
+
1
;
distancePoint
=
(
offset
.
x
*
offset
.
x
+
offset
.
y
*
offset
.
y
)
/
4
+
1
;
...
@@ -492,17 +491,18 @@ void LIB_POLYLINE::EndEdit( const wxPoint& aPosition, bool aAbort )
...
@@ -492,17 +491,18 @@ void LIB_POLYLINE::EndEdit( const wxPoint& aPosition, bool aAbort )
{
{
wxCHECK_RET
(
(
m_Flags
&
(
IS_NEW
|
IS_MOVED
|
IS_RESIZED
)
)
!=
0
,
wxCHECK_RET
(
(
m_Flags
&
(
IS_NEW
|
IS_MOVED
|
IS_RESIZED
)
)
!=
0
,
wxT
(
"Bad call to EndEdit(). LIB_POLYLINE is not being edited."
)
);
wxT
(
"Bad call to EndEdit(). LIB_POLYLINE is not being edited."
)
);
// do not include last point twice
// do not include last point twice
if
(
m_Flags
==
IS_NEW
&&
2
<
m_PolyPoints
.
size
()
)
if
(
m_Flags
==
IS_NEW
&&
2
<
m_PolyPoints
.
size
()
)
{
{
if
(
m_PolyPoints
[
m_PolyPoints
.
size
()
-
2
]
==
m_PolyPoints
.
back
()
)
if
(
m_PolyPoints
[
m_PolyPoints
.
size
()
-
2
]
==
m_PolyPoints
.
back
()
)
m_PolyPoints
.
pop_back
();
m_PolyPoints
.
pop_back
();
}
}
if
(
m_Flags
==
IS_RESIZED
)
{
if
(
(
m_Flags
==
IS_RESIZED
)
&&
(
m_PolyPoints
.
size
()
>
2
)
)
// do not delete last two points... keep it alive
if
(
m_PolyPoints
.
size
()
>
2
// do not delete last two points... keep it alive
{
&&
(
m_ModifyIndex
>
0
if
(
(
m_ModifyIndex
>
0
&&
m_PolyPoints
[
m_ModifyIndex
]
==
m_PolyPoints
[
m_ModifyIndex
-
1
]
)
&&
m_PolyPoints
[
m_ModifyIndex
]
==
m_PolyPoints
[
m_ModifyIndex
-
1
]
||
||
m_ModifyIndex
<
(
int
)
m_PolyPoints
.
size
()
-
1
(
m_ModifyIndex
<
(
int
)
m_PolyPoints
.
size
()
-
1
&&
m_PolyPoints
[
m_ModifyIndex
]
==
m_PolyPoints
[
m_ModifyIndex
+
1
]
)
)
&&
m_PolyPoints
[
m_ModifyIndex
]
==
m_PolyPoints
[
m_ModifyIndex
+
1
]
)
)
{
{
m_PolyPoints
.
erase
(
m_PolyPoints
.
begin
()
+
m_ModifyIndex
);
// delete a point on this
m_PolyPoints
.
erase
(
m_PolyPoints
.
begin
()
+
m_ModifyIndex
);
// delete a point on this
...
...
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