Skip to content

K
kicad-source-mirror
Commit 7e5160ad authored by Mikhail Karpenko's avatar Mikhail Karpenko
Browse files
Options

Add menu icon, fix some bugs

parent 4f991329
Show whitespace changes
Inline Side-by-side
Showing with 187 additions and 5 deletions
bitmaps_png/CMakeLists.txt
View file @ 7e5160ad
...@@ -516,6 +516,7 @@ set( BMAPS_MID ...@@ -516,6 +516,7 @@ set( BMAPS_MID
show_zone_outline_only show_zone_outline_only
svg_file svg_file
swap_layer swap_layer
teardrop
text_sketch text_sketch
three_d three_d
tool_ratsnest tool_ratsnest
......
bitmaps_png/cpp_26/teardrop.cpp 0 → 100644
View file @ 7e5160ad
/* Do not modify this file, it was automatically generated by the
* PNG2cpp CMake script, using a *.png file as input.
*/
#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c,
0xce, 0x00, 0x00, 0x02, 0x6f, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xbd, 0x96, 0xcb, 0x6f, 0x4d,
0x51, 0x14, 0xc6, 0x7f, 0x4a, 0xca, 0x84, 0x90, 0x20, 0x26, 0x46, 0x12, 0x4d, 0x84, 0x81, 0xc7,
0xc0, 0x94, 0xbf, 0x40, 0x44, 0x24, 0x46, 0x42, 0xc2, 0x50, 0x84, 0xa4, 0x13, 0x83, 0xfd, 0xed,
0xb6, 0x21, 0x18, 0x08, 0x92, 0x0e, 0x8c, 0x4c, 0x48, 0x94, 0x51, 0x9f, 0xa2, 0x91, 0x54, 0xda,
0x9b, 0x8a, 0x01, 0x22, 0x25, 0x69, 0x4b, 0x49, 0x83, 0x8a, 0x47, 0x1f, 0xae, 0x6a, 0xab, 0xee,
0x39, 0x06, 0x5d, 0x3d, 0xd9, 0xb9, 0x3d, 0xbd, 0xf7, 0x94, 0xd6, 0x60, 0x27, 0xe7, 0xdc, 0xbb,
0xf6, 0xfe, 0xed, 0xf5, 0xed, 0xf5, 0xad, 0x7d, 0x88, 0xe3, 0x98, 0xff, 0x31, 0x4a, 0xff, 0x29,
0x2a, 0xa9, 0x61, 0x37, 0xe2, 0x24, 0xe2, 0x0c, 0x62, 0x3f, 0x62, 0xed, 0xa2, 0x81, 0xa8, 0x63,
0x33, 0xa2, 0x11, 0x31, 0x8d, 0x88, 0x6d, 0x14, 0x82, 0xe7, 0x97, 0x78, 0xf6, 0xfd, 0x13, 0xc8,
0x76, 0xff, 0x03, 0x31, 0x8e, 0xe8, 0xc1, 0x91, 0xc3, 0xd1, 0x86, 0x68, 0x46, 0x74, 0x20, 0x9e,
0x22, 0xbe, 0xe0, 0x89, 0x10, 0x37, 0x10, 0x6b, 0x16, 0x0c, 0x42, 0x9c, 0x46, 0xc4, 0x78, 0x06,
0x11, 0x6d, 0x96, 0xd5, 0xdc, 0xe1, 0x68, 0x42, 0xf4, 0xe0, 0xf9, 0x85, 0xe8, 0x20, 0x66, 0x59,
0x66, 0x10, 0x62, 0x3b, 0x62, 0x0a, 0xf1, 0x76, 0x5e, 0xc0, 0x5c, 0x60, 0x37, 0x9e, 0x08, 0xcf,
0xd9, 0x4c, 0x20, 0x44, 0x05, 0xe2, 0x05, 0x62, 0x14, 0x47, 0x4b, 0xb0, 0x58, 0x0b, 0xa2, 0x17,
0xf1, 0x15, 0xcf, 0x30, 0x62, 0x10, 0xf1, 0xb0, 0x08, 0xf8, 0xda, 0x36, 0xb8, 0x35, 0x0b, 0x68,
0x9b, 0x1d, 0xf2, 0xe3, 0x22, 0xc8, 0x88, 0x2d, 0x72, 0xdb, 0xce, 0x63, 0x08, 0x31, 0x8d, 0xa3,
0x33, 0x88, 0x6b, 0x36, 0x09, 0xab, 0xcb, 0x83, 0x3c, 0x47, 0x0d, 0x14, 0x9e, 0x4b, 0xbf, 0x41,
0x76, 0x25, 0xc1, 0x17, 0x59, 0x8d, 0x78, 0x6e, 0x1b, 0x08, 0xb3, 0xca, 0x23, 0x86, 0xb3, 0x64,
0x74, 0x1d, 0x31, 0x56, 0x34, 0xf9, 0x1b, 0xe2, 0x56, 0x4a, 0x55, 0x1e, 0xb6, 0x4d, 0x3d, 0x08,
0x62, 0x87, 0x10, 0x31, 0x17, 0x58, 0x57, 0x0e, 0x54, 0x8f, 0x18, 0x4d, 0x01, 0xdd, 0x4c, 0x01,
0x1d, 0x4c, 0x01, 0xbd, 0xb1, 0xdf, 0x0e, 0x94, 0x03, 0x1d, 0x37, 0x5f, 0xb4, 0x16, 0x4d, 0x1e,
0xa7, 0x96, 0xaa, 0x24, 0xf8, 0x1a, 0x2b, 0xf1, 0x74, 0xa5, 0x64, 0xff, 0x19, 0xcf, 0x08, 0xe2,
0x6a, 0x69, 0x50, 0x0d, 0x3b, 0x10, 0x31, 0x8e, 0xee, 0x60, 0x72, 0x2b, 0xe2, 0xbb, 0x99, 0xb7,
0x1e, 0x71, 0xc9, 0xe0, 0x05, 0x44, 0x2e, 0x88, 0x6b, 0x42, 0x4c, 0xe1, 0x78, 0x87, 0xe8, 0x29,
0x0d, 0x6a, 0x60, 0x39, 0xa2, 0x0f, 0x31, 0x6c, 0x1d, 0x60, 0xd6, 0x27, 0x6d, 0x88, 0x01, 0x3b,
0xfc, 0x3c, 0xe2, 0xa3, 0x75, 0x87, 0x30, 0x9b, 0x5e, 0x3c, 0x05, 0xb3, 0x47, 0x84, 0x58, 0x5f,
0xce, 0xb0, 0x7b, 0xac, 0xb7, 0xf5, 0x67, 0x36, 0xac, 0xe8, 0xc2, 0x51, 0xc0, 0x93, 0x33, 0x05,
0x0a, 0x88, 0x43, 0xe5, 0x5b, 0x90, 0xe7, 0x9c, 0x9d, 0xd5, 0x80, 0xf9, 0xa8, 0x14, 0xe4, 0x19,
0x8e, 0x09, 0xc4, 0x7b, 0x93, 0xaf, 0xd1, 0x14, 0xb9, 0x93, 0xa5, 0xd7, 0x55, 0x20, 0xaa, 0xcd,
0x3f, 0x79, 0xf3, 0x4c, 0x47, 0x20, 0x67, 0x3b, 0xe2, 0x09, 0xe2, 0x93, 0x55, 0xd9, 0x2b, 0xc4,
0xfd, 0x00, 0xde, 0x67, 0x32, 0xaf, 0xc8, 0x76, 0x4d, 0xd4, 0x52, 0x85, 0xe8, 0x0c, 0xae, 0x85,
0x08, 0xf1, 0x3b, 0x79, 0x9f, 0xa9, 0xb0, 0x5c, 0x4a, 0x96, 0xed, 0xd6, 0xfb, 0x4e, 0x2c, 0xec,
0xe2, 0x3b, 0xcf, 0x06, 0xab, 0xb6, 0x6e, 0x2b, 0x84, 0x59, 0xd8, 0x4f, 0xcb, 0xaa, 0xcf, 0xda,
0x56, 0x73, 0x00, 0xfb, 0x80, 0x18, 0x5c, 0x10, 0x28, 0xc5, 0xac, 0xab, 0x10, 0x7b, 0x11, 0xa7,
0x10, 0xf7, 0x02, 0x09, 0x27, 0x0d, 0xda, 0x9e, 0x28, 0x51, 0xc7, 0x91, 0xbf, 0x06, 0xcd, 0x03,
0xdf, 0x82, 0xb8, 0x8b, 0x18, 0xc7, 0x11, 0x59, 0x71, 0x0c, 0xe1, 0x18, 0x43, 0x6c, 0x5a, 0x34,
0x50, 0xb2, 0x50, 0x03, 0x95, 0x26, 0x73, 0xde, 0x32, 0x9c, 0xc0, 0xf3, 0x08, 0x51, 0xb1, 0xa8,
0xa0, 0x04, 0x78, 0x99, 0x8d, 0x89, 0x7c, 0x8e, 0x08, 0x87, 0x5f, 0x12, 0x50, 0x20, 0xe9, 0x31,
0x3c, 0x93, 0x78, 0x22, 0x6a, 0xd8, 0xb9, 0xb4, 0xdf, 0x72, 0x33, 0x55, 0x7b, 0x65, 0x49, 0x33,
0x2a, 0x1e, 0x7f, 0x00, 0x3b, 0x07, 0xa5, 0x82, 0xd9, 0x6d, 0xe3, 0x0e, 0x00, 0x00, 0x00, 0x00,
0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
};
const BITMAP_OPAQUE teardrop_xpm[1] = {{ png, sizeof( png ), "teardrop_xpm" }};
//EOF
bitmaps_png/sources/teardrop.svg 0 → 100644
View file @ 7e5160ad
<?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"
height="26"
width="26"
version="1.1"
id="svg2"
inkscape:version="0.48.4 r9939"
sodipodi:docname="teardrop.svg">
<metadata
id="metadata40">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1145"
id="namedview38"
showgrid="true"
inkscape:snap-to-guides="true"
inkscape:snap-grids="true"
inkscape:zoom="11.480769"
inkscape:cx="0.90377749"
inkscape:cy="13.14331"
inkscape:window-x="-2"
inkscape:window-y="-3"
inkscape:window-maximized="1"
inkscape:current-layer="svg2"
inkscape:snap-nodes="true"
showguides="true"
inkscape:guide-bbox="true">
<inkscape:grid
type="xygrid"
id="grid3017"
empspacing="2"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true"
spacingx="0.5px"
spacingy="0.5px" />
<sodipodi:guide
orientation="1,0"
position="13.9799,29.876048"
id="guide2985" />
<sodipodi:guide
orientation="0,1"
position="-6.314908,26.000001"
id="guide3759" />
</sodipodi:namedview>
<defs
id="defs4" />
<g
transform="matrix(1.8988392,0,0,1.8049231,-0.35416962,-2.1192706)"
id="g16">
<rect
height="16"
width="16"
y="0"
x="0"
id="rect18"
style="fill-opacity:0" />
</g>
<path
style="fill:#008000;fill-opacity:0.69803922;stroke:#008000;stroke-width:1.40669954;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 10.149809,2.2013364 c -4.4830438,0 -8.1172701,3.5046916 -8.1172701,7.8279486 0,4.323256 3.6342263,7.827948 8.1172701,7.827948 4.483045,0 8.11727,-3.504692 8.11727,-7.827948 0,-4.323257 -3.634225,-7.8279486 -8.11727,-7.8279486 z m 0,4.6046755 c 1.845961,0 3.342404,1.4431091 3.342404,3.2232731 0,1.780166 -1.496443,3.223274 -3.342404,3.223274 -1.8459594,0 -3.3424043,-1.443108 -3.3424043,-3.223274 0,-1.780164 1.4964449,-3.2232731 3.3424043,-3.2232731 z"
id="path3763"
inkscape:connector-curvature="0" />
<g
id="g2994"
transform="matrix(1.3622473,0,0,1.3136931,-0.11382208,0.18869012)">
<path
sodipodi:nodetypes="cc"
inkscape:transform-center-y="-0.75"
inkscape:transform-center-x="-1"
inkscape:connector-curvature="0"
id="path3785"
d="m 13.311817,6 c 1.681609,5.754209 0.810147,7.111554 5.011509,12.215504"
style="fill:none;stroke:#008000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<g
id="g2991">
<path
sodipodi:nodetypes="cc"
inkscape:transform-center-y="1"
inkscape:transform-center-x="0.75000025"
inkscape:connector-curvature="0"
id="path3793"
d="m 6,13.242044 c 5.5,1.497487 6.823326,0.47346 12.323326,4.97346"
style="fill:none;stroke:#008000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
</g>
</g>
<path
style="fill:#008000;fill-opacity:0.69803922;stroke:#008000;stroke-width:0.19356525;stroke-miterlimit:4;stroke-opacity:0.69803922;stroke-dasharray:none"
d="m 22.686641,23.064435 c -2.540516,-1.641383 -5.640602,-3.177036 -8.755187,-4.336945 -0.786328,-0.292839 -1.467616,-0.567542 -1.513977,-0.610454 -0.04637,-0.04291 0.08331,-0.121542 0.288154,-0.174705 0.567686,-0.147372 1.74482,-0.732635 2.453117,-1.219676 1.501906,-1.032735 2.888986,-2.854115 3.377048,-4.434411 0.06005,-0.194431 0.138792,-0.350763 0.174984,-0.347405 0.0362,0.0034 0.341433,0.785005 0.678313,1.73699 1.185674,3.350585 2.507537,6.201535 4.061269,8.759211 0.688623,1.133585 0.837867,1.502238 0.595333,1.470567 -0.03723,-0.0049 -0.648801,-0.384288 -1.359054,-0.843172 z"
id="path3818"
inkscape:connector-curvature="0" />
</svg>
include/bitmaps.h
View file @ 7e5160ad
...@@ -509,6 +509,7 @@ EXTERN_BITMAP( show_zone_disable_xpm ) ...@@ -509,6 +509,7 @@ EXTERN_BITMAP( show_zone_disable_xpm )
EXTERN_BITMAP( show_zone_outline_only_xpm ) EXTERN_BITMAP( show_zone_outline_only_xpm )
EXTERN_BITMAP( svg_file_xpm ) EXTERN_BITMAP( svg_file_xpm )
EXTERN_BITMAP( swap_layer_xpm ) EXTERN_BITMAP( swap_layer_xpm )
EXTERN_BITMAP( teardrop_xpm )
EXTERN_BITMAP( text_sketch_xpm ) EXTERN_BITMAP( text_sketch_xpm )
EXTERN_BITMAP( three_d_xpm ) EXTERN_BITMAP( three_d_xpm )
EXTERN_BITMAP( tool_ratsnest_xpm ) EXTERN_BITMAP( tool_ratsnest_xpm )
......
pcbnew/class_teardrop.cpp
View file @ 7e5160ad
...@@ -15,6 +15,7 @@ TEARDROP::TEARDROP() ...@@ -15,6 +15,7 @@ TEARDROP::TEARDROP()
bool TEARDROP::Create(TRACK& aTrack, ENDPOINT_T aEndPoint, TEARDROP_TYPE aType = TEARDROP_STRAIGHT ) bool TEARDROP::Create(TRACK& aTrack, ENDPOINT_T aEndPoint, TEARDROP_TYPE aType = TEARDROP_STRAIGHT )
{ {
bool result = false; bool result = false;
bool dummyObject = false;
BOARD_CONNECTED_ITEM* object = getObjectOnEnd( aTrack, aEndPoint ); BOARD_CONNECTED_ITEM* object = getObjectOnEnd( aTrack, aEndPoint );
VIA* aVia = NULL; VIA* aVia = NULL;
...@@ -37,6 +38,7 @@ bool TEARDROP::Create(TRACK& aTrack, ENDPOINT_T aEndPoint, TEARDROP_TYPE aType = ...@@ -37,6 +38,7 @@ bool TEARDROP::Create(TRACK& aTrack, ENDPOINT_T aEndPoint, TEARDROP_TYPE aType =
aVia->SetLayer( object->GetLayer() ); aVia->SetLayer( object->GetLayer() );
aVia->SetPosition( object->GetPosition() ); aVia->SetPosition( object->GetPosition() );
aVia->SetWidth( 2 * dynamic_cast<D_PAD*>( object )->GetBoundingRadius() ); aVia->SetWidth( 2 * dynamic_cast<D_PAD*>( object )->GetBoundingRadius() );
dummyObject = true;
break; break;
default: default:
...@@ -53,6 +55,10 @@ bool TEARDROP::Create(TRACK& aTrack, ENDPOINT_T aEndPoint, TEARDROP_TYPE aType = ...@@ -53,6 +55,10 @@ bool TEARDROP::Create(TRACK& aTrack, ENDPOINT_T aEndPoint, TEARDROP_TYPE aType =
result = curvedSegments( aTrack, *aVia ); result = curvedSegments( aTrack, *aVia );
} }
if (dummyObject == true)
{
delete aVia;
}
return result; return result;
} }
...@@ -150,7 +156,7 @@ bool TEARDROP::curvedSegments( TRACK& aTrack, const VIA& aVia ) ...@@ -150,7 +156,7 @@ bool TEARDROP::curvedSegments( TRACK& aTrack, const VIA& aVia )
for( int iteration = 0; iteration < numSegments; iteration++ ) for( int iteration = 0; iteration < numSegments; iteration++ )
{ {
radius = radius - delta; radius = radius - delta;
for( int i = 10; i <= 60; i = i + 10 ) for( int i = 0; i <= 60; i = i + 10 )
{ {
pointOnCurve( i, radius, point ); pointOnCurve( i, radius, point );
point = point.Rotate( rotationAngle ); point = point.Rotate( rotationAngle );
...@@ -170,7 +176,7 @@ bool TEARDROP::curvedSegments( TRACK& aTrack, const VIA& aVia ) ...@@ -170,7 +176,7 @@ bool TEARDROP::curvedSegments( TRACK& aTrack, const VIA& aVia )
} }
lowerSegment.clear(); lowerSegment.clear();
for( int i = 350; i >= 300; i = i - 10 ) for( int i = 360; i >= 300; i = i - 10 )
{ {
pointOnCurve( i, radius, point ); pointOnCurve( i, radius, point );
point = point.Rotate( rotationAngle ); point = point.Rotate( rotationAngle );
......
pcbnew/menubar_pcbframe.cpp
View file @ 7e5160ad
...@@ -616,7 +616,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() ...@@ -616,7 +616,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
AddMenuItem( toolsMenu, ID_TEARDROPS_WINDOW, AddMenuItem( toolsMenu, ID_TEARDROPS_WINDOW,
_( "Teardrops" ), _( "Teardrops" ),
_("Add teardrops"), KiBitmap( new_pcb_xpm ) ); _("Add teardrops"), KiBitmap( teardrop_xpm ) );
#if defined(KICAD_SCRIPTING_WXPYTHON) #if defined(KICAD_SCRIPTING_WXPYTHON)
AddMenuItem( toolsMenu, ID_TOOLBARH_PCB_SCRIPTING_CONSOLE, AddMenuItem( toolsMenu, ID_TOOLBARH_PCB_SCRIPTING_CONSOLE,
......
pcbnew/pcbframe.cpp
View file @ 7e5160ad
...@@ -65,12 +65,11 @@ ...@@ -65,12 +65,11 @@
#include <worksheet_viewitem.h> #include <worksheet_viewitem.h>
#include <ratsnest_data.h> #include <ratsnest_data.h>
#include <ratsnest_viewitem.h> #include <ratsnest_viewitem.h>
#include <tools/edit_teardrops.h>
#include <tool/tool_manager.h> #include <tool/tool_manager.h>
#include <tool/tool_dispatcher.h> #include <tool/tool_dispatcher.h>
#include <tools/common_actions.h> #include <tools/common_actions.h>
#include <tools/selection_tool.h> #include "tools/edit_teardrops.h"
#include <scripting/python_console_frame.h> #include <scripting/python_console_frame.h>
...@@ -737,6 +736,7 @@ void PCB_EDIT_FRAME::ShowTeardropsEditor( wxCommandEvent& event ) ...@@ -737,6 +736,7 @@ void PCB_EDIT_FRAME::ShowTeardropsEditor( wxCommandEvent& event )
m_toolManager->GetTool<TEARDROPS_EDITOR>()->EditTeardrops(settings); m_toolManager->GetTool<TEARDROPS_EDITOR>()->EditTeardrops(settings);
OnModify(); OnModify();
} }
delete dlg_teardrops;
} }
void PCB_EDIT_FRAME::LoadSettings( wxConfigBase* aCfg ) void PCB_EDIT_FRAME::LoadSettings( wxConfigBase* aCfg )
......
pcbnew/tools/edit_teardrops.cpp
View file @ 7e5160ad
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include "view/view.h" #include "view/view.h"
#include "common_actions.h" #include "common_actions.h"
#include "router/pns_router.h" #include "router/pns_router.h"
#include "tool/tool_manager.h"
TEARDROPS_EDITOR::TEARDROPS_EDITOR() : TEARDROPS_EDITOR::TEARDROPS_EDITOR() :
TOOL_BASE( BATCH, TOOL_MANAGER::MakeToolId( "pcbnew.TeardropsEditor" ), TOOL_BASE( BATCH, TOOL_MANAGER::MakeToolId( "pcbnew.TeardropsEditor" ),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment