Permalink
Browse files

Add ellipse and arc ellipse

  • Loading branch information...
feragon committed Jun 17, 2016
1 parent 97b2c31 commit c2fb484933fb1c07e7e8a393f8493625f585dc23
View
@@ -32,7 +32,6 @@ bool LuaQObject::connect(int signalId, LuaIntf::LuaRef slot) {
int LuaQObject::qt_metacall(QMetaObject::Call c, int id, void **a)
{
id = QObject::qt_metacall(c, id, a);
if(id == 0) {
View
@@ -44,8 +44,9 @@ void addQtBaseBindings(lua_State *L) {
.endClass()
.beginExtendClass<QAction, QObject>("QAction")
.addConstructor(LUA_ARGS(QObject*))
.addConstructor(LUA_ARGS(LuaIntf::_opt<QObject*>))
.addFunction("setText", &QAction::setText)
.addFunction("setIcon", &QAction::setIcon)
.endClass()
.beginClass<QIcon>("QIcon")
@@ -77,7 +78,9 @@ void addQtWindowBindings(lua_State *L) {
.endClass()
.beginExtendClass<QMenu, QWidget>("QMenu")
.addConstructor(LUA_ARGS(QWidget*))
.addFactory([]() {
return new QMenu();
})
.addFunction("setTitle", &QMenu::setTitle)
.addFunction("addActionStr", static_cast<QAction* (QMenu::*)(const QString&)>(&QMenu::addAction))
.endClass()
@@ -155,6 +158,7 @@ void addQtWidgetsBindings(lua_State *L) {
return new QPushButton(name);
})
.addFunction("setFlat", &QPushButton::setFlat)
.addFunction("setMenu", &QPushButton::setMenu)
.endClass()
.endModule();
}
View
@@ -0,0 +1,70 @@
<?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"
width="256"
height="256"
viewBox="0 0 72.248892 72.248892"
id="svg4295"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="ellipses.svg"
inkscape:export-filename="E:\icons\measure.png"
inkscape:export-xdpi="8.4375"
inkscape:export-ydpi="8.4375">
<metadata
id="metadata4325">
<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></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs4323" />
<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="1176"
id="namedview4321"
showgrid="true"
units="px"
inkscape:snap-grids="true"
inkscape:zoom="3.7226562"
inkscape:cx="64.067155"
inkscape:cy="128"
inkscape:window-x="-4"
inkscape:window-y="-4"
inkscape:window-maximized="1"
inkscape:current-layer="svg4295"
inkscape:object-nodes="true"
inkscape:snap-object-midpoints="false">
<inkscape:grid
type="xygrid"
id="grid4867" />
</sodipodi:namedview>
<ellipse
cy="51.087631"
cx="-3.5066179e-005"
id="circle6020"
style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.25777793;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:3.99626684;stroke-opacity:1"
rx="28.222225"
ry="19.191113"
transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
</svg>
@@ -0,0 +1,105 @@
<?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"
width="256"
height="256"
viewBox="0 0 72.248892 72.248892"
id="svg4295"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="ellipse_arc_axis.svg"
inkscape:export-filename="E:\icons\measure.png"
inkscape:export-xdpi="8.4375"
inkscape:export-ydpi="8.4375">
<metadata
id="metadata4325">
<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></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs4323" />
<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="1176"
id="namedview4321"
showgrid="true"
units="px"
inkscape:snap-grids="true"
inkscape:zoom="3.7226562"
inkscape:cx="128"
inkscape:cy="128"
inkscape:window-x="-4"
inkscape:window-y="-4"
inkscape:window-maximized="1"
inkscape:current-layer="svg4295"
inkscape:object-nodes="true"
inkscape:snap-object-midpoints="false">
<inkscape:grid
type="xygrid"
id="grid4867" />
</sodipodi:namedview>
<g
id="g8940"
transform="translate(0,6.773334)">
<path
sodipodi:open="true"
d="M 52.684117,16.933375 A 34.99556,16.933334 0 0 1 18.881002,4.3827104 34.99556,16.933334 0 0 1 35.186335,-14.664657 a 34.99556,16.933334 0 0 1 42.243378,2.691021"
sodipodi:end="5.4977871"
sodipodi:start="1.5707963"
sodipodi:ry="16.933334"
sodipodi:rx="34.99556"
sodipodi:cy="4.0456427e-005"
sodipodi:cx="52.684116"
sodipodi:type="arc"
transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)"
style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.25777793;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:3.99626684;stroke-opacity:1"
id="circle6020" />
<circle
transform="matrix(0,-1,1,0,0,0)"
style="opacity:1;fill:#00ff7f;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.25777793;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1"
id="circle5886"
cx="-23.706665"
cy="48.542194"
r="5.6444449" />
<path
inkscape:connector-curvature="0"
id="path8922"
d="M 13.546668,11.28889 36.124447,36.124447"
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.25777793;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<circle
transform="matrix(0,-1,1,0,0,0)"
r="5.6444449"
cy="36.124397"
cx="-36.124435"
id="circle5888"
style="opacity:1;fill:#00ff7f;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.25777793;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1" />
<circle
r="5.6444449"
cy="13.546636"
cx="-11.288898"
id="circle8279"
style="opacity:1;fill:#00ff7f;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.25777793;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1"
transform="matrix(0,-1,1,0,0,0)" />
</g>
</svg>
@@ -0,0 +1,99 @@
<?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"
width="256"
height="256"
viewBox="0 0 72.248892 72.248892"
id="svg4295"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="ellipse_axis.svg"
inkscape:export-filename="E:\icons\measure.png"
inkscape:export-xdpi="8.4375"
inkscape:export-ydpi="8.4375">
<metadata
id="metadata4325">
<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></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs4323" />
<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="1176"
id="namedview4321"
showgrid="true"
units="px"
inkscape:snap-grids="true"
inkscape:zoom="3.7226562"
inkscape:cx="128"
inkscape:cy="128"
inkscape:window-x="-4"
inkscape:window-y="-4"
inkscape:window-maximized="1"
inkscape:current-layer="svg4295"
inkscape:object-nodes="true"
inkscape:snap-object-midpoints="false">
<inkscape:grid
type="xygrid"
id="grid4867" />
</sodipodi:namedview>
<g
id="g8926">
<ellipse
transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)"
ry="16.933334"
rx="34.99556"
style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.25777793;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:3.99626684;stroke-opacity:1"
id="circle6020"
cx="52.684116"
cy="4.0456427e-005" />
<circle
transform="matrix(0,-1,1,0,0,0)"
style="opacity:1;fill:#00ff7f;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.25777793;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1"
id="circle5886"
cx="-23.706665"
cy="48.542194"
r="5.6444449" />
<path
inkscape:connector-curvature="0"
id="path8922"
d="M 13.546668,11.28889 36.124447,36.124447"
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.25777793;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
<circle
transform="matrix(0,-1,1,0,0,0)"
r="5.6444449"
cy="36.124397"
cx="-36.124435"
id="circle5888"
style="opacity:1;fill:#00ff7f;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.25777793;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1" />
<circle
r="5.6444449"
cy="13.546636"
cx="-11.288898"
id="circle8279"
style="opacity:1;fill:#00ff7f;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.25777793;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:8;stroke-opacity:1"
transform="matrix(0,-1,1,0,0,0)" />
</g>
</svg>
View
@@ -4,5 +4,8 @@
<file alias="linesnormal.png">icons/linesnormal.png</file>
<file alias="circle.svg">icons/circle.svg</file>
<file alias="arc.svg">icons/arc.svg</file>
<file alias="ellipse.svg">icons/ellipse.svg</file>
<file alias="ellipse_axis.svg">icons/ellipse_axis.svg</file>
<file alias="ellipse_arc_axis.svg">icons/ellipse_arc_axis.svg</file>
</qresource>
</RCC>
Oops, something went wrong.

0 comments on commit c2fb484

Please sign in to comment.