--- a/etherlab/EthercatMaster.py Fri May 10 09:16:07 2013 +0200
+++ b/etherlab/EthercatMaster.py Thu May 16 23:21:01 2013 +0200
@@ -247,6 +247,9 @@
def GetContextualMenuItems(self):
return [("Add Ethercat Slave", "Add Ethercat Slave to Master", self.OnAddEthercatSlave)]
--- a/etherlab/etherlab.py Fri May 10 09:16:07 2013 +0200
+++ b/etherlab/etherlab.py Thu May 16 23:21:01 2013 +0200
@@ -464,6 +464,9 @@
self.ModulesLibrary = None
self.LoadModulesLibrary()
def GetModulesLibraryPath(self, project_path=None):
project_path = self.CTNPath()
--- a/etherlab/images/icons.svg Fri May 10 09:16:07 2013 +0200
+++ b/etherlab/images/icons.svg Thu May 16 23:21:01 2013 +0200
@@ -43,9 +43,9 @@
- inkscape:zoom="1.4142136"
- inkscape:cx="233.96247"
- inkscape:cy="947.27561"
+ inkscape:zoom="8.0000002" + inkscape:cx="294.02018" + inkscape:cy="814.50324" inkscape:current-layer="svg2"
@@ -61539,6 +61539,68 @@
inkscape:vp_x="0 : 526.18109 : 1"
inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ inkscape:collect="always" + xlink:href="#linearGradient5175-3-4" + id="linearGradient18288-54" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-40,0)" + id="linearGradient5175-3-4"> + style="stop-color:#bdcccd;stop-opacity:1;" + style="stop-color:#7979ff;stop-opacity:1;" + gradientTransform="translate(-40,0)" + gradientUnits="userSpaceOnUse" + id="linearGradient13566" + xlink:href="#linearGradient5175-3-4" + inkscape:collect="always" /> + inkscape:collect="always" + xlink:href="#linearGradient5175-3-6" + id="linearGradient18288-8" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-40,0)" + id="linearGradient5175-3-6"> + style="stop-color:#bdcccd;stop-opacity:1;" + style="stop-color:#7979ff;stop-opacity:1;" + gradientTransform="translate(-40,0)" + gradientUnits="userSpaceOnUse" + id="linearGradient13566-2" + xlink:href="#linearGradient5175-3-6" + inkscape:collect="always" /> style="font-size:40.12579727px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
@@ -61764,14 +61826,38 @@
- transform="matrix(-4.2446832,-1.7695903,0,4.2446832,2533.2515,-2614.9729)"
+ transform="matrix(-4.2446832,-1.7695903,0,4.2446832,2533.2515,-2530.0792)" + style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Ume Gothic C5;-inkscape-font-specification:Ume Gothic C5" + dx="0 -3.3841705 -2.9611492 -2.1151066 -3.8071918">Ether<tspan + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans Bold" + dx="-3.3841705 -4.6532345 -6.3453197">CAT</tspan></tspan></text> + style="color:#000000;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.72142136px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="m 474.55583,247.23926 46.68198,0 -0.0748,-5.64517 15.94727,11.21704 -62.55448,0 z" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccc" /> + style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.72142136px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="m 537.07809,260.62642 -17.93418,0 0.0748,5.64517 -15.94727,-11.21704 33.80668,0 z" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccc" /> sodipodi:linespacing="125%"
@@ -61816,14 +61902,38 @@
- transform="matrix(-4.2030416,-1.7522306,0,4.2030416,2515.7719,-2599.2493)"
+ transform="matrix(-4.2030416,-1.7522306,0,4.2030416,2515.7719,-2515.1885)" + style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Ume Gothic C5;-inkscape-font-specification:Ume Gothic C5" + dx="0 -3.3841705 -2.9611492 -2.1151066 -3.8071918">Ether<tspan + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans Bold" + dx="-3.3841705 -4.6532345 -6.3453197">CAT</tspan></tspan></text> + style="color:#000000;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.72142136px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="m 474.55583,247.23926 46.68198,0 -0.0748,-5.64517 15.94727,11.21704 -62.55448,0 z" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccc" /> + style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.72142136px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="m 537.07809,260.62642 -17.93418,0 0.0748,5.64517 -15.94727,-11.21704 33.80668,0 z" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccc" /> sodipodi:linespacing="125%"
@@ -61931,14 +62041,38 @@
style="opacity:0.20454544;fill:url(#radialGradient16655);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
inkscape:connector-curvature="0" />
- transform="matrix(0.11674554,0,0,0.11674554,-1100.4775,533.64398)"
+ transform="matrix(0.11674554,0,0,0.11674554,-1100.4775,535.97889)" + style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + sodipodi:linespacing="125%"><tspan + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Ume Gothic C5;-inkscape-font-specification:Ume Gothic C5" + dx="0 -3.3841705 -2.9611492 -2.1151066 -3.8071918">Ether<tspan + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans Bold" + dx="-3.3841705 -4.6532345 -6.3453197">CAT</tspan></tspan></text> + style="color:#000000;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.72142136px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="m 474.55583,247.23926 46.68198,0 -0.0748,-5.64517 15.94727,11.21704 -62.55448,0 z" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccc" /> + style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.72142136px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="m 537.07809,260.62642 -17.93418,0 0.0748,5.64517 -15.94727,-11.21704 33.80668,0 z" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccc" /> @@ -63073,38 +63207,21 @@
sodipodi:role="line">ab</tspan></text>
- transform="translate(0,20)">
- sodipodi:linespacing="125%"
+ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + sodipodi:linespacing="125%"><tspan - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
- xml:space="preserve"><tspan
- dx="0 -3.3841705 -2.9611492 -2.1151066 -3.8071918"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Ume Gothic C5;-inkscape-font-specification:Ume Gothic C5"
- sodipodi:role="line">Ether<tspan
- dx="-3.3841705 -4.6532345 -6.3453197"
- style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans Bold">CAT</tspan></tspan></text>
- sodipodi:nodetypes="cccccc"
- inkscape:connector-curvature="0"
- d="m 474.55583,247.23926 46.68198,0 -0.0748,-5.64517 15.94727,11.21704 -62.55448,0 z"
- style="color:#000000;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.72142136px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
- sodipodi:nodetypes="cccccc"
- inkscape:connector-curvature="0"
- d="m 537.07809,260.62642 -17.93418,0 0.0748,5.64517 -15.94727,-11.21704 33.80668,0 z"
- style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.72142136px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Ume Gothic C5;-inkscape-font-specification:Ume Gothic C5" + dx="0 -3.3841705 -2.9611492 -2.1151066 -3.8071918">Ether<tspan + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans Bold" + id="tspan13528" /></tspan></text> transform="translate(189.64271,0.17806707)"
@@ -63621,9 +63738,9 @@
- sodipodi:role="line">%% Slave CIA402Slave %%</tspan></text>
+ sodipodi:role="line">%% Ethercat Slave CIA402Slave %%</tspan></text> - transform="translate(253.01843,213.90813)"
+ transform="translate(310.76843,213.90813)" inkscape:export-xdpi="90"
@@ -63637,7 +63754,7 @@
inkscape:label="#rect2160" />
- transform="translate(314.66593,213.68848)"
+ transform="translate(372.41593,213.68848)" inkscape:export-xdpi="90"
@@ -63655,7 +63772,7 @@
- transform="matrix(0.53043689,0,0,0.53043689,-39.190359,146.32621)"
+ transform="matrix(0.53043689,0,0,0.53043689,18.559641,146.32621)" @@ -63663,7 +63780,7 @@
- transform="matrix(0.51386408,0,0,0.51386408,-10.570915,148.43892)"
+ transform="matrix(0.51386408,0,0,0.51386408,47.179085,148.43892)" @@ -63885,4 +64002,68 @@
d="M 18.531,8.7812 V 10 A 0.51754,0.51754 0 0 1 18,10.531 H 9.4375 l 0.03125,2.9375 h 8.5312 a 0.51754,0.51754 0 0 1 0.531,0.532 v 1.1562 l 3.469,-3.281 -3.469,-3.0938 z"
transform="translate(0,0.99987)" />
+ transform="translate(259.01843,213.90813)" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + inkscape:connector-curvature="0" + style="fill:url(#linearGradient13566);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" + d="m -40,0 0,16 16,0 0,-16 -16,0 z m 1,1 14,0 0,14 -14,0 0,-14 z" + sodipodi:nodetypes="cccccccccc" + inkscape:label="#rect2160" /> + sodipodi:nodetypes="cccccc" + inkscape:connector-curvature="0" + d="m 474.55583,267.23926 46.68198,0 -0.0748,-5.64517 15.94727,11.21704 -62.55448,0 z" + style="color:#000000;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.72142136px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + sodipodi:nodetypes="cccccc" + inkscape:connector-curvature="0" + d="m 537.07809,280.62642 -17.93418,0 0.0748,5.64517 -15.94727,-11.21704 33.80668,0 z" + style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.72142136px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + sodipodi:linespacing="125%" + style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + xml:space="preserve"><tspan + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Ume Gothic C5;-inkscape-font-specification:Ume Gothic C5" + sodipodi:role="line"><tspan + dx="-3.3841705 -4.6532345 -6.3453197" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans Bold">CAT</tspan></tspan></text> + transform="matrix(0.11737773,0,0,0.11737773,193.85555,200.05415)"> + transform="translate(-100,-124.66768)" + xlink:href="#text13524" + transform="translate(-200,-78)"