mirror of
https://gitlab.com/kicad/code/kicad.git
synced 2025-04-20 21:31:42 +00:00
Radial dimensions.
ADDED radial type dimensions. Fixes https://gitlab.com/kicad/code/kicad/issues/2056
This commit is contained in:
parent
21eb928218
commit
4b6bf3095a
3d-viewer/3d_canvas
bitmaps_png
CMakeLists.txt
png
add_center_dimension_24.pngadd_center_dimension_dark_24.pngadd_radial_dimension_24.pngadd_radial_dimension_dark_24.png
sources
common
include
pcbnew
@ -623,6 +623,7 @@ void BOARD_ADAPTER::createLayers( REPORTER* aStatusReporter )
|
||||
|
||||
case PCB_DIM_ALIGNED_T:
|
||||
case PCB_DIM_CENTER_T:
|
||||
case PCB_DIM_RADIAL_T:
|
||||
case PCB_DIM_ORTHOGONAL_T:
|
||||
case PCB_DIM_LEADER_T:
|
||||
addShapeWithClearance( static_cast<PCB_DIMENSION_BASE*>( item ),
|
||||
@ -929,6 +930,7 @@ void BOARD_ADAPTER::createLayers( REPORTER* aStatusReporter )
|
||||
|
||||
case PCB_DIM_ALIGNED_T:
|
||||
case PCB_DIM_CENTER_T:
|
||||
case PCB_DIM_RADIAL_T:
|
||||
case PCB_DIM_ORTHOGONAL_T:
|
||||
case PCB_DIM_LEADER_T:
|
||||
addShapeWithClearance( static_cast<PCB_DIMENSION_BASE*>( item ), layerContainer,
|
||||
|
@ -152,6 +152,7 @@ set( BMAPS_MID
|
||||
add_orthogonal_dimension
|
||||
add_pcb_target
|
||||
add_power
|
||||
add_radial_dimension
|
||||
add_rectangle
|
||||
add_symbol_to_schematic
|
||||
add_tracks
|
||||
|
Binary file not shown.
Before ![]() (image error) Size: 293 B After ![]() (image error) Size: 205 B ![]() ![]() |
Binary file not shown.
Before ![]() (image error) Size: 307 B After ![]() (image error) Size: 217 B ![]() ![]() |
BIN
bitmaps_png/png/add_radial_dimension_24.png
Normal file
BIN
bitmaps_png/png/add_radial_dimension_24.png
Normal file
Binary file not shown.
After ![]() (image error) Size: 302 B |
BIN
bitmaps_png/png/add_radial_dimension_dark_24.png
Normal file
BIN
bitmaps_png/png/add_radial_dimension_dark_24.png
Normal file
Binary file not shown.
After ![]() (image error) Size: 314 B |
@ -12,7 +12,7 @@
|
||||
viewBox="0 0 24 24"
|
||||
version="1.1"
|
||||
sodipodi:docname="add_center_dimension.svg"
|
||||
inkscape:version="1.0.1 (c497b03c, 2020-09-10)">
|
||||
inkscape:version="1.0.2 (e86c8708, 2021-01-15)">
|
||||
<sodipodi:namedview
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
@ -22,8 +22,8 @@
|
||||
guidetolerance="10"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:window-width="1609"
|
||||
inkscape:window-height="1035"
|
||||
inkscape:window-width="1440"
|
||||
inkscape:window-height="800"
|
||||
id="namedview30"
|
||||
showgrid="true"
|
||||
inkscape:zoom="33.649424"
|
||||
@ -91,8 +91,4 @@
|
||||
class="cls-2"
|
||||
d="m 14.5,11.5 a 3,3 0 1 1 -3,-3 3,3 0 0 1 3,3 z"
|
||||
id="path27898" />
|
||||
<path
|
||||
class="cls-2"
|
||||
d="m 23,11.5 a 3,3 0 1 1 -3,-3 3,3 0 0 1 3,3 z"
|
||||
id="path27900" />
|
||||
</svg>
|
||||
|
Before (image error) Size: 3.2 KiB After (image error) Size: 3.1 KiB |
98
bitmaps_png/sources/dark/add_radial_dimension.svg
Normal file
98
bitmaps_png/sources/dark/add_radial_dimension.svg
Normal file
@ -0,0 +1,98 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
id="Слой_1"
|
||||
data-name="Слой 1"
|
||||
viewBox="0 0 24 24"
|
||||
version="1.1"
|
||||
sodipodi:docname="add_radial_dimension.svg"
|
||||
inkscape:version="1.0.2 (e86c8708, 2021-01-15)">
|
||||
<sodipodi:namedview
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1"
|
||||
objecttolerance="10"
|
||||
gridtolerance="10"
|
||||
guidetolerance="10"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:window-width="1440"
|
||||
inkscape:window-height="800"
|
||||
id="namedview30"
|
||||
showgrid="true"
|
||||
inkscape:zoom="33.649424"
|
||||
inkscape:cx="13.5214"
|
||||
inkscape:cy="3.5379729"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="23"
|
||||
inkscape:window-maximized="0"
|
||||
inkscape:document-rotation="0"
|
||||
inkscape:current-layer="Слой_1">
|
||||
<inkscape:grid
|
||||
type="xygrid"
|
||||
id="grid_kicad"
|
||||
spacingx="0.5"
|
||||
spacingy="0.5"
|
||||
color="#9999ff"
|
||||
opacity="0.13"
|
||||
empspacing="2" />
|
||||
</sodipodi:namedview>
|
||||
<metadata
|
||||
id="metadata43">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<cc:license
|
||||
rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title>add_arc</dc:title>
|
||||
</cc:Work>
|
||||
<cc:License
|
||||
rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
|
||||
<cc:permits
|
||||
rdf:resource="http://creativecommons.org/ns#Reproduction" />
|
||||
<cc:permits
|
||||
rdf:resource="http://creativecommons.org/ns#Distribution" />
|
||||
<cc:requires
|
||||
rdf:resource="http://creativecommons.org/ns#Notice" />
|
||||
<cc:requires
|
||||
rdf:resource="http://creativecommons.org/ns#Attribution" />
|
||||
<cc:permits
|
||||
rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
|
||||
<cc:requires
|
||||
rdf:resource="http://creativecommons.org/ns#ShareAlike" />
|
||||
</cc:License>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<defs
|
||||
id="defs27890">
|
||||
<style
|
||||
id="style27888">.cls-1{fill:#DED3DD;}.cls-2{fill:#42B8EB;}</style>
|
||||
</defs>
|
||||
<title
|
||||
id="title27892">add_center_dimension</title>
|
||||
<path
|
||||
style="fill:none;stroke:#DED3DD;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m 11.5,1.5 v 20"
|
||||
id="path844" />
|
||||
<path
|
||||
style="fill:none;stroke:#DED3DD;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
|
||||
d="M 1.5,11.5 H 21"
|
||||
id="path846" />
|
||||
<path
|
||||
class="cls-2"
|
||||
d="m 14.5,11.5 a 3,3 0 1 1 -3,-3 3,3 0 0 1 3,3 z"
|
||||
id="path27898" />
|
||||
<path
|
||||
class="cls-2"
|
||||
d="m 21.666667,4 a 3,3 0 1 1 -3,-3 3,3 0 0 1 3,3 z"
|
||||
id="path27900" />
|
||||
</svg>
|
After (image error) Size: 3.2 KiB |
@ -12,7 +12,7 @@
|
||||
viewBox="0 0 24 24"
|
||||
version="1.1"
|
||||
sodipodi:docname="add_center_dimension.svg"
|
||||
inkscape:version="1.0.1 (c497b03c, 2020-09-10)">
|
||||
inkscape:version="1.0.2 (e86c8708, 2021-01-15)">
|
||||
<sodipodi:namedview
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
@ -22,8 +22,8 @@
|
||||
guidetolerance="10"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:window-width="1609"
|
||||
inkscape:window-height="1035"
|
||||
inkscape:window-width="1440"
|
||||
inkscape:window-height="800"
|
||||
id="namedview30"
|
||||
showgrid="true"
|
||||
inkscape:zoom="33.649424"
|
||||
@ -91,8 +91,4 @@
|
||||
class="cls-2"
|
||||
d="m 14.5,11.5 a 3,3 0 1 1 -3,-3 3,3 0 0 1 3,3 z"
|
||||
id="path27898" />
|
||||
<path
|
||||
class="cls-2"
|
||||
d="m 23,11.5 a 3,3 0 1 1 -3,-3 3,3 0 0 1 3,3 z"
|
||||
id="path27900" />
|
||||
</svg>
|
||||
|
Before (image error) Size: 3.2 KiB After (image error) Size: 3.1 KiB |
98
bitmaps_png/sources/light/add_radial_dimension.svg
Executable file
98
bitmaps_png/sources/light/add_radial_dimension.svg
Executable file
@ -0,0 +1,98 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
id="Слой_1"
|
||||
data-name="Слой 1"
|
||||
viewBox="0 0 24 24"
|
||||
version="1.1"
|
||||
sodipodi:docname="add_radial_dimension.svg"
|
||||
inkscape:version="1.0.2 (e86c8708, 2021-01-15)">
|
||||
<sodipodi:namedview
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1"
|
||||
objecttolerance="10"
|
||||
gridtolerance="10"
|
||||
guidetolerance="10"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:window-width="1440"
|
||||
inkscape:window-height="800"
|
||||
id="namedview30"
|
||||
showgrid="true"
|
||||
inkscape:zoom="33.649424"
|
||||
inkscape:cx="14.383227"
|
||||
inkscape:cy="8.6197835"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="23"
|
||||
inkscape:window-maximized="0"
|
||||
inkscape:document-rotation="0"
|
||||
inkscape:current-layer="Слой_1">
|
||||
<inkscape:grid
|
||||
type="xygrid"
|
||||
id="grid_kicad"
|
||||
spacingx="0.5"
|
||||
spacingy="0.5"
|
||||
color="#9999ff"
|
||||
opacity="0.13"
|
||||
empspacing="2" />
|
||||
</sodipodi:namedview>
|
||||
<metadata
|
||||
id="metadata43">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<cc:license
|
||||
rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title>add_arc</dc:title>
|
||||
</cc:Work>
|
||||
<cc:License
|
||||
rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
|
||||
<cc:permits
|
||||
rdf:resource="http://creativecommons.org/ns#Reproduction" />
|
||||
<cc:permits
|
||||
rdf:resource="http://creativecommons.org/ns#Distribution" />
|
||||
<cc:requires
|
||||
rdf:resource="http://creativecommons.org/ns#Notice" />
|
||||
<cc:requires
|
||||
rdf:resource="http://creativecommons.org/ns#Attribution" />
|
||||
<cc:permits
|
||||
rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
|
||||
<cc:requires
|
||||
rdf:resource="http://creativecommons.org/ns#ShareAlike" />
|
||||
</cc:License>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<defs
|
||||
id="defs27890">
|
||||
<style
|
||||
id="style27888">.cls-1{fill:#545454;}.cls-2{fill:#1a81c4;}</style>
|
||||
</defs>
|
||||
<title
|
||||
id="title27892">add_center_dimension</title>
|
||||
<path
|
||||
style="fill:none;stroke:#545454;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m 11.5,1.5 v 20"
|
||||
id="path844" />
|
||||
<path
|
||||
style="fill:none;stroke:#545454;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
|
||||
d="M 1.5,11.5 H 21"
|
||||
id="path846" />
|
||||
<path
|
||||
class="cls-2"
|
||||
d="m 14.5,11.5 a 3,3 0 1 1 -3,-3 3,3 0 0 1 3,3 z"
|
||||
id="path27898" />
|
||||
<path
|
||||
class="cls-2"
|
||||
d="m 21.666667,4 a 3,3 0 1 1 -3,-3 3,3 0 0 1 3,3 z"
|
||||
id="path27900" />
|
||||
</svg>
|
After (image error) Size: 3.2 KiB |
@ -325,6 +325,7 @@ static struct EDA_ITEM_DESC
|
||||
.Map( PCB_DIM_ALIGNED_T, _HKI( "Dimension" ) )
|
||||
.Map( PCB_DIM_ORTHOGONAL_T, _HKI( "Dimension" ) )
|
||||
.Map( PCB_DIM_CENTER_T, _HKI( "Dimension" ) )
|
||||
.Map( PCB_DIM_RADIAL_T, _HKI( "Dimension" ) )
|
||||
.Map( PCB_DIM_LEADER_T, _HKI( "Leader" ) )
|
||||
.Map( PCB_TARGET_T, _HKI( "Target" ) )
|
||||
.Map( PCB_ZONE_T, _HKI( "Zone" ) )
|
||||
|
@ -157,6 +157,7 @@ last_trace_width
|
||||
layer
|
||||
layers
|
||||
leader
|
||||
leader_length
|
||||
left
|
||||
linear
|
||||
links
|
||||
@ -225,6 +226,7 @@ prefix
|
||||
primitives
|
||||
priority
|
||||
pts
|
||||
radial
|
||||
radius
|
||||
rev
|
||||
rect
|
||||
|
@ -169,6 +169,7 @@ const std::vector<BITMAP_INFO> g_BitmapInfo = {
|
||||
{ BITMAPS::add_orthogonal_dimension, wxT( "add_orthogonal_dimension_24.png" ), 24, wxT( "light" ) },
|
||||
{ BITMAPS::add_pcb_target, wxT( "add_pcb_target_24.png" ), 24, wxT( "light" ) },
|
||||
{ BITMAPS::add_power, wxT( "add_power_24.png" ), 24, wxT( "light" ) },
|
||||
{ BITMAPS::add_radial_dimension, wxT( "add_radial_dimension_24.png" ), 24, wxT( "light" ) },
|
||||
{ BITMAPS::add_rectangle, wxT( "add_rectangle_24.png" ), 24, wxT( "light" ) },
|
||||
{ BITMAPS::add_symbol_to_schematic, wxT( "add_symbol_to_schematic_24.png" ), 24, wxT( "light" ) },
|
||||
{ BITMAPS::add_tracks, wxT( "add_tracks_24.png" ), 24, wxT( "light" ) },
|
||||
@ -535,6 +536,7 @@ const std::vector<BITMAP_INFO> g_BitmapInfo = {
|
||||
{ BITMAPS::add_orthogonal_dimension, wxT( "add_orthogonal_dimension_dark_24.png" ), 24, wxT( "dark" ) },
|
||||
{ BITMAPS::add_pcb_target, wxT( "add_pcb_target_dark_24.png" ), 24, wxT( "dark" ) },
|
||||
{ BITMAPS::add_power, wxT( "add_power_dark_24.png" ), 24, wxT( "dark" ) },
|
||||
{ BITMAPS::add_radial_dimension, wxT( "add_radial_dimension_dark_24.png" ), 24, wxT( "dark" ) },
|
||||
{ BITMAPS::add_rectangle, wxT( "add_rectangle_dark_24.png" ), 24, wxT( "dark" ) },
|
||||
{ BITMAPS::add_symbol_to_schematic, wxT( "add_symbol_to_schematic_dark_24.png" ), 24, wxT( "dark" ) },
|
||||
{ BITMAPS::add_tracks, wxT( "add_tracks_dark_24.png" ), 24, wxT( "dark" ) },
|
||||
|
@ -68,6 +68,7 @@ enum class BITMAPS : unsigned int
|
||||
add_orthogonal_dimension,
|
||||
add_pcb_target,
|
||||
add_power,
|
||||
add_radial_dimension,
|
||||
add_rectangle,
|
||||
add_symbol_to_schematic,
|
||||
add_tracks,
|
||||
|
@ -100,6 +100,7 @@ enum KICAD_T
|
||||
PCB_DIM_ALIGNED_T, ///< class PCB_DIM_ALIGNED, a linear dimension (graphic item)
|
||||
PCB_DIM_LEADER_T, ///< class PCB_DIM_LEADER, a leader dimension (graphic item)
|
||||
PCB_DIM_CENTER_T, ///< class PCB_DIM_CENTER, a center point marking (graphic item)
|
||||
PCB_DIM_RADIAL_T, ///< class PCB_DIM_RADIAL, a radius or diameter dimension
|
||||
PCB_DIM_ORTHOGONAL_T, ///< class PCB_DIM_ORTHOGONAL, a linear dimension constrained to x/y
|
||||
PCB_TARGET_T, ///< class PCB_TARGET, a target (graphic item)
|
||||
PCB_ZONE_T, ///< class ZONE, a copper pour area
|
||||
@ -257,6 +258,7 @@ constexpr KICAD_T BaseType( const KICAD_T aType )
|
||||
|
||||
case PCB_DIM_ALIGNED_T:
|
||||
case PCB_DIM_CENTER_T:
|
||||
case PCB_DIM_RADIAL_T:
|
||||
case PCB_DIM_ORTHOGONAL_T:
|
||||
case PCB_DIM_LEADER_T:
|
||||
return PCB_DIMENSION_T;
|
||||
|
@ -118,6 +118,7 @@ void ARRAY_CREATOR::Invoke()
|
||||
case PCB_VIA_T:
|
||||
case PCB_DIM_ALIGNED_T:
|
||||
case PCB_DIM_CENTER_T:
|
||||
case PCB_DIM_RADIAL_T:
|
||||
case PCB_DIM_ORTHOGONAL_T:
|
||||
case PCB_DIM_LEADER_T:
|
||||
case PCB_TARGET_T:
|
||||
|
@ -275,6 +275,7 @@ void BOARD::Move( const wxPoint& aMoveVector ) // overload
|
||||
PCB_DIM_ALIGNED_T,
|
||||
PCB_DIM_ORTHOGONAL_T,
|
||||
PCB_DIM_CENTER_T,
|
||||
PCB_DIM_RADIAL_T,
|
||||
PCB_DIM_LEADER_T,
|
||||
PCB_TARGET_T,
|
||||
PCB_VIA_T,
|
||||
@ -662,6 +663,7 @@ void BOARD::Add( BOARD_ITEM* aBoardItem, ADD_MODE aMode )
|
||||
|
||||
case PCB_DIM_ALIGNED_T:
|
||||
case PCB_DIM_CENTER_T:
|
||||
case PCB_DIM_RADIAL_T:
|
||||
case PCB_DIM_ORTHOGONAL_T:
|
||||
case PCB_DIM_LEADER_T:
|
||||
case PCB_SHAPE_T:
|
||||
@ -768,6 +770,7 @@ void BOARD::Remove( BOARD_ITEM* aBoardItem, REMOVE_MODE aRemoveMode )
|
||||
|
||||
case PCB_DIM_ALIGNED_T:
|
||||
case PCB_DIM_CENTER_T:
|
||||
case PCB_DIM_RADIAL_T:
|
||||
case PCB_DIM_ORTHOGONAL_T:
|
||||
case PCB_DIM_LEADER_T:
|
||||
case PCB_SHAPE_T:
|
||||
@ -1241,6 +1244,7 @@ SEARCH_RESULT BOARD::Visit( INSPECTOR inspector, void* testData, const KICAD_T s
|
||||
case PCB_TEXT_T:
|
||||
case PCB_DIM_ALIGNED_T:
|
||||
case PCB_DIM_CENTER_T:
|
||||
case PCB_DIM_RADIAL_T:
|
||||
case PCB_DIM_ORTHOGONAL_T:
|
||||
case PCB_DIM_LEADER_T:
|
||||
case PCB_TARGET_T:
|
||||
@ -1255,6 +1259,7 @@ SEARCH_RESULT BOARD::Visit( INSPECTOR inspector, void* testData, const KICAD_T s
|
||||
case PCB_TEXT_T:
|
||||
case PCB_DIM_ALIGNED_T:
|
||||
case PCB_DIM_CENTER_T:
|
||||
case PCB_DIM_RADIAL_T:
|
||||
case PCB_DIM_ORTHOGONAL_T:
|
||||
case PCB_DIM_LEADER_T:
|
||||
case PCB_TARGET_T:
|
||||
|
@ -248,6 +248,7 @@ void BOARD_COMMIT::Push( const wxString& aMessage, bool aCreateUndoEntry, bool a
|
||||
case PCB_VIA_T: // a via (like track segment on a copper layer)
|
||||
case PCB_DIM_ALIGNED_T: // a dimension (graphic item)
|
||||
case PCB_DIM_CENTER_T:
|
||||
case PCB_DIM_RADIAL_T:
|
||||
case PCB_DIM_ORTHOGONAL_T:
|
||||
case PCB_DIM_LEADER_T: // a leader dimension
|
||||
case PCB_TARGET_T: // a target (graphic item)
|
||||
|
@ -52,6 +52,7 @@ const KICAD_T GENERAL_COLLECTOR::AllBoardItems[] = {
|
||||
PCB_SHAPE_T, // in m_drawings
|
||||
PCB_DIM_ALIGNED_T, // in m_drawings
|
||||
PCB_DIM_CENTER_T, // in m_drawings
|
||||
PCB_DIM_RADIAL_T, // in m_drawings
|
||||
PCB_DIM_ORTHOGONAL_T, // in m_drawings
|
||||
PCB_DIM_LEADER_T, // in m_drawings
|
||||
PCB_TARGET_T, // in m_drawings
|
||||
@ -74,6 +75,7 @@ const KICAD_T GENERAL_COLLECTOR::BoardLevelItems[] = {
|
||||
PCB_DIM_ALIGNED_T,
|
||||
PCB_DIM_ORTHOGONAL_T,
|
||||
PCB_DIM_CENTER_T,
|
||||
PCB_DIM_RADIAL_T,
|
||||
PCB_DIM_LEADER_T,
|
||||
PCB_TARGET_T,
|
||||
PCB_VIA_T,
|
||||
@ -141,6 +143,7 @@ const KICAD_T GENERAL_COLLECTOR::Dimensions[] = {
|
||||
PCB_DIM_LEADER_T,
|
||||
PCB_DIM_ORTHOGONAL_T,
|
||||
PCB_DIM_CENTER_T,
|
||||
PCB_DIM_RADIAL_T,
|
||||
EOT
|
||||
};
|
||||
|
||||
@ -286,6 +289,7 @@ SEARCH_RESULT GENERAL_COLLECTOR::Inspect( EDA_ITEM* testItem, void* testData )
|
||||
|
||||
case PCB_DIM_ALIGNED_T:
|
||||
case PCB_DIM_CENTER_T:
|
||||
case PCB_DIM_RADIAL_T:
|
||||
case PCB_DIM_ORTHOGONAL_T:
|
||||
case PCB_DIM_LEADER_T:
|
||||
dimension = static_cast<PCB_DIMENSION_BASE*>( item );
|
||||
|
@ -196,8 +196,8 @@ bool DIALOG_DIMENSION_PROPERTIES::TransferDataToWindow()
|
||||
|
||||
if( m_cbLayerActual->SetLayerSelection( m_dimension->GetLayer() ) < 0 )
|
||||
{
|
||||
wxMessageBox( _( "This item was on a non-existing or forbidden layer.\n"
|
||||
"It has been moved to the first allowed layer." ) );
|
||||
wxMessageBox( _( "This item was on a non-existing layer.\n"
|
||||
"It has been moved to the first defined layer." ) );
|
||||
m_cbLayerActual->SetSelection( 0 );
|
||||
}
|
||||
|
||||
@ -223,6 +223,8 @@ bool DIALOG_DIMENSION_PROPERTIES::TransferDataToWindow()
|
||||
m_cbKeepAligned->SetValue( m_dimension->GetKeepTextAligned() );
|
||||
m_cbTextOrientation->Enable( !m_dimension->GetKeepTextAligned() );
|
||||
|
||||
m_orientValidator.TransferToWindow();
|
||||
|
||||
m_cbItalic->SetValue( text.IsItalic() );
|
||||
m_cbMirrored->SetValue( text.IsMirrored() );
|
||||
EDA_TEXT_HJUSTIFY_T hJustify = text.GetHorizJustify();
|
||||
@ -243,12 +245,10 @@ bool DIALOG_DIMENSION_PROPERTIES::TransferDataToWindow()
|
||||
m_txtValueActual->SetValue( m_dimension->GetValueText() );
|
||||
}
|
||||
|
||||
m_orientValidator.TransferToWindow();
|
||||
|
||||
if( m_dimension->Type() == PCB_DIM_LEADER_T )
|
||||
{
|
||||
PCB_DIM_LEADER* leader = static_cast<PCB_DIM_LEADER*>( m_dimension );
|
||||
m_cbTextFrame->SetSelection( static_cast<int>( leader->GetTextFrame() ) );
|
||||
m_cbTextFrame->SetSelection( static_cast<int>( leader->GetTextBorder() ) );
|
||||
}
|
||||
|
||||
return DIALOG_DIMENSION_PROPERTIES_BASE::TransferDataToWindow();
|
||||
@ -303,22 +303,22 @@ void DIALOG_DIMENSION_PROPERTIES::updateDimensionFromDialog( PCB_DIMENSION_BASE*
|
||||
|
||||
switch( m_cbUnits->GetSelection() )
|
||||
{
|
||||
case 0:
|
||||
aTarget->SetUnitsMode( DIM_UNITS_MODE::INCHES );
|
||||
break;
|
||||
case 0:
|
||||
aTarget->SetUnitsMode( DIM_UNITS_MODE::INCHES );
|
||||
break;
|
||||
|
||||
case 1:
|
||||
aTarget->SetUnitsMode( DIM_UNITS_MODE::MILS );
|
||||
break;
|
||||
case 1:
|
||||
aTarget->SetUnitsMode( DIM_UNITS_MODE::MILS );
|
||||
break;
|
||||
|
||||
case 2:
|
||||
aTarget->SetUnitsMode( DIM_UNITS_MODE::MILLIMETRES );
|
||||
break;
|
||||
case 2:
|
||||
aTarget->SetUnitsMode( DIM_UNITS_MODE::MILLIMETRES );
|
||||
break;
|
||||
|
||||
case 3:
|
||||
aTarget->SetUnitsMode( DIM_UNITS_MODE::AUTOMATIC );
|
||||
aTarget->SetUnits( m_frame->GetUserUnits() );
|
||||
break;
|
||||
case 3:
|
||||
aTarget->SetUnitsMode( DIM_UNITS_MODE::AUTOMATIC );
|
||||
aTarget->SetUnits( m_frame->GetUserUnits() );
|
||||
break;
|
||||
}
|
||||
|
||||
aTarget->SetUnitsFormat( static_cast<DIM_UNITS_FORMAT>( m_cbUnitsFormat->GetSelection() ) );
|
||||
@ -354,7 +354,7 @@ void DIALOG_DIMENSION_PROPERTIES::updateDimensionFromDialog( PCB_DIMENSION_BASE*
|
||||
if( aTarget->Type() == PCB_DIM_LEADER_T )
|
||||
{
|
||||
PCB_DIM_LEADER* leader = static_cast<PCB_DIM_LEADER*>( aTarget );
|
||||
leader->SetTextFrame( static_cast<DIM_TEXT_FRAME>( m_cbTextFrame->GetSelection() ) );
|
||||
leader->SetTextBorder( static_cast<DIM_TEXT_BORDER>( m_cbTextFrame->GetSelection()));
|
||||
}
|
||||
|
||||
aTarget->Update();
|
||||
|
@ -195,7 +195,7 @@ bool DRC_TEST_PROVIDER_COPPER_CLEARANCE::Run()
|
||||
static const std::vector<KICAD_T> itemTypes = {
|
||||
PCB_TRACE_T, PCB_ARC_T, PCB_VIA_T, PCB_PAD_T, PCB_SHAPE_T, PCB_FP_SHAPE_T,
|
||||
PCB_TEXT_T, PCB_FP_TEXT_T, PCB_DIMENSION_T, PCB_DIM_ALIGNED_T, PCB_DIM_LEADER_T,
|
||||
PCB_DIM_CENTER_T, PCB_DIM_ORTHOGONAL_T
|
||||
PCB_DIM_CENTER_T, PCB_DIM_RADIAL_T, PCB_DIM_ORTHOGONAL_T
|
||||
};
|
||||
|
||||
forEachGeometryItem( itemTypes, LSET::AllCuMask(), countItems );
|
||||
|
@ -106,6 +106,7 @@ bool DRC_TEST_PROVIDER_DISALLOW::Run()
|
||||
case PCB_TEXT_T:
|
||||
case PCB_DIM_ALIGNED_T:
|
||||
case PCB_DIM_CENTER_T:
|
||||
case PCB_DIM_RADIAL_T:
|
||||
case PCB_DIM_ORTHOGONAL_T:
|
||||
case PCB_DIM_LEADER_T:
|
||||
{
|
||||
|
@ -137,6 +137,7 @@ void PCB_EDIT_FRAME::OnEditItemRequest( BOARD_ITEM* aItem )
|
||||
|
||||
case PCB_DIM_ALIGNED_T:
|
||||
case PCB_DIM_CENTER_T:
|
||||
case PCB_DIM_RADIAL_T:
|
||||
case PCB_DIM_ORTHOGONAL_T:
|
||||
case PCB_DIM_LEADER_T:
|
||||
ShowDimensionPropertiesDialog( static_cast<PCB_DIMENSION_BASE*>( aItem ) );
|
||||
|
@ -211,6 +211,7 @@ bool GENDRILL_WRITER_BASE::genDrillMapFile( const wxString& aFullFileName, PLOT_
|
||||
|
||||
case PCB_DIM_ALIGNED_T:
|
||||
case PCB_DIM_CENTER_T:
|
||||
case PCB_DIM_RADIAL_T:
|
||||
case PCB_DIM_ORTHOGONAL_T:
|
||||
case PCB_DIM_LEADER_T:
|
||||
case PCB_TARGET_T:
|
||||
|
@ -327,6 +327,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
|
||||
placeMenu->Add( PCB_ACTIONS::drawAlignedDimension );
|
||||
placeMenu->Add( PCB_ACTIONS::drawOrthogonalDimension );
|
||||
placeMenu->Add( PCB_ACTIONS::drawCenterDimension );
|
||||
placeMenu->Add( PCB_ACTIONS::drawRadialDimension );
|
||||
placeMenu->Add( PCB_ACTIONS::drawLeader );
|
||||
|
||||
placeMenu->AppendSeparator();
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user