Compare commits

...

53 Commits
0.3rc ... 0.3

Author SHA1 Message Date
scorpio810
3181b846d7 Tag version 0.3
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/tags/0.3@2564 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-28 10:52:51 +00:00
scorpio810
fd3f91e11a prepare to tag 0.3 release
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2563 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-28 10:49:55 +00:00
blacksun
d314ed68c6 bug fix, diagramContent: fix the bug about & and ==
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2558 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-26 09:27:55 +00:00
silvio
0890de4505 update qet_it.ts file italian translation
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2557 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-26 05:54:26 +00:00
alfredo
9a03e014d0 update elements spanish translation
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2556 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-23 06:07:35 +00:00
alfredo
eb91fa4d67 update spanish translation
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2555 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-23 05:24:43 +00:00
silvio
6e1b3c7d2b fixing elements translation
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2554 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-21 13:46:27 +00:00
blacksun
195494cf83 element editor bug fix:
at save, if element aren't drawn at the origin point (red cross),
we move element to the nearest point of origin


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2553 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-21 13:09:23 +00:00
msouabni
8f534a0548 Update Arabic translation
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2552 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-21 07:25:37 +00:00
silvio
4d5c0ca8ec update elements translation pl_cs_pt_es_it_el
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2551 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-20 07:54:28 +00:00
scorpio810
bc4a23329b Fix regression in context menu edit image
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2550 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-19 21:53:28 +00:00
scorpio810
758502c2dc Fix regression
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2549 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-19 19:34:26 +00:00
scorpio810
a19b917217 Add new symbols, thanks Ludo-43
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2548 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-19 17:38:02 +00:00
scorpio810
1cdc0913cb Fix regression for text and image
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2547 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-19 16:33:02 +00:00
scorpio810
58b2cc37ec Fix regression in diagramcontent introduced by revision 2459 affecting selection_prop: a dialog describing the selection, thanks Pawel for report bug
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2546 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-19 16:16:25 +00:00
blacksun
eae024ebce fix warning at compil
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2545 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-17 20:48:15 +00:00
blacksun
8201daa564 element editor: improve context menu and fix the end of polygon
diagram: fix memory leak


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2544 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-17 20:14:30 +00:00
cfdev
7a9b1a81bb Add Habitat sample
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2543 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-16 10:48:07 +00:00
scorpio810
5461ff64a5 Update french translation
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2542 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-15 17:48:39 +00:00
jonasstein
dcd6703a0e more translations
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2541 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-15 17:42:10 +00:00
jonasstein
5d35e75fae translation
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2540 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-15 17:11:45 +00:00
scorpio810
d12793e95b Element editor context menu: adding a submenu
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2539 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-15 11:21:07 +00:00
silvio
c43ca7c5b9 update italian translation
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2538 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-15 06:41:52 +00:00
pawel32640
4444e85786 minor changes in the Polish translation
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2537 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-14 20:48:36 +00:00
scorpio810
e6f082f6af Fix hotspot auto when importing element in the draw area
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2536 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-14 19:44:07 +00:00
scorpio810
74354275f3 Element editor update context menu end
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2535 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-14 14:42:24 +00:00
scorpio810
1e7f23ec58 Element editor update context menu.
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2534 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-14 13:36:06 +00:00
scorpio810
f7973f43ae Element editor: add context menu
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2533 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-14 13:11:32 +00:00
pawel32640
58fd905ed0 minor changes in the Polish translation
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2532 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-14 07:39:40 +00:00
scorpio810
ab0afb7596 Element editor: disable zoomFit after paste a primitive.
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2531 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-14 03:29:35 +00:00
pavelfric
87ceb1781e Updated Czech translations
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2530 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-13 19:03:16 +00:00
pavelfric
32236c4324 Updated Czech translations
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2529 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-13 18:36:51 +00:00
pawel32640
fa02fd234f minor changes in the Polish translation
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2528 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-12 17:25:38 +00:00
pawel32640
4f58388ea7 minor changes in the Polish translation
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2527 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-12 17:20:10 +00:00
pawel32640
024a47b349 minor changes in the Polish translation
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2526 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-12 17:02:51 +00:00
scorpio810
36de201d21 Add Lancer QET.bat for windows packaging.
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2525 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-12 16:48:34 +00:00
blacksun
c060e03007 minor change to slot_UpdateComplexAction
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2524 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-12 13:42:31 +00:00
scorpio810
b62969b1c0 Add pavel patch
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2523 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-11 22:03:17 +00:00
pawel32640
e48b6827ca Polish translation update
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2522 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-11 18:49:20 +00:00
scorpio810
fdc895a91d Add remi collet patch, thanks.
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2521 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-11 17:49:27 +00:00
scorpio810
009043fe0a Minor change
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2520 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-11 16:22:27 +00:00
scorpio810
5616d42582 Delete icon.
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2519 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-11 16:01:00 +00:00
scorpio810
4dfd3caee3 Minor change
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2518 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-11 15:59:11 +00:00
scorpio810
57ccbe387b Minor change
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2517 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-11 15:48:46 +00:00
scorpio810
0b30ded795 Add news icons.
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2516 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-11 15:30:49 +00:00
pawel32640
e3a762411d Polish translation update
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2515 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-11 14:19:38 +00:00
aitolos
3c402bce70 Update Greek translation
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2514 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-11 14:01:28 +00:00
pawel32640
45b13fedff Polish translation update
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2513 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-11 13:37:41 +00:00
silvio
39edb9862e update italian translation
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2512 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-11 11:20:14 +00:00
scorpio810
dac736507f Updated english translation.
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2511 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-11 10:58:25 +00:00
scorpio810
d739e65cf2 Refresh .TS files.
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2510 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-11 10:50:54 +00:00
aitolos
a7c328e15a Update Greek translation
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2509 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-10 14:44:55 +00:00
blacksun
7cfb83d350 add edit image to context menu
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2508 bfdf4180-ca20-0410-9c96-a3a8aa849046
2013-09-10 14:44:25 +00:00
81 changed files with 5853 additions and 3381 deletions

View File

@@ -10,6 +10,6 @@
<name lang="fr">Ladder</name>
<name lang="pl">Schemat drabinkowy (LD)</name>
<name lang="es">Escalera</name>
<name lang="cs">?eb??k</name>
<name lang="cs">Žebříkové schéma</name>
</names>
</qet-directory>

View File

@@ -1,10 +1,11 @@
<definition width="400" version="0.3" hotspot_x="20" hotspot_y="10" height="100" type="element" orientation="yydy">
<definition width="410" version="0.3" hotspot_x="24" hotspot_y="15" height="110" type="element" orientation="yydy">
<names>
<name lang="en">Relay level resistive ES 2001Bamo</name>
<name lang="it">Relè di livello resistivo BAMO ES 2001</name>
<name lang="fr">Relais niveau resistif ES 2001Bamo</name>
<name lang="pl">Przekaźnik kontroli poziomu ES 2001Bamo</name>
<name lang="es">Relevador de nivel resistivo</name>
<name lang="cs">Rezistivní úroveň relé ES 2001Bamo</name>
<name lang="it">Relè di livello resistivo BAMO ES 2001</name>
</names>
<informations>Rafart Renaud</informations>
<description>

View File

@@ -1,10 +1,11 @@
<definition width="80" version="0.3" hotspot_x="5" hotspot_y="5" height="130" type="element" orientation="dyyy">
<definition width="90" version="0.3" hotspot_x="10" hotspot_y="9" height="140" type="element" orientation="dyyy">
<names>
<name lang="en">Bamo probe resistive ste</name>
<name lang="it">Sonda resistiva BAMO STE</name>
<name lang="fr">Bamo_sonde_resistif_ste</name>
<name lang="pl">Czujnik rezystancyjny Bamo STE</name>
<name lang="es">Bamo sonda resistiva ste</name>
<name lang="cs">Rezistivní čidlo Bamo STE</name>
<name lang="it">Sonda resistiva BAMO STE</name>
</names>
<informations>Rafart Renaud</informations>
<description>

View File

@@ -1,10 +1,11 @@
<definition width="160" version="0.3" hotspot_x="15" hotspot_y="35" height="70" type="element" ic="true" orientation="dyyy">
<definition width="140" version="0.3" hotspot_x="15" hotspot_y="35" height="70" type="element" ic="true" orientation="dyyy">
<names>
<name lang="ar">Campbell Batterie PS100E 12V</name>
<name lang="en">Campbell PS100E 12V Battery</name>
<name lang="it">Batteria 12V Campbell PS100E</name>
<name lang="fr">Campbell Batterie PS100E 12V</name>
<name lang="pl">Campbell - Bateria PS100E 12V</name>
<name lang="es">Campbell PS100E bateria 12V</name>
<name lang="cs">Baterie Campbell PS100E 12V</name>
</names>
<informations></informations>

View File

@@ -1,10 +1,11 @@
<definition width="400" version="0.3" hotspot_x="15" hotspot_y="35" height="120" type="element" ic="true" orientation="dyyy">
<definition width="390" version="0.3" hotspot_x="14" hotspot_y="35" height="90" type="element" ic="true" orientation="dyyy">
<names>
<name lang="ar">مركز رفع بيانات Campbell CR1000 18P قناة 1</name>
<name lang="en">Campbell CR1000 18P Central Acquisition Channel 1</name>
<name lang="it">Centrale acquisizione Campbell CR1000 18P canale 1</name>
<name lang="fr">Campbell Centrale Acquisition CR1000 18P Voie 1</name>
<name lang="pl">Campbell - Rejestrator CR1000 (część 1/3)</name>
<name lang="es">Campbell CR1000 18p Central adquisición canal 1 18P</name>
<name lang="cs">Campbell - Registrátor CR1000 (část 1/3)</name>
</names>
<informations></informations>

View File

@@ -1,10 +1,11 @@
<definition width="330" version="0.3" hotspot_x="15" hotspot_y="35" height="100" type="element" orientation="dyyy">
<definition width="320" version="0.3" hotspot_x="15" hotspot_y="35" height="90" type="element" orientation="dyyy">
<names>
<name lang="ar">مركزية رفع بيانات CR1000 15P قناة 2</name>
<name lang="en">the Central Acquisition Channel 2 CR1000 15P</name>
<name lang="it">Centale acquisizione Campbell CR1000 15P canale 2</name>
<name lang="fr">l Centrale Acquisition CR1000 15P Voie 2</name>
<name lang="pl">Campbell - Rejestrator CR1000 (część 2/3)</name>
<name lang="es">Campbell CR1000 central de adquisición canal 2 15P</name>
<name lang="cs">Campbell - Registrátor CR1000 (část 2/3)</name>
</names>
<informations></informations>

View File

@@ -1,10 +1,11 @@
<definition width="390" version="0.3" hotspot_x="15" hotspot_y="35" height="90" type="element" ic="true" orientation="dyyy">
<definition width="380" version="0.3" hotspot_x="15" hotspot_y="35" height="90" type="element" ic="true" orientation="dyyy">
<names>
<name lang="ar">مركز رفع بيانات Campbell CR1000 18P قناة 3</name>
<name lang="en">Campbell CR1000 18P Central Acquisition Channel 3</name>
<name lang="it">Centrale acquisizione Campbell CR1000 18P canale 3</name>
<name lang="fr">Campbell Centrale Acquisition CR1000 18P Voie 3</name>
<name lang="pl">Campbell - Rejestrator CR1000 (część 3/3)</name>
<name lang="es">Campbell CR1000 central de adquisición canal 3 18P</name>
<name lang="cs">Campbell - Registrátor CR1000 (část 3/3)</name>
</names>
<informations></informations>

View File

@@ -1,10 +1,11 @@
<qet-directory>
<names>
<name lang="fr">Process</name>
<name lang="ar">عمليّات</name>
<name lang="en">Process</name>
<name lang="pl">Automatyka procesów</name>
<name lang="it">Processi</name>
<name lang="fr">Process</name>
<name lang="pl">Automatyka procesów</name>
<name lang="cs">Automatizace procesů</name>
<name lang="es">Proceso</name>
</names>
</qet-directory>

View File

@@ -0,0 +1,12 @@
<qet-directory>
<names>
<name lang="en">Wit</name>
<name lang="fr">Wit</name>
<name lang="pl">Wit</name>
<name lang="cs">Wit</name>
<name lang="pt">Wit</name>
<name lang="es">Wit</name>
<name lang="it">Wit</name>
<name lang="el">Wit</name>
</names>
</qet-directory>

View File

@@ -0,0 +1,88 @@
<definition width="290" version="0.3" hotspot_x="163" hotspot_y="55" height="150" type="element" orientation="dyyy">
<names>
<name lang="en">WIT 0.8</name>
<name lang="fr">WIT 0.8</name>
<name lang="pl">Wit 0.8</name>
<name lang="cs">Wit 0.8</name>
<name lang="pt">Wit 0.8</name>
<name lang="es">Wit 0.8</name>
<name lang="it">Wit 0.8</name>
<name lang="el">Wit 0.8</name>
</names>
<informations></informations>
<description>
<rect width="280" x="-159" y="-50" antialias="false" height="139" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<input x="-134" y="12.5" size="9" rotate="true" text="WIT"/>
<text x="58" y="-10" size="6" text="DO0.7"/>
<text x="24" y="-10" size="6" text="DO0.6"/>
<text x="-10" y="-10" size="6" text="DO0.5"/>
<text x="-47" y="-10" size="6" text="DO0.4"/>
<text x="-83" y="-10" size="6" text="DO0.3"/>
<text x="-115" y="-10" size="6" text="DO0.2"/>
<text x="-151" y="-10" size="6" text="D00.1"/>
<text x="93" y="-10" size="6" text="DO0.8"/>
<input x="-14" y="67.5" size="5" rotate="true" text="0V"/>
<rect width="10" x="3" y="76" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="60" x1="-159" y2="60" x2="121"/>
<line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-158" y2="-20" x2="122"/>
<input x="-17" y="31.5" size="12" text="CLIP 0.8.0.0 "/>
<input x="39" y="69.5" size="5" rotate="true" text="BUS"/>
<input x="56" y="69.5" size="5" rotate="true" text="BUS"/>
<input x="-2" y="67.5" size="5" rotate="true" text="12V"/>
<rect width="10" x="-140" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<input x="-157" y="-27.5" size="5" rotate="true" text="01"/>
<input x="-74" y="-27.5" size="5" rotate="true" text="06"/>
<input x="19" y="-27.5" size="5" rotate="true" text="11"/>
<input x="-1" y="-27.5" size="5" rotate="true" text="10"/>
<input x="-37" y="-27.5" size="5" rotate="true" text="08"/>
<input x="-87" y="-27.5" size="5" rotate="true" text="05"/>
<input x="-122" y="-27.5" size="5" rotate="true" text="03"/>
<input x="-143" y="-27.5" size="5" rotate="true" text="02"/>
<rect width="10" x="-155" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<input x="-109" y="-27.5" size="5" rotate="true" text="04"/>
<rect width="10" x="-105" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<input x="-53" y="-26.5" size="5" rotate="true" text="07"/>
<rect width="10" x="-35" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<input x="-18" y="-27.5" size="5" rotate="true" text="09"/>
<rect width="10" x="-15" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="0" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<input x="34" y="-27.5" size="5" rotate="true" text="12"/>
<input x="88" y="-27.5" size="5" rotate="true" text="15"/>
<input x="53" y="-27.5" size="5" rotate="true" text="13"/>
<input x="69" y="-27.5" size="5" rotate="true" text="14"/>
<input x="105" y="-27.5" size="5" rotate="true" text="16"/>
<rect width="10" x="91" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="70" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="20" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="35" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="106" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="55" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="46" y="76" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="-85" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="-50" y="-44" antialias="true" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="61" y="76" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="-10" y="76" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="-120" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="-70" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<terminal x="-150" y="-49" orientation="n"/>
<terminal x="-135" y="-49" orientation="n"/>
<terminal x="-115" y="-49" orientation="n"/>
<terminal x="-100" y="-49" orientation="n"/>
<terminal x="-80" y="-49" orientation="n"/>
<terminal x="-65" y="-49" orientation="n"/>
<terminal x="-45" y="-49" orientation="n"/>
<terminal x="-30" y="-49" orientation="n"/>
<terminal x="-10" y="-49" orientation="n"/>
<terminal x="5" y="-49" orientation="n"/>
<terminal x="25" y="-49" orientation="n"/>
<terminal x="40" y="-49" orientation="n"/>
<terminal x="60" y="-49" orientation="n"/>
<terminal x="75" y="-49" orientation="n"/>
<terminal x="96" y="-49" orientation="n"/>
<terminal x="111" y="-49" orientation="n"/>
<terminal x="-5" y="88" orientation="s"/>
<terminal x="51" y="88" orientation="s"/>
<terminal x="66" y="89" orientation="s"/>
<terminal x="8" y="88" orientation="s"/>
</description>
</definition>

View File

@@ -0,0 +1,88 @@
<definition width="290" version="0.3" hotspot_x="163" hotspot_y="55" height="150" type="element" orientation="dyyy">
<names>
<name lang="en">WIT 2.2.3.1</name>
<name lang="fr">WIT 2.2.3.1</name>
<name lang="pl">Wit 2.2.3.1</name>
<name lang="cs">Wit 2.2.3.1</name>
<name lang="pt">Wit 2.2.3.1</name>
<name lang="es">Wit 2.2.3.1</name>
<name lang="it">Wit 2.2.3.1</name>
<name lang="el">Wit 2.2.3.1</name>
</names>
<informations></informations>
<description>
<rect width="280" x="-158" y="-50" antialias="false" height="139" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<text x="59" y="-10" size="6" text="AI0.3"/>
<text x="25" y="-10" size="6" text="AI0.2"/>
<text x="-10" y="-10" size="6" text="AI0.1"/>
<text x="-47" y="-10" size="6" text="DO0.2"/>
<text x="-81" y="-10" size="6" text="DO0.1"/>
<text x="-116" y="-10" size="6" text="DI0.2"/>
<text x="-153" y="-10" size="6" text="DI0.1"/>
<text x="93" y="-10" size="6" text="AO0.1"/>
<input x="-124" y="3.5" size="12" rotate="true" text="WIT "/>
<input x="-13" y="67.5" size="5" rotate="true" text="0V"/>
<rect width="10" x="3" y="76" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="60" x1="-158" y2="60" x2="122"/>
<line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-158" y2="-20" x2="122"/>
<input x="-17" y="31.5" size="12" text="CLIP 2.2.3.1 "/>
<input x="39" y="68.5" size="5" rotate="true" text="BUS"/>
<input x="55" y="68.5" size="5" rotate="true" text="BUS"/>
<input x="-2" y="67.5" size="5" rotate="true" text="12V"/>
<rect width="10" x="-140" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<input x="-157" y="-27.5" size="5" rotate="true" text="01"/>
<input x="-74" y="-27.5" size="5" rotate="true" text="06"/>
<input x="19" y="-27.5" size="5" rotate="true" text="11"/>
<input x="-1" y="-27.5" size="5" rotate="true" text="10"/>
<input x="-37" y="-27.5" size="5" rotate="true" text="08"/>
<input x="-87" y="-27.5" size="5" rotate="true" text="05"/>
<input x="-122" y="-27.5" size="5" rotate="true" text="03"/>
<input x="-143" y="-27.5" size="5" rotate="true" text="02"/>
<rect width="10" x="-155" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<input x="-109" y="-27.5" size="5" rotate="true" text="04"/>
<rect width="10" x="-105" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<input x="-53" y="-26.5" size="5" rotate="true" text="07"/>
<rect width="10" x="-35" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<input x="-18" y="-27.5" size="5" rotate="true" text="09"/>
<rect width="10" x="-15" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="0" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<input x="34" y="-27.5" size="5" rotate="true" text="12"/>
<input x="88" y="-27.5" size="5" rotate="true" text="15"/>
<input x="53" y="-27.5" size="5" rotate="true" text="13"/>
<input x="69" y="-27.5" size="5" rotate="true" text="14"/>
<input x="105" y="-27.5" size="5" rotate="true" text="16"/>
<rect width="10" x="91" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="70" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="20" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="35" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="106" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="55" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="46" y="76" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="-85" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="-50" y="-44" antialias="true" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="61" y="76" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="-10" y="76" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="-120" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="-70" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<terminal x="-150" y="-49" orientation="n"/>
<terminal x="-135" y="-49" orientation="n"/>
<terminal x="-115" y="-49" orientation="n"/>
<terminal x="-100" y="-49" orientation="n"/>
<terminal x="-80" y="-49" orientation="n"/>
<terminal x="-65" y="-49" orientation="n"/>
<terminal x="-45" y="-49" orientation="n"/>
<terminal x="-30" y="-49" orientation="n"/>
<terminal x="-10" y="-49" orientation="n"/>
<terminal x="5" y="-49" orientation="n"/>
<terminal x="25" y="-49" orientation="n"/>
<terminal x="40" y="-49" orientation="n"/>
<terminal x="60" y="-49" orientation="n"/>
<terminal x="75" y="-49" orientation="n"/>
<terminal x="96" y="-49" orientation="n"/>
<terminal x="111" y="-49" orientation="n"/>
<terminal x="-5" y="88" orientation="s"/>
<terminal x="51" y="88" orientation="s"/>
<terminal x="66" y="89" orientation="s"/>
<terminal x="8" y="88" orientation="s"/>
</description>
</definition>

View File

@@ -0,0 +1,88 @@
<definition width="290" version="0.3" hotspot_x="163" hotspot_y="55" height="150" type="element" orientation="dyyy">
<names>
<name lang="en">WIT 6.2</name>
<name lang="fr">WIT 6.2</name>
<name lang="pl">Wit 6.2</name>
<name lang="cs">Wit 6.2</name>
<name lang="pt">Wit 6.2</name>
<name lang="es">Wit 6.2</name>
<name lang="it">Wit 6.2</name>
<name lang="el">Wit 6.2</name>
</names>
<informations></informations>
<description>
<rect width="280" x="-158" y="-50" antialias="false" height="139" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<text x="59" y="-10" size="6" text="DO0.1"/>
<text x="25" y="-10" size="6" text="DI0.6"/>
<text x="-10" y="-10" size="6" text="DI0.5"/>
<text x="-47" y="-10" size="6" text="DI0.4"/>
<text x="-82" y="-10" size="6" text="DI0.3"/>
<text x="-116" y="-10" size="6" text="DI0.2"/>
<text x="-153" y="-10" size="6" text="DI0.1"/>
<text x="93" y="-10" size="6" text="DO0.2"/>
<input x="-124" y="3.5" size="12" rotate="true" text="WIT "/>
<input x="-13" y="68.5" size="5" rotate="true" text="0V"/>
<rect width="10" x="3" y="76" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="60" x1="-158" y2="60" x2="122"/>
<line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-158" y2="-20" x2="122"/>
<input x="-17" y="31.5" size="12" text="CLIP 6.2.0.O "/>
<input x="41" y="68.5" size="5" rotate="true" text="BUS"/>
<input x="57" y="68.5" size="5" rotate="true" text="BUS"/>
<input x="-2" y="68.5" size="5" rotate="true" text="12V"/>
<rect width="10" x="-140" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<input x="-157" y="-27.5" size="5" rotate="true" text="01"/>
<input x="-74" y="-27.5" size="5" rotate="true" text="06"/>
<input x="19" y="-27.5" size="5" rotate="true" text="11"/>
<input x="-1" y="-27.5" size="5" rotate="true" text="10"/>
<input x="-37" y="-27.5" size="5" rotate="true" text="08"/>
<input x="-87" y="-27.5" size="5" rotate="true" text="05"/>
<input x="-122" y="-27.5" size="5" rotate="true" text="03"/>
<input x="-143" y="-27.5" size="5" rotate="true" text="02"/>
<rect width="10" x="-155" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<input x="-109" y="-27.5" size="5" rotate="true" text="04"/>
<rect width="10" x="-105" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<input x="-53" y="-26.5" size="5" rotate="true" text="07"/>
<rect width="10" x="-35" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<input x="-18" y="-27.5" size="5" rotate="true" text="09"/>
<rect width="10" x="-15" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="0" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<input x="34" y="-27.5" size="5" rotate="true" text="12"/>
<input x="88" y="-27.5" size="5" rotate="true" text="15"/>
<input x="53" y="-27.5" size="5" rotate="true" text="13"/>
<input x="69" y="-27.5" size="5" rotate="true" text="14"/>
<input x="105" y="-27.5" size="5" rotate="true" text="16"/>
<rect width="10" x="91" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="70" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="20" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="35" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="106" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="55" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="46" y="76" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="-85" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="-50" y="-44" antialias="true" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="61" y="76" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="-10" y="76" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="-120" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="-70" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<terminal x="-150" y="-49" orientation="n"/>
<terminal x="-135" y="-49" orientation="n"/>
<terminal x="-115" y="-49" orientation="n"/>
<terminal x="-100" y="-49" orientation="n"/>
<terminal x="-80" y="-49" orientation="n"/>
<terminal x="-65" y="-49" orientation="n"/>
<terminal x="-45" y="-49" orientation="n"/>
<terminal x="-30" y="-49" orientation="n"/>
<terminal x="-10" y="-49" orientation="n"/>
<terminal x="5" y="-49" orientation="n"/>
<terminal x="25" y="-49" orientation="n"/>
<terminal x="40" y="-49" orientation="n"/>
<terminal x="60" y="-49" orientation="n"/>
<terminal x="75" y="-49" orientation="n"/>
<terminal x="96" y="-49" orientation="n"/>
<terminal x="111" y="-49" orientation="n"/>
<terminal x="-5" y="88" orientation="s"/>
<terminal x="51" y="88" orientation="s"/>
<terminal x="66" y="89" orientation="s"/>
<terminal x="8" y="88" orientation="s"/>
</description>
</definition>

View File

@@ -0,0 +1,95 @@
<definition width="290" version="0.3" hotspot_x="163" hotspot_y="55" height="150" type="element" orientation="dyyy">
<names>
<name lang="en">WIT 6.2 CPU</name>
<name lang="fr">WIT 6.2 Unité centrale</name>
<name lang="it">WIT 6.2 CPU</name>
</names>
<informations></informations>
<description>
<rect width="280" x="-158" y="-50" antialias="false" height="139" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<input x="-72" y="68.5" size="5" rotate="true" text="BUS"/>
<text x="59" y="-10" size="6" text="DO0.1"/>
<rect width="10" x="-65" y="76" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<text x="25" y="-10" size="6" text="DI0.6"/>
<input x="-124" y="68.5" size="5" rotate="true" text="Tel"/>
<text x="-10" y="-10" size="6" text="DI0.5"/>
<text x="-47" y="-10" size="6" text="DI0.4"/>
<input x="-88.5" y="68.5" size="5" rotate="true" text="PC"/>
<rect width="10" x="-120" y="76" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<text x="-82" y="-10" size="6" text="DI0.3"/>
<rect width="10" x="-85" y="76" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<text x="-116" y="-10" size="6" text="DI0.2"/>
<text x="-153" y="-10" size="6" text="DI0.1"/>
<text x="93" y="-10" size="6" text="DO0.2"/>
<input x="74" y="68.5" size="5" rotate="true" text="T"/>
<input x="-124" y="3.5" size="12" rotate="true" text="WIT "/>
<input x="2" y="68.5" size="5" rotate="true" text="0V"/>
<rect width="10" x="77" y="76" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="3" y="76" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="60" x1="-159" y2="60" x2="121"/>
<line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-158" y2="-20" x2="122"/>
<input x="-17" y="31.5" size="12" text="CLIP 6.2.0.O "/>
<input x="44" y="68.5" size="5" rotate="true" text="Ph"/>
<input x="57" y="68.5" size="5" rotate="true" text="N"/>
<input x="-16" y="68.5" size="5" rotate="true" text="12V"/>
<rect width="10" x="-140" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<input x="-157" y="-27.5" size="5" rotate="true" text="01"/>
<input x="-74" y="-27.5" size="5" rotate="true" text="06"/>
<input x="19" y="-27.5" size="5" rotate="true" text="11"/>
<input x="-1" y="-27.5" size="5" rotate="true" text="10"/>
<input x="-37" y="-27.5" size="5" rotate="true" text="08"/>
<input x="-87" y="-27.5" size="5" rotate="true" text="05"/>
<input x="-122" y="-27.5" size="5" rotate="true" text="03"/>
<input x="-143" y="-27.5" size="5" rotate="true" text="02"/>
<rect width="10" x="-155" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<input x="-109" y="-27.5" size="5" rotate="true" text="04"/>
<rect width="10" x="-105" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<input x="-53" y="-26.5" size="5" rotate="true" text="07"/>
<rect width="10" x="-35" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<input x="-18" y="-27.5" size="5" rotate="true" text="09"/>
<rect width="10" x="-15" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="0" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<input x="34" y="-27.5" size="5" rotate="true" text="12"/>
<input x="88" y="-27.5" size="5" rotate="true" text="15"/>
<input x="53" y="-27.5" size="5" rotate="true" text="13"/>
<input x="69" y="-27.5" size="5" rotate="true" text="14"/>
<input x="105" y="-27.5" size="5" rotate="true" text="16"/>
<rect width="10" x="91" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="70" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="20" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="35" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="106" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="55" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="46" y="76" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="-85" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="-50" y="-44" antialias="true" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="61" y="76" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="-10" y="76" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="-120" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="-70" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<terminal x="-150" y="-49" orientation="n"/>
<terminal x="-135" y="-49" orientation="n"/>
<terminal x="-115" y="-49" orientation="n"/>
<terminal x="-100" y="-49" orientation="n"/>
<terminal x="-80" y="-49" orientation="n"/>
<terminal x="-65" y="-49" orientation="n"/>
<terminal x="-45" y="-49" orientation="n"/>
<terminal x="-30" y="-49" orientation="n"/>
<terminal x="-10" y="-49" orientation="n"/>
<terminal x="5" y="-49" orientation="n"/>
<terminal x="25" y="-49" orientation="n"/>
<terminal x="40" y="-49" orientation="n"/>
<terminal x="60" y="-49" orientation="n"/>
<terminal x="75" y="-49" orientation="n"/>
<terminal x="96" y="-49" orientation="n"/>
<terminal x="111" y="-49" orientation="n"/>
<terminal x="-5" y="88" orientation="s"/>
<terminal x="51" y="88" orientation="s"/>
<terminal x="66" y="89" orientation="s"/>
<terminal x="8" y="88" orientation="s"/>
<terminal x="82" y="88" orientation="s"/>
<terminal x="-115" y="88" orientation="s"/>
<terminal x="-79.5" y="89" orientation="s"/>
<terminal x="-60" y="88" orientation="s"/>
</description>
</definition>

View File

@@ -0,0 +1,45 @@
<definition width="290" version="0.3" hotspot_x="163" hotspot_y="55" height="150" type="element" orientation="dyyy">
<names>
<name lang="en">WIT WLAN</name>
<name lang="fr">WIT WLAN</name>
<name lang="pl">Wit WLAN</name>
<name lang="cs">Wit WLAN</name>
<name lang="pt">Wit WLAN</name>
<name lang="es">Wit WLAN</name>
<name lang="it">Wit WLAN</name>
<name lang="el">Wit WLAN</name>
</names>
<informations></informations>
<description>
<rect width="25" x="38" y="17" antialias="false" height="25" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<input x="-128" y="3.5" size="12" rotate="true" text="WIT "/>
<input x="2" y="68.5" size="5" rotate="true" text="0V"/>
<rect width="10" x="3" y="76" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="60" x1="-159" y2="60" x2="121"/>
<line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-158" y2="-20" x2="122"/>
<rect width="280" x="-158" y="-50" antialias="false" height="139" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<input x="-31" y="27.5" size="12" text="WLAN"/>
<input x="-88" y="68.5" size="5" rotate="true" text=""/>
<input x="-84" y="67.5" size="5" rotate="true" text="BUS"/>
<input x="-16" y="68.5" size="5" rotate="true" text="12V"/>
<rect width="10" x="-140" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<input x="-157" y="-27.5" size="5" rotate="true" text="01"/>
<input x="-122" y="-27.5" size="5" rotate="true" text="03"/>
<input x="-143" y="-27.5" size="5" rotate="true" text="02"/>
<rect width="10" x="-155" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<input x="-109" y="-27.5" size="5" rotate="true" text="04"/>
<rect width="10" x="-105" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="-86" y="76" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="-71" y="76" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="-10" y="76" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<rect width="10" x="-120" y="-44" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
<terminal x="-150" y="-49" orientation="n"/>
<terminal x="-135" y="-49" orientation="n"/>
<terminal x="-115" y="-49" orientation="n"/>
<terminal x="-100" y="-49" orientation="n"/>
<terminal x="-5" y="88" orientation="s"/>
<terminal x="-81" y="88" orientation="s"/>
<terminal x="-66" y="88" orientation="s"/>
<terminal x="8" y="88" orientation="s"/>
</description>
</definition>

View File

@@ -1,10 +1,11 @@
<definition width="90" version="0.3" hotspot_x="45" hotspot_y="45" height="90" type="element" orientation="dyyy">
<names>
<name lang="el">17 ακροδεκτών</name>
<name lang="en">Pin 17</name>
<name lang="it">Circolare 17 Pin</name>
<name lang="fr">Broche_17</name>
<name lang="pl">Złącze sidemnastostykowe</name>
<name lang="cs">Kolík 17</name>
<name lang="it">Circolare 17 Pin</name>
</names>
<informations></informations>
<description>

View File

@@ -6,5 +6,6 @@
<name lang="en">Pins</name>
<name lang="cs">Kolíky</name>
<name lang="it">Connettori</name>
<name lang="el">Σύνδεσμοι</name>
</names>
</qet-directory>

View File

@@ -4,5 +4,7 @@
<name lang="pl">Keyence</name>
<name lang="it">Keyence</name>
<name lang="es">Keyence</name>
<name lang="el">Keyence</name>
<name lang="cs">Keyence</name>
</names>
</qet-directory>

View File

@@ -1,12 +1,13 @@
<definition width="100" version="0.3" hotspot_x="30" hotspot_y="35" height="210" type="element" orientation="dyyy">
<definition width="90" version="0.3" hotspot_x="24" hotspot_y="34" height="200" type="element" orientation="dyyy">
<names>
<name lang="ar">(SL-V16H R)</name>
<name lang="el">SL-V16H (Δέκτης)</name>
<name lang="en">SL-V16H (R)</name>
<name lang="it">SL-V16H (R)</name>
<name lang="fr">SL-V16H (R)</name>
<name lang="pl">SL-V16H (R)</name>
<name lang="cs">SL-V16H (R)</name>
<name lang="es">SL-V16H (R)</name>
<name lang="it">SL-V16H (R)</name>
<name lang="cs">SL-V16H (R)</name>
</names>
<informations></informations>
<description>

View File

@@ -1,12 +1,13 @@
<definition width="100" version="0.3" hotspot_x="30" hotspot_y="35" height="200" type="element" orientation="dyyy">
<definition width="90" version="0.3" hotspot_x="26" hotspot_y="33" height="200" type="element" orientation="dyyy">
<names>
<name lang="ar">(SL-V16H S)</name>
<name lang="el">SL-V16H (Πομπός)</name>
<name lang="en">SL-V16H (S)</name>
<name lang="it">SL-V16H (E)</name>
<name lang="fr">SL-V16H (S)</name>
<name lang="pl">SL-V16H (S)</name>
<name lang="cs">SL-V16H (S)</name>
<name lang="es">SL-V16H (E)</name>
<name lang="it">SL-V16H (E)</name>
<name lang="cs">SL-V16H (S)</name>
</names>
<informations></informations>
<description>

View File

@@ -7,5 +7,6 @@
<name lang="pl">Optyczne kurtyny bezpieczeństwa</name>
<name lang="es">Cortina óptica de seguridad</name>
<name lang="it">Barriera ottica di sicurezza</name>
<name lang="el">Οπτικές κουρτίνες ασφαλείας</name>
</names>
</qet-directory>

View File

@@ -1,12 +1,13 @@
<definition width="80" version="0.3" hotspot_x="20" hotspot_y="35" height="150" type="element" orientation="dyyy">
<definition width="70" version="0.3" hotspot_x="12" hotspot_y="32" height="140" type="element" orientation="dyyy">
<names>
<name lang="ar">(C4000 ECO R)</name>
<name lang="el">C4000 ECO (Δέκτης)</name>
<name lang="en">C4000 ECO (R)</name>
<name lang="it">C4000 ECO (R)</name>
<name lang="fr">C4000 ECO (R)</name>
<name lang="pl">C4000 ECO (R)</name>
<name lang="cs">C4000 ECO (R)</name>
<name lang="es">C4000 ECO (R)</name>
<name lang="it">C4000 ECO (R)</name>
<name lang="cs">C4000 ECO (R)</name>
</names>
<informations></informations>
<description>

View File

@@ -1,12 +1,13 @@
<definition width="80" version="0.3" hotspot_x="20" hotspot_y="35" height="150" type="element" orientation="dyyy">
<definition width="70" version="0.3" hotspot_x="17" hotspot_y="32" height="140" type="element" orientation="dyyy">
<names>
<name lang="ar">(C4000S ECO S)</name>
<name lang="el">C4000S ECO (Πομπός)</name>
<name lang="en">C4000S ECO (S)</name>
<name lang="it">C4000S ECO (E)</name>
<name lang="fr">C4000S ECO (S)</name>
<name lang="pl">C4000S ECO (S)</name>
<name lang="cs">C4000S ECO (S)</name>
<name lang="es">C4000S ECO (E)</name>
<name lang="it">C4000S ECO (E)</name>
<name lang="cs">C4000S ECO (S)</name>
</names>
<informations></informations>
<description>

View File

@@ -14,5 +14,6 @@
<name lang="ro">Sick</name>
<name lang="ca">Sick</name>
<name lang="cs">Sick</name>
<name lang="el">Sick</name>
</names>
</qet-directory>

View File

@@ -6,5 +6,6 @@
<name lang="cs">Allen Bradley</name>
<name lang="it">Allen Bradley</name>
<name lang="es">Allen Bradley</name>
<name lang="el">Allen Bradley</name>
</names>
</qet-directory>

View File

@@ -1,6 +1,5 @@
<qet-directory>
<names>
c
<name lang="ar">Pnoz</name>
<name lang="fr">Pnoz</name>
<name lang="pl">Pnoz</name>

View File

@@ -2,6 +2,8 @@
<names>
<name lang="en">Safety interlocks</name>
<name lang="fr">Interrupteur de position de sécurité</name>
<name lang="it">Interblocco di sicurezza</name>
<name lang="pl">Blokady bezpieczeństwa</name>
<name lang="cs">Bezpečnostní zábrany</name>
</names>
</qet-directory>

View File

@@ -4,5 +4,7 @@
<name lang="pl">Bezpieczeństwo maszyn</name>
<name lang="it">Sicurezza delle macchine</name>
<name lang="en">Security machine</name>
<name lang="el">Ασφάλεια μηχανών</name>
<name lang="cs">Bezpečnost strojů</name>
</names>
</qet-directory>

View File

@@ -8,207 +8,207 @@
<diagram title="Eclairage Cuisine en simple allumage" displayrows="true" version="0.3" cols="10" folio="%id/%total" displaycols="true" height="420" colsize="60" order="1" rows="5" author="QElectroTech Team" filename="" date="20130601" rowsize="80">
<defaultconductor num="_" type="multi"/>
<elements>
<element x="430" y="340" type="embed://import/disj_neutre.elmt" orientation="3">
<terminals>
<terminal x="0" y="-17" id="0" orientation="0"/>
<terminal x="0" y="17" id="1" orientation="2"/>
</terminals>
<inputs>
<input x="6" y="3" userrotation="-270" userx="17.0161" usery="-16.2484" text="20A"/>
</inputs>
</element>
<element x="430" y="150" type="embed://import/disj_neutre.elmt" orientation="3">
<terminals>
<terminal x="0" y="-17" id="2" orientation="0"/>
<terminal x="0" y="17" id="3" orientation="2"/>
</terminals>
<inputs>
<input x="6" y="3" userrotation="-270" userx="17.0161" usery="-16.2484" text="10A"/>
</inputs>
</element>
<element x="320" y="270" type="embed://import/lampe_pe.elmt" orientation="3">
<terminals>
<terminal x="0" y="-17" id="4" orientation="0"/>
<terminal x="0" y="17" id="5" orientation="2"/>
<terminal x="-10" y="12" id="6" orientation="2"/>
</terminals>
<inputs>
<input x="10" y="1" userrotation="-270" userx="21.45" usery="-11.55" text="L3"/>
</inputs>
</element>
<element x="320" y="210" type="embed://import/lampe_pe.elmt" orientation="3">
<terminals>
<terminal x="0" y="-17" id="7" orientation="0"/>
<terminal x="0" y="17" id="8" orientation="2"/>
<terminal x="-10" y="12" id="9" orientation="2"/>
</terminals>
<inputs>
<input x="10" y="1" userrotation="-270" userx="21.45" usery="-11.55" text="L2"/>
</inputs>
</element>
<element x="320" y="150" type="embed://import/lampe_pe.elmt" orientation="3">
<terminals>
<terminal x="0" y="-17" id="10" orientation="0"/>
<terminal x="0" y="17" id="11" orientation="2"/>
<terminal x="-10" y="12" id="12" orientation="2"/>
</terminals>
<inputs>
<input x="10" y="1" userrotation="-270" userx="21.45" usery="-11.55" text="L1"/>
</inputs>
</element>
<element x="140" y="350" type="embed://import/protections/disjoncteurs/disjonct-m.elmt" orientation="3">
<terminals>
<terminal x="10" y="26" id="13" orientation="2"/>
<terminal x="10" y="-16" id="14" orientation="0"/>
</terminals>
<inputs>
<input x="16" y="3.6666" userrotation="-270" userx="31.95" usery="-13.3834" text="20A"/>
</inputs>
</element>
<element x="300" y="340" type="embed://import/pc.elmt" orientation="0">
<terminals>
<terminal x="1" y="0" id="15" orientation="1"/>
<terminal x="-25" y="0" id="16" orientation="3"/>
<terminal x="-12" y="6" id="17" orientation="2"/>
</terminals>
<inputs>
<input x="-20" y="-22" text="PC1"/>
</inputs>
</element>
<element x="230" y="210" type="embed://import/contacts/interrupteurs/interrupteur.elmt" orientation="3">
<terminals>
<terminal x="0" y="-17" id="18" orientation="0"/>
<terminal x="0" y="17" id="19" orientation="2"/>
</terminals>
<inputs>
<input x="2.75" y="3" userrotation="-270" userx="10.2" usery="-5.55" text="S2"/>
</inputs>
</element>
<element x="230" y="150" type="embed://import/contacts/interrupteurs/interrupteur.elmt" orientation="3">
<terminals>
<terminal x="0" y="-17" id="20" orientation="0"/>
<terminal x="0" y="17" id="21" orientation="2"/>
</terminals>
<inputs>
<input x="2.75" y="3" userrotation="-270" userx="10.2" usery="-5.55" text="S1"/>
</inputs>
</element>
<element x="510" y="390" type="embed://import/sources/multifilaire/src_n.elmt" orientation="3">
<terminals>
<terminal x="6" y="0" id="22" orientation="1"/>
</terminals>
<inputs>
<input x="-17" y="0" userrotation="-270" userx="-18.3219" usery="-9.76322" text=""/>
</inputs>
</element>
<element x="560" y="390" type="embed://import/sources/multifilaire/pe.elmt" orientation="3">
<terminals>
<terminal x="6" y="0" id="23" orientation="1"/>
</terminals>
<inputs>
<input x="-23" y="0" userrotation="-270" userx="-16.969" usery="-13.55" text=""/>
</inputs>
</element>
<element x="90" y="400" type="embed://import/sources/multifilaire/src_p.elmt" orientation="3">
<terminals>
<terminal x="6" y="0" id="24" orientation="1"/>
</terminals>
<inputs>
<input x="-16" y="0" userrotation="-270" userx="-13.5425" usery="16.5674" text=""/>
</inputs>
</element>
<element x="140" y="160" type="embed://import/protections/disjoncteurs/disjonct-m.elmt" orientation="3">
<terminals>
<terminal x="10" y="26" id="25" orientation="2"/>
<terminal x="10" y="-16" id="26" orientation="0"/>
</terminals>
<inputs>
<input x="16" y="3.6666" userrotation="-270" userx="31.95" usery="-13.3834" text="10A"/>
</inputs>
</element>
<element x="560" y="80" type="embed://import/sources/multifilaire/pe.elmt" orientation="1">
<terminals>
<terminal x="6" y="0" id="27" orientation="1"/>
</terminals>
<inputs>
<input x="-23" y="0" userrotation="-90" userx="-15.869" usery="12.45" text="PE"/>
</inputs>
</element>
<element x="90" y="80" type="embed://import/sources/multifilaire/src_p.elmt" orientation="1">
<terminals>
<terminal x="6" y="0" id="28" orientation="1"/>
</terminals>
<inputs>
<input x="-16" y="0" userrotation="-90" userx="-14.5822" usery="6.73678" text="L"/>
</inputs>
</element>
<element x="510" y="80" type="embed://import/sources/multifilaire/src_n.elmt" orientation="1">
<terminals>
<terminal x="6" y="0" id="29" orientation="1"/>
<terminal x="6" y="0" id="0" orientation="1"/>
</terminals>
<inputs>
<input x="-17" y="0" userrotation="-90" userx="-17.2219" usery="7.23678" text="N"/>
</inputs>
</element>
<element x="90" y="80" type="embed://import/sources/multifilaire/src_p.elmt" orientation="1">
<terminals>
<terminal x="6" y="0" id="1" orientation="1"/>
</terminals>
<inputs>
<input x="-16" y="0" userrotation="-90" userx="-14.5822" usery="6.73678" text="L"/>
</inputs>
</element>
<element x="560" y="80" type="embed://import/sources/multifilaire/pe.elmt" orientation="1">
<terminals>
<terminal x="6" y="0" id="2" orientation="1"/>
</terminals>
<inputs>
<input x="-23" y="0" userrotation="-90" userx="-15.869" usery="12.45" text="PE"/>
</inputs>
</element>
<element x="140" y="160" type="embed://import/protections/disjoncteurs/disjonct-m.elmt" orientation="3">
<terminals>
<terminal x="10" y="26" id="3" orientation="2"/>
<terminal x="10" y="-16" id="4" orientation="0"/>
</terminals>
<inputs>
<input x="16" y="3.6666" userrotation="-270" userx="31.95" usery="-13.3834" text="10A"/>
</inputs>
</element>
<element x="90" y="400" type="embed://import/sources/multifilaire/src_p.elmt" orientation="3">
<terminals>
<terminal x="6" y="0" id="5" orientation="1"/>
</terminals>
<inputs>
<input x="-16" y="0" userrotation="-270" userx="-13.5425" usery="16.5674" text=""/>
</inputs>
</element>
<element x="560" y="390" type="embed://import/sources/multifilaire/pe.elmt" orientation="3">
<terminals>
<terminal x="6" y="0" id="6" orientation="1"/>
</terminals>
<inputs>
<input x="-23" y="0" userrotation="-270" userx="-16.969" usery="-13.55" text=""/>
</inputs>
</element>
<element x="510" y="390" type="embed://import/sources/multifilaire/src_n.elmt" orientation="3">
<terminals>
<terminal x="6" y="0" id="7" orientation="1"/>
</terminals>
<inputs>
<input x="-17" y="0" userrotation="-270" userx="-18.3219" usery="-9.76322" text=""/>
</inputs>
</element>
<element x="230" y="150" type="embed://import/contacts/interrupteurs/interrupteur.elmt" orientation="3">
<terminals>
<terminal x="0" y="-17" id="8" orientation="0"/>
<terminal x="0" y="17" id="9" orientation="2"/>
</terminals>
<inputs>
<input x="2.75" y="3" userrotation="-270" userx="10.2" usery="-5.55" text="S1"/>
</inputs>
</element>
<element x="230" y="210" type="embed://import/contacts/interrupteurs/interrupteur.elmt" orientation="3">
<terminals>
<terminal x="0" y="-17" id="10" orientation="0"/>
<terminal x="0" y="17" id="11" orientation="2"/>
</terminals>
<inputs>
<input x="2.75" y="3" userrotation="-270" userx="10.2" usery="-5.55" text="S2"/>
</inputs>
</element>
<element x="300" y="340" type="embed://import/pc.elmt" orientation="0">
<terminals>
<terminal x="1" y="0" id="12" orientation="1"/>
<terminal x="-25" y="0" id="13" orientation="3"/>
<terminal x="-12" y="6" id="14" orientation="2"/>
</terminals>
<inputs>
<input x="-20" y="-22" text="PC1"/>
</inputs>
</element>
<element x="140" y="350" type="embed://import/protections/disjoncteurs/disjonct-m.elmt" orientation="3">
<terminals>
<terminal x="10" y="26" id="15" orientation="2"/>
<terminal x="10" y="-16" id="16" orientation="0"/>
</terminals>
<inputs>
<input x="16" y="3.6666" userrotation="-270" userx="31.95" usery="-13.3834" text="20A"/>
</inputs>
</element>
<element x="320" y="150" type="embed://import/lampe_pe.elmt" orientation="3">
<terminals>
<terminal x="0" y="-17" id="17" orientation="0"/>
<terminal x="0" y="17" id="18" orientation="2"/>
<terminal x="-10" y="12" id="19" orientation="2"/>
</terminals>
<inputs>
<input x="10" y="1" userrotation="-270" userx="21.45" usery="-11.55" text="L1"/>
</inputs>
</element>
<element x="320" y="210" type="embed://import/lampe_pe.elmt" orientation="3">
<terminals>
<terminal x="0" y="-17" id="20" orientation="0"/>
<terminal x="0" y="17" id="21" orientation="2"/>
<terminal x="-10" y="12" id="22" orientation="2"/>
</terminals>
<inputs>
<input x="10" y="1" userrotation="-270" userx="21.45" usery="-11.55" text="L2"/>
</inputs>
</element>
<element x="320" y="270" type="embed://import/lampe_pe.elmt" orientation="3">
<terminals>
<terminal x="0" y="-17" id="23" orientation="0"/>
<terminal x="0" y="17" id="24" orientation="2"/>
<terminal x="-10" y="12" id="25" orientation="2"/>
</terminals>
<inputs>
<input x="10" y="1" userrotation="-270" userx="21.45" usery="-11.55" text="L3"/>
</inputs>
</element>
<element x="460" y="150" type="embed://import/disj_neutre.elmt" orientation="3">
<terminals>
<terminal x="0" y="-17" id="26" orientation="0"/>
<terminal x="0" y="17" id="27" orientation="2"/>
</terminals>
<inputs>
<input x="6" y="3" userrotation="-270" userx="17.0161" usery="-16.2484" text="10A"/>
</inputs>
</element>
<element x="460" y="340" type="embed://import/disj_neutre.elmt" orientation="3">
<terminals>
<terminal x="0" y="-17" id="28" orientation="0"/>
<terminal x="0" y="17" id="29" orientation="2"/>
</terminals>
<inputs>
<input x="6" y="3" userrotation="-270" userx="17.0161" usery="-16.2484" text="20A"/>
</inputs>
</element>
</elements>
<conductors>
<conductor num="" rotation="270" terminal1="12" userx="360" terminal2="9" usery="190" type="multi" color="#00aa00">
<segment length="9" orientation="horizontal"/>
<segment length="15" orientation="horizontal"/>
<segment length="60" orientation="vertical"/>
<segment length="-15" orientation="horizontal"/>
<segment length="-9" orientation="horizontal"/>
</conductor>
<conductor num="" rotation="270" terminal1="5" userx="380" terminal2="2" usery="190" type="multi" color="#0000ff">
<segment length="9" orientation="horizontal"/>
<segment length="30" orientation="horizontal"/>
<segment length="-120" orientation="vertical"/>
<segment length="20" orientation="horizontal"/>
<segment length="9" orientation="horizontal"/>
</conductor>
<conductor num="" rotation="270" terminal1="8" userx="380" terminal2="2" usery="180" type="multi" color="#0000ff">
<segment length="9" orientation="horizontal"/>
<segment length="30" orientation="horizontal"/>
<segment length="-60" orientation="vertical"/>
<segment length="20" orientation="horizontal"/>
<segment length="9" orientation="horizontal"/>
</conductor>
<conductor num="" rotation="270" terminal1="9" terminal2="6" type="multi" color="#00aa00">
<segment length="9" orientation="horizontal"/>
<segment length="15" orientation="horizontal"/>
<segment length="60" orientation="vertical"/>
<segment length="-15" orientation="horizontal"/>
<segment length="-9" orientation="horizontal"/>
</conductor>
<conductor num="" terminal1="0" terminal2="15" type="multi" color="#0000ff"/>
<conductor num="" terminal1="6" terminal2="27" type="multi" color="#00aa00"/>
<conductor num="" terminal1="1" terminal2="22" type="multi" color="#0000ff"/>
<conductor num="" terminal1="17" terminal2="23" type="multi" color="#00aa00">
<segment length="9" orientation="vertical"/>
<segment length="11" orientation="vertical"/>
<segment length="272" orientation="horizontal"/>
<segment length="1" orientation="vertical"/>
<segment length="9" orientation="vertical"/>
</conductor>
<conductor num="" terminal1="3" terminal2="29" type="multi" color="#0000ff"/>
<conductor num="" terminal1="11" terminal2="2" type="multi" color="#0000ff"/>
<conductor num="" rotation="270" terminal1="19" terminal2="4" type="multi" color="#ff5500"/>
<conductor num="" terminal1="19" terminal2="7" type="multi" color="#ff5500"/>
<conductor num="" terminal1="21" terminal2="10" type="multi"/>
<conductor num="2,5mm²" terminal1="13" userx="200" terminal2="16" usery="350" type="multi" color="#ff0000"/>
<conductor num="1,5mm²" rotation="270" terminal1="20" userx="160" terminal2="18" usery="210" type="multi" color="#ff0000">
<conductor num="" rotation="270" terminal1="5" terminal2="1" type="multi" color="#ff0000"/>
<conductor num="" rotation="270" terminal1="6" terminal2="2" type="multi" color="#00aa00"/>
<conductor num="" rotation="270" terminal1="7" terminal2="0" type="multi" color="#0000ff"/>
<conductor num="" rotation="270" terminal1="4" terminal2="1" type="multi" color="#ff0000"/>
<conductor num="" rotation="270" terminal1="16" terminal2="1" type="multi" color="#ff0000"/>
<conductor num="" terminal1="3" userx="160" terminal2="8" usery="120" type="multi" color="#ff0000"/>
<conductor num="1,5mm²" rotation="270" terminal1="8" userx="160" terminal2="10" usery="210" type="multi" color="#ff0000">
<segment length="-9" orientation="horizontal"/>
<segment length="-10" orientation="horizontal"/>
<segment length="60" orientation="vertical"/>
<segment length="10" orientation="horizontal"/>
<segment length="9" orientation="horizontal"/>
</conductor>
<conductor num="" terminal1="25" userx="160" terminal2="20" usery="120" type="multi" color="#ff0000"/>
<conductor num="" rotation="270" terminal1="14" terminal2="28" type="multi" color="#ff0000"/>
<conductor num="" rotation="270" terminal1="26" terminal2="28" type="multi" color="#ff0000"/>
<conductor num="" rotation="270" terminal1="22" terminal2="29" type="multi" color="#0000ff"/>
<conductor num="" rotation="270" terminal1="23" terminal2="27" type="multi" color="#00aa00"/>
<conductor num="" rotation="270" terminal1="24" terminal2="28" type="multi" color="#ff0000"/>
<conductor num="2,5mm²" terminal1="15" userx="200" terminal2="13" usery="350" type="multi" color="#ff0000"/>
<conductor num="" terminal1="9" terminal2="17" type="multi"/>
<conductor num="" terminal1="11" terminal2="20" type="multi" color="#ff5500"/>
<conductor num="" rotation="270" terminal1="11" terminal2="23" type="multi" color="#ff5500"/>
<conductor num="" terminal1="18" terminal2="26" type="multi" color="#0000ff"/>
<conductor num="" rotation="270" terminal1="27" terminal2="0" type="multi" color="#0000ff"/>
<conductor num="" terminal1="14" terminal2="6" type="multi" color="#00aa00">
<segment length="9" orientation="vertical"/>
<segment length="11" orientation="vertical"/>
<segment length="272" orientation="horizontal"/>
<segment length="1" orientation="vertical"/>
<segment length="9" orientation="vertical"/>
</conductor>
<conductor num="" rotation="270" terminal1="29" terminal2="7" type="multi" color="#0000ff"/>
<conductor num="" terminal1="25" terminal2="2" type="multi" color="#00aa00"/>
<conductor num="" terminal1="28" terminal2="12" type="multi" color="#0000ff"/>
<conductor num="" rotation="270" terminal1="22" terminal2="25" type="multi" color="#00aa00">
<segment length="9" orientation="horizontal"/>
<segment length="15" orientation="horizontal"/>
<segment length="60" orientation="vertical"/>
<segment length="-15" orientation="horizontal"/>
<segment length="-9" orientation="horizontal"/>
</conductor>
<conductor num="" rotation="270" terminal1="21" userx="380" terminal2="26" usery="180" type="multi" color="#0000ff">
<segment length="16.5" orientation="horizontal"/>
<segment length="37.5" orientation="horizontal"/>
<segment length="-60" orientation="vertical"/>
<segment length="27.5" orientation="horizontal"/>
<segment length="16.5" orientation="horizontal"/>
</conductor>
<conductor num="" rotation="270" terminal1="24" userx="380" terminal2="26" usery="190" type="multi" color="#0000ff">
<segment length="16.5" orientation="horizontal"/>
<segment length="37.5" orientation="horizontal"/>
<segment length="-120" orientation="vertical"/>
<segment length="27.5" orientation="horizontal"/>
<segment length="16.5" orientation="horizontal"/>
</conductor>
<conductor num="" rotation="270" terminal1="19" userx="360" terminal2="22" usery="190" type="multi" color="#00aa00">
<segment length="9" orientation="horizontal"/>
<segment length="15" orientation="horizontal"/>
<segment length="60" orientation="vertical"/>
<segment length="-15" orientation="horizontal"/>
<segment length="-9" orientation="horizontal"/>
</conductor>
</conductors>
<inputs>
<input x="210" y="30" text="&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;>&#xa;&lt;html>&lt;head>&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; />&lt;style type=&quot;text/css&quot;>&#xa;p, li { white-space: pre-wrap; }&#xa;&lt;/style>&lt;/head>&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;>&#xa;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;>L1 en simple allumage par S1&lt;/p>&#xa;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;>L2 et L3 en simple allumage par S2&lt;/p>&#xa;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;>1 PC 2p+T&lt;/p>&lt;/body>&lt;/html>"/>
@@ -350,7 +350,7 @@
<input x="10" y="1" userrotation="-270" userx="21.45" usery="-11.55" text="L3"/>
</inputs>
</element>
<element x="430" y="150" type="embed://import/disj_neutre.elmt" orientation="3">
<element x="460" y="150" type="embed://import/disj_neutre.elmt" orientation="3">
<terminals>
<terminal x="0" y="-17" id="28" orientation="0"/>
<terminal x="0" y="17" id="29" orientation="2"/>
@@ -359,7 +359,7 @@
<input x="6" y="3" userrotation="-270" userx="17.0161" usery="-16.2484" text="10A"/>
</inputs>
</element>
<element x="430" y="340" type="embed://import/disj_neutre.elmt" orientation="3">
<element x="460" y="340" type="embed://import/disj_neutre.elmt" orientation="3">
<terminals>
<terminal x="0" y="-17" id="30" orientation="0"/>
<terminal x="0" y="17" id="31" orientation="2"/>
@@ -395,7 +395,7 @@
<conductor num="" terminal1="11" terminal2="19" type="multi"/>
<conductor num="" terminal1="13" terminal2="22" type="multi" color="#ff5500"/>
<conductor num="" terminal1="20" terminal2="28" type="multi" color="#0000ff"/>
<conductor num="" terminal1="29" terminal2="2" type="multi" color="#0000ff"/>
<conductor num="" rotation="270" terminal1="29" terminal2="2" type="multi" color="#0000ff"/>
<conductor num="" terminal1="16" terminal2="8" type="multi" color="#00aa00">
<segment length="9" orientation="vertical"/>
<segment length="11" orientation="vertical"/>
@@ -403,7 +403,7 @@
<segment length="1" orientation="vertical"/>
<segment length="9" orientation="vertical"/>
</conductor>
<conductor num="" terminal1="31" terminal2="9" type="multi" color="#0000ff"/>
<conductor num="" rotation="270" terminal1="31" terminal2="9" type="multi" color="#0000ff"/>
<conductor num="" terminal1="30" terminal2="14" type="multi" color="#0000ff"/>
<conductor num="" terminal1="27" terminal2="4" type="multi" color="#00aa00"/>
<conductor num="" rotation="270" terminal1="24" terminal2="27" type="multi" color="#00aa00">
@@ -414,18 +414,18 @@
<segment length="-9" orientation="horizontal"/>
</conductor>
<conductor num="" rotation="270" terminal1="23" userx="380" terminal2="28" usery="180" type="multi" color="#0000ff">
<segment length="9" orientation="horizontal"/>
<segment length="30" orientation="horizontal"/>
<segment length="16.5" orientation="horizontal"/>
<segment length="37.5" orientation="horizontal"/>
<segment length="-60" orientation="vertical"/>
<segment length="20" orientation="horizontal"/>
<segment length="9" orientation="horizontal"/>
<segment length="27.5" orientation="horizontal"/>
<segment length="16.5" orientation="horizontal"/>
</conductor>
<conductor num="" rotation="270" terminal1="26" userx="380" terminal2="28" usery="190" type="multi" color="#0000ff">
<segment length="9" orientation="horizontal"/>
<segment length="30" orientation="horizontal"/>
<segment length="16.5" orientation="horizontal"/>
<segment length="37.5" orientation="horizontal"/>
<segment length="-120" orientation="vertical"/>
<segment length="20" orientation="horizontal"/>
<segment length="9" orientation="horizontal"/>
<segment length="27.5" orientation="horizontal"/>
<segment length="16.5" orientation="horizontal"/>
</conductor>
<conductor num="" rotation="270" terminal1="21" userx="360" terminal2="24" usery="190" type="multi" color="#00aa00">
<segment length="9" orientation="horizontal"/>
@@ -439,6 +439,231 @@
<input x="210" y="30" text="&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;>&#xa;&lt;html>&lt;head>&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; />&lt;style type=&quot;text/css&quot;>&#xa;p, li { white-space: pre-wrap; }&#xa;&lt;/style>&lt;/head>&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;>&#xa;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;>L1 en simple allumage par S1&lt;/p>&#xa;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;>L2 et L3 en double allumage par S2&lt;/p>&#xa;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;> S2g -&amp;gt; L2&lt;/p>&#xa;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;> S2d -&amp;gt; L3&lt;/p>&#xa;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;>1 PC 2p+T&lt;/p>&lt;/body>&lt;/html>"/>
</inputs>
</diagram>
<diagram title="Eclairage Va et Vient" displayrows="true" version="0.3" cols="10" folio="%id/%total" displaycols="true" height="420" colsize="60" order="3" rows="5" author="QElectroTech Team" filename="" date="20130626" rowsize="80">
<defaultconductor num="_" vertirotatetext="0" type="multi" horizrotatetext="0"/>
<elements>
<element x="230" y="270" type="embed://import/contacts/interrupteurs/interrupteur.elmt" orientation="3">
<terminals>
<terminal x="0" y="-17" id="0" orientation="0"/>
<terminal x="0" y="17" id="1" orientation="2"/>
</terminals>
<inputs>
<input x="2.75" y="3" userrotation="-270" userx="10.2" usery="-5.55" text="S2d"/>
</inputs>
</element>
<element x="510" y="80" type="embed://import/sources/multifilaire/src_n.elmt" orientation="1">
<terminals>
<terminal x="6" y="0" id="2" orientation="1"/>
</terminals>
<inputs>
<input x="-17" y="0" userrotation="-90" userx="-17.2219" usery="7.23678" text="N"/>
</inputs>
</element>
<element x="90" y="80" type="embed://import/sources/multifilaire/src_p.elmt" orientation="1">
<terminals>
<terminal x="6" y="0" id="3" orientation="1"/>
</terminals>
<inputs>
<input x="-16" y="0" userrotation="-90" userx="-14.5822" usery="6.73678" text="L"/>
</inputs>
</element>
<element x="560" y="80" type="embed://import/sources/multifilaire/pe.elmt" orientation="1">
<terminals>
<terminal x="6" y="0" id="4" orientation="1"/>
</terminals>
<inputs>
<input x="-23" y="0" userrotation="-90" userx="-15.869" usery="12.45" text="PE"/>
</inputs>
</element>
<element x="140" y="160" type="embed://import/protections/disjoncteurs/disjonct-m.elmt" orientation="3">
<terminals>
<terminal x="10" y="26" id="5" orientation="2"/>
<terminal x="10" y="-16" id="6" orientation="0"/>
</terminals>
<inputs>
<input x="16" y="3.6666" userrotation="-270" userx="31.95" usery="-13.3834" text="10A"/>
</inputs>
</element>
<element x="90" y="400" type="embed://import/sources/multifilaire/src_p.elmt" orientation="3">
<terminals>
<terminal x="6" y="0" id="7" orientation="1"/>
</terminals>
<inputs>
<input x="-16" y="0" userrotation="-270" userx="-13.5425" usery="16.5674" text=""/>
</inputs>
</element>
<element x="560" y="390" type="embed://import/sources/multifilaire/pe.elmt" orientation="3">
<terminals>
<terminal x="6" y="0" id="8" orientation="1"/>
</terminals>
<inputs>
<input x="-23" y="0" userrotation="-270" userx="-16.969" usery="-13.55" text=""/>
</inputs>
</element>
<element x="510" y="390" type="embed://import/sources/multifilaire/src_n.elmt" orientation="3">
<terminals>
<terminal x="6" y="0" id="9" orientation="1"/>
</terminals>
<inputs>
<input x="-17" y="0" userrotation="-270" userx="-18.3219" usery="-9.76322" text=""/>
</inputs>
</element>
<element x="230" y="150" type="embed://import/contacts/interrupteurs/interrupteur.elmt" orientation="3">
<terminals>
<terminal x="0" y="-17" id="10" orientation="0"/>
<terminal x="0" y="17" id="11" orientation="2"/>
</terminals>
<inputs>
<input x="2.75" y="3" userrotation="-270" userx="10.2" usery="-5.55" text="S1"/>
</inputs>
</element>
<element x="230" y="210" type="embed://import/contacts/interrupteurs/interrupteur.elmt" orientation="3">
<terminals>
<terminal x="0" y="-17" id="12" orientation="0"/>
<terminal x="0" y="17" id="13" orientation="2"/>
</terminals>
<inputs>
<input x="2.75" y="3" userrotation="-270" userx="10.2" usery="-5.55" text="S2g"/>
</inputs>
</element>
<element x="300" y="340" type="embed://import/pc.elmt" orientation="0">
<terminals>
<terminal x="1" y="0" id="14" orientation="1"/>
<terminal x="-25" y="0" id="15" orientation="3"/>
<terminal x="-12" y="6" id="16" orientation="2"/>
</terminals>
<inputs>
<input x="-20" y="-22" text="PC1"/>
</inputs>
</element>
<element x="140" y="350" type="embed://import/protections/disjoncteurs/disjonct-m.elmt" orientation="3">
<terminals>
<terminal x="10" y="26" id="17" orientation="2"/>
<terminal x="10" y="-16" id="18" orientation="0"/>
</terminals>
<inputs>
<input x="16" y="3.6666" userrotation="-270" userx="31.95" usery="-13.3834" text="20A"/>
</inputs>
</element>
<element x="320" y="150" type="embed://import/lampe_pe.elmt" orientation="3">
<terminals>
<terminal x="0" y="-17" id="19" orientation="0"/>
<terminal x="0" y="17" id="20" orientation="2"/>
<terminal x="-10" y="12" id="21" orientation="2"/>
</terminals>
<inputs>
<input x="10" y="1" userrotation="-270" userx="21.45" usery="-11.55" text="L1"/>
</inputs>
</element>
<element x="320" y="210" type="embed://import/lampe_pe.elmt" orientation="3">
<terminals>
<terminal x="0" y="-17" id="22" orientation="0"/>
<terminal x="0" y="17" id="23" orientation="2"/>
<terminal x="-10" y="12" id="24" orientation="2"/>
</terminals>
<inputs>
<input x="10" y="1" userrotation="-270" userx="21.45" usery="-11.55" text="L2"/>
</inputs>
</element>
<element x="320" y="270" type="embed://import/lampe_pe.elmt" orientation="3">
<terminals>
<terminal x="0" y="-17" id="25" orientation="0"/>
<terminal x="0" y="17" id="26" orientation="2"/>
<terminal x="-10" y="12" id="27" orientation="2"/>
</terminals>
<inputs>
<input x="10" y="1" userrotation="-270" userx="21.45" usery="-11.55" text="L3"/>
</inputs>
</element>
<element x="460" y="150" type="embed://import/disj_neutre.elmt" orientation="3">
<terminals>
<terminal x="0" y="-17" id="28" orientation="0"/>
<terminal x="0" y="17" id="29" orientation="2"/>
</terminals>
<inputs>
<input x="6" y="3" userrotation="-270" userx="17.0161" usery="-16.2484" text="10A"/>
</inputs>
</element>
<element x="460" y="340" type="embed://import/disj_neutre.elmt" orientation="3">
<terminals>
<terminal x="0" y="-17" id="30" orientation="0"/>
<terminal x="0" y="17" id="31" orientation="2"/>
</terminals>
<inputs>
<input x="6" y="3" userrotation="-270" userx="17.0161" usery="-16.2484" text="20A"/>
</inputs>
</element>
</elements>
<conductors>
<conductor num="" vertirotatetext="0" rotation="270" terminal1="5" terminal2="0" type="multi" horizrotatetext="0" color="#ff0000">
<segment length="9" orientation="horizontal"/>
<segment length="11" orientation="horizontal"/>
<segment length="120" orientation="vertical"/>
<segment length="10" orientation="horizontal"/>
<segment length="9" orientation="horizontal"/>
</conductor>
<conductor num="" vertirotatetext="0" terminal1="1" terminal2="25" type="multi" horizrotatetext="0" color="#aa5500"/>
<conductor num="" vertirotatetext="0" rotation="270" terminal1="7" terminal2="3" type="multi" horizrotatetext="0" color="#ff0000"/>
<conductor num="" vertirotatetext="0" rotation="270" terminal1="8" terminal2="4" type="multi" horizrotatetext="0" color="#00aa00"/>
<conductor num="" vertirotatetext="0" rotation="270" terminal1="9" terminal2="2" type="multi" horizrotatetext="0" color="#0000ff"/>
<conductor num="" vertirotatetext="0" rotation="270" terminal1="6" terminal2="3" type="multi" horizrotatetext="0" color="#ff0000"/>
<conductor num="" vertirotatetext="0" rotation="270" terminal1="18" terminal2="3" type="multi" horizrotatetext="0" color="#ff0000"/>
<conductor num="" vertirotatetext="0" terminal1="5" userx="160" terminal2="10" usery="120" type="multi" horizrotatetext="0" color="#ff0000"/>
<conductor num="1,5mm²" vertirotatetext="0" rotation="270" terminal1="10" userx="160" terminal2="12" usery="210" type="multi" horizrotatetext="0" color="#ff0000">
<segment length="-9" orientation="horizontal"/>
<segment length="-10" orientation="horizontal"/>
<segment length="60" orientation="vertical"/>
<segment length="10" orientation="horizontal"/>
<segment length="9" orientation="horizontal"/>
</conductor>
<conductor num="2,5mm²" vertirotatetext="0" terminal1="17" userx="200" terminal2="15" usery="350" type="multi" horizrotatetext="0" color="#ff0000"/>
<conductor num="" vertirotatetext="0" terminal1="11" terminal2="19" type="multi" horizrotatetext="0"/>
<conductor num="" vertirotatetext="0" terminal1="13" terminal2="22" type="multi" horizrotatetext="0" color="#ff5500"/>
<conductor num="" vertirotatetext="0" terminal1="20" terminal2="28" type="multi" horizrotatetext="0" color="#0000ff"/>
<conductor num="" vertirotatetext="0" rotation="270" terminal1="29" terminal2="2" type="multi" horizrotatetext="0" color="#0000ff"/>
<conductor num="" vertirotatetext="0" terminal1="16" terminal2="8" type="multi" horizrotatetext="0" color="#00aa00">
<segment length="9" orientation="vertical"/>
<segment length="11" orientation="vertical"/>
<segment length="272" orientation="horizontal"/>
<segment length="1" orientation="vertical"/>
<segment length="9" orientation="vertical"/>
</conductor>
<conductor num="" vertirotatetext="0" rotation="270" terminal1="31" terminal2="9" type="multi" horizrotatetext="0" color="#0000ff"/>
<conductor num="" vertirotatetext="0" terminal1="30" terminal2="14" type="multi" horizrotatetext="0" color="#0000ff"/>
<conductor num="" vertirotatetext="0" terminal1="27" terminal2="4" type="multi" horizrotatetext="0" color="#00aa00"/>
<conductor num="" vertirotatetext="0" rotation="270" terminal1="24" terminal2="27" type="multi" horizrotatetext="0" color="#00aa00">
<segment length="9" orientation="horizontal"/>
<segment length="15" orientation="horizontal"/>
<segment length="60" orientation="vertical"/>
<segment length="-15" orientation="horizontal"/>
<segment length="-9" orientation="horizontal"/>
</conductor>
<conductor num="" vertirotatetext="0" rotation="270" terminal1="23" userx="380" terminal2="28" usery="180" type="multi" horizrotatetext="0" color="#0000ff">
<segment length="16.5" orientation="horizontal"/>
<segment length="37.5" orientation="horizontal"/>
<segment length="-60" orientation="vertical"/>
<segment length="27.5" orientation="horizontal"/>
<segment length="16.5" orientation="horizontal"/>
</conductor>
<conductor num="" vertirotatetext="0" rotation="270" terminal1="26" userx="380" terminal2="28" usery="190" type="multi" horizrotatetext="0" color="#0000ff">
<segment length="16.5" orientation="horizontal"/>
<segment length="37.5" orientation="horizontal"/>
<segment length="-120" orientation="vertical"/>
<segment length="27.5" orientation="horizontal"/>
<segment length="16.5" orientation="horizontal"/>
</conductor>
<conductor num="" vertirotatetext="0" rotation="270" terminal1="21" userx="360" terminal2="24" usery="190" type="multi" horizrotatetext="0" color="#00aa00">
<segment length="9" orientation="horizontal"/>
<segment length="15" orientation="horizontal"/>
<segment length="60" orientation="vertical"/>
<segment length="-15" orientation="horizontal"/>
<segment length="-9" orientation="horizontal"/>
</conductor>
</conductors>
<inputs>
<input x="210" y="30" text="&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;>&#xa;&lt;html>&lt;head>&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; />&lt;style type=&quot;text/css&quot;>&#xa;p, li { white-space: pre-wrap; }&#xa;&lt;/style>&lt;/head>&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;>&#xa;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;>L1 en simple allumage par S1&lt;/p>&#xa;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;>L2 et L3 en double allumage par S2&lt;/p>&#xa;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;> S2g -&amp;gt; L2&lt;/p>&#xa;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;> S2d -&amp;gt; L3&lt;/p>&#xa;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;>1 PC 2p+T&lt;/p>&lt;/body>&lt;/html>"/>
</inputs>
</diagram>
<collection>
<category name="import">
<names>

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 816 B

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 663 B

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

View File

@@ -4,7 +4,7 @@
<context>
<name>QETElementEditor</name>
<message numerus="yes">
<location filename="../sources/editor/qetelementeditor.cpp" line="593"/>
<location filename="../sources/editor/qetelementeditor.cpp" line="621"/>
<source>%n partie(s) sélectionnée(s).</source>
<translation>
<numerusform>%n partie sélectionnée.</numerusform>
@@ -12,7 +12,7 @@
</translation>
</message>
<message numerus="yes">
<location filename="../sources/editor/qetelementeditor.cpp" line="642"/>
<location filename="../sources/editor/qetelementeditor.cpp" line="670"/>
<source>La vérification de cet élément a généré %n avertissement(s) :</source>
<comment>message box content</comment>
<translation>
@@ -54,9 +54,9 @@
<location filename="../sources/qet.cpp" line="266"/>
<source>%n image(s)</source>
<comment>part of a sentence listing the content of a diagram</comment>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
<translation>
<numerusform>%n image</numerusform>
<numerusform>%n image</numerusform>
</translation>
</message>
<message numerus="yes">

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -1,48 +1,61 @@
<?xml version="1.0" encoding="UTF-8"?>
<application>
<id type="desktop">qelectrotech.desktop</id>
<licence>CC0</licence>
<description>
<p>
QElectroTech is a Qt4 application to design electric diagrams.
It uses XML files for elements and diagrams, and includes both a diagram editor, a element editor, and an titleblock editor.
</p>
<p xml:lang="cs">
QElectroTech je aplikací Qt4 určenou pro návrh nákresů elektrických obvodů.
Pro prvky a nákresy používá soubory XML, a zahrnuje v sobě jak editor nákresů, tak editor prvků.
</p>
<p xml:lang="el">
Το QElectroTech είναι μια εφαρμογή Qt4 για σχεδίαση ηλεκτρικών διαγραμμάτων.
Χρησιμοποιεί αρχεία XML για στοιχεία και διαγράμματα, και περιλαμβάνει επεξεργαστή διαγραμμάτων καθώς και επεξεργαστή στοιχείων.
</p>
<p xml:lang="es">
QElectroTech es una aplicación Qt4 para diseñar esquemas eléctricos.
Utiliza archivos XML para los elementos y esquemas, e incluye un editor de esquemas y un editor de elemento.
</p>
<p xml:lang="fr">
QElectroTech est une application Qt4 pour réaliser des schémas électriques.
QET utilise le format XML pour ses éléments et ses schémas et inclut un éditeur de schémas, un éditeur d'élément, ainsi qu'un editeur de cartouche.
</p>
<p xml:lang="it">
QElectroTech è una applicazione fatta in Qt4 per disegnare schemi elettrici.
QET usa il formato XML per i suoi elementi e schemi, includendo anche un editor per gli stessi.
</p>
<p xml:lang="ru">
QElectroTech - приложение написанное на Qt4 и предназначенное для разработки электрических схем.
Оно использует XML-файлы для элементов и схем, и включает, как редактор схем, так и редактор элементов.
</p>
<p xml:lang="pl">
QElectroTech to aplikacja napisana w Qt4, przeznaczona do tworzenia schematów elektrycznych.
Wykorzystuje XML do zapisywania plików elementów i projektów. Posiada edytor schematów i elementów.
</p>
<p xml:lang="pt">
QElectroTech é uma aplicação baseada em Qt4 para desenhar esquemas eléctricos.
QET utiliza ficheiros XML para os elementos e para os esquemas e inclui um editor de esquemas e um editor de elementos.
</p>
</description>
<url type="homepage">http://qelectrotech.org</url>
<screenshots>
<screenshot type="default">http://download.tuxfamily.org/qet/screens/qelectrotech5.png</screenshot>
</screenshots>
<updatecontact>qet@lists.tuxfamily.org</updatecontact>
<id type="desktop">qelectrotech.desktop</id>
<licence>CC0</licence>
<name>QElectroTech</name>
<summary>Electrical diagram editor</summary>
<summary xml:lang="ar">مُحرّر مخططات كهربائية</summary>
<summary xml:lang="cs">Editor výkresů elektrických obvodů</summary>
<summary xml:lang="de">Zeichenprogramm für Schaltpläne</summary>
<summary xml:lang="el">Επεξεργαστής ηλεκτρικών διαγραμμάτων</summary>
<summary xml:lang="ex">Editor de esquemas eléctricos</summary>
<summary xml:lang="fr">Éditeur de schémas électriques</summary>
<summary xml:lang="hr">Editor elektro sheme</summary>
<summary xml:lang="it">Programma per disegnare schemi elettrici</summary>
<summary xml:lang="pl">Edytor schematów elektrycznych</summary>
<summary xml:lang="pt">Editor de esquemas eléctricos</summary>
<summary xml:lang="ru">Редактор электрических схем</summary>
<description>
<p>
QElectroTech is a Qt4 application to design electric diagrams.
It uses XML files for elements and diagrams, and includes both a diagram editor, a element editor, and an titleblock editor.
</p>
<p xml:lang="cs">
QElectroTech je aplikací Qt4 určenou pro návrh nákresů elektrických obvodů.
Pro prvky a nákresy používá soubory XML, a zahrnuje v sobě jak editor nákresů, tak editor prvků.
</p>
<p xml:lang="el">
Το QElectroTech είναι μια εφαρμογή Qt4 για σχεδίαση ηλεκτρικών διαγραμμάτων.
Χρησιμοποιεί αρχεία XML για στοιχεία και διαγράμματα, και περιλαμβάνει επεξεργαστή διαγραμμάτων, επεξεργαστή στοιχείων, και επεξεργαστή πινακίδων.
</p>
<p xml:lang="es">
QElectroTech es una aplicación Qt4 para diseñar esquemas eléctricos.
Utiliza archivos XML para los elementos y esquemas, e incluye un editor de esquemas y un editor de elemento.
</p>
<p xml:lang="fr">
QElectroTech est une application Qt4 pour réaliser des schémas électriques.
QET utilise le format XML pour ses éléments et ses schémas et inclut un éditeur de schémas, un éditeur d'élément, ainsi qu'un editeur de cartouche.
</p>
<p xml:lang="it">
QElectroTech è una applicazione fatta in Qt4 per disegnare schemi elettrici.
QET usa il formato XML per i suoi elementi e schemi, includendo anche un editor per gli stessi.
</p>
<p xml:lang="ru">
QElectroTech - приложение написанное на Qt4 и предназначенное для разработки электрических схем.
Оно использует XML-файлы для элементов и схем, и включает, как редактор схем, так и редактор элементов.
</p>
<p xml:lang="pl">
QElectroTech to aplikacja napisana w Qt4, przeznaczona do tworzenia schematów elektrycznych.
Wykorzystuje XML do zapisywania plików elementów i projektów. Posiada edytor schematów i elementów.
</p>
<p xml:lang="pt">
QElectroTech é uma aplicação baseada em Qt4 para desenhar esquemas eléctricos.
QET utiliza ficheiros XML para os elementos e para os esquemas e inclui um editor de esquemas e um editor de elementos.
</p>
</description>
<url type="homepage">http://qelectrotech.org</url>
<screenshots>
<screenshot type="default">http://download.tuxfamily.org/qet/screens/qelectrotech5.png</screenshot>
</screenshots>
<updatecontact>qet@lists.tuxfamily.org</updatecontact>
</application>

View File

@@ -0,0 +1,11 @@
@echo off
rem Se rend dans le dossier qui convient
set current_dir=%~dp0
cd /d %current_dir%
rem lance QElectroTech
rem Sans option --config-dir, la configuration de QElectroTech ainsi que la
rem collection d'elements perso seront dans "%APPDATA%\qet"
set command=bin\qelectrotech.exe --common-elements-dir=elements/ --lang-dir=lang/ -style plastique %*
@start %command%

View File

@@ -64,7 +64,6 @@
<file>ico/16x16/masquer.png</file>
<file>ico/16x16/neutral.png</file>
<file>ico/16x16/north.png</file>
<file>ico/16x16/object-rotate-right.png</file>
<file>ico/16x16/orientations.png</file>
<file>ico/16x16/phase.png</file>
<file>ico/16x16/preferences-desktop-user.png</file>
@@ -167,6 +166,7 @@
<file>ico/22x22/textfield.png</file>
<file>ico/22x22/text.png</file>
<file>ico/22x22/text-xml.png</file>
<file>ico/22x22/transform-scale.png</file>
<file>ico/22x22/two_pages.png</file>
<file>ico/22x22/view_fit_width.png</file>
<file>ico/22x22/view_fit_window.png</file>

View File

@@ -84,6 +84,8 @@ Diagram::~Diagram() {
delete undo_stack_;
// suppression du QGIManager - tous les elements qu'il connait sont supprimes
delete qgi_manager_;
// remove of conductor setter
delete conductor_setter_;
// suppression des objets gerant les deplacements
delete elements_mover_;

View File

@@ -100,27 +100,21 @@ QList<QGraphicsItem *> DiagramContent::items(int filter) const {
*/
int DiagramContent::count(int filter) const {
int count = 0;
if (filter == SelectedOnly) {
if (filter == Elements) foreach(Element *element, elements) { if (element -> isSelected()) ++ count; }
if (filter == TextFields) foreach(DiagramTextItem *dti, textFields) { if (dti -> isSelected()) ++ count; }
if (filter == Images) foreach(DiagramImageItem *dii, images) { if (dii -> isSelected()) ++ count; }
if (filter == ConductorsToMove) foreach(Conductor *conductor, conductorsToMove) { if (conductor -> isSelected()) ++ count; }
if (filter == ConductorsToUpdate) foreach(Conductor *conductor, conductorsToUpdate) { if (conductor -> isSelected()) ++ count; }
if (filter == OtherConductors) foreach(Conductor *conductor, otherConductors) { if (conductor -> isSelected()) ++ count; }
} else if (filter == All) {
count += elements.count();
count += textFields.count();
count += images.count();
count += conductorsToMove.count();
count += conductorsToUpdate.count();
count += otherConductors.count();
} else {
if (filter == Elements) count += elements.count();
if (filter == TextFields) count += textFields.count();
if (filter == Images) count += images.count();
if (filter == ConductorsToMove) count += conductorsToMove.count();
if (filter == ConductorsToUpdate) count += conductorsToUpdate.count();
if (filter == OtherConductors) count += otherConductors.count();
if (filter & SelectedOnly) {
if (filter & Elements) foreach(Element *element, elements) { if (element -> isSelected()) ++ count; }
if (filter & TextFields) foreach(DiagramTextItem *dti, textFields) { if (dti -> isSelected()) ++ count; }
if (filter & Images) foreach(DiagramImageItem *dii, images) { if (dii -> isSelected()) ++ count; }
if (filter & ConductorsToMove) foreach(Conductor *conductor, conductorsToMove) { if (conductor -> isSelected()) ++ count; }
if (filter & ConductorsToUpdate) foreach(Conductor *conductor, conductorsToUpdate) { if (conductor -> isSelected()) ++ count; }
if (filter & OtherConductors) foreach(Conductor *conductor, otherConductors) { if (conductor -> isSelected()) ++ count; }
}
else {
if (filter & Elements) count += elements.count();
if (filter & TextFields) count += textFields.count();
if (filter & Images) count += images.count();
if (filter & ConductorsToMove) count += conductorsToMove.count();
if (filter & ConductorsToUpdate) count += conductorsToUpdate.count();
if (filter & OtherConductors) count += otherConductors.count();
}
return(count);
}

View File

@@ -41,13 +41,13 @@ class DiagramContent {
enum Filter {
Elements = 1,
TextFields = 2,
Images = 3,
ConductorsToMove = 4,
ConductorsToUpdate = 8,
OtherConductors = 16,
AnyConductor = 28,
All = 31,
SelectedOnly = 32
Images = 4,
ConductorsToMove = 8,
ConductorsToUpdate = 16,
OtherConductors = 32,
AnyConductor = 56,
All = 63,
SelectedOnly = 64
};
/// Hold electrical elements

View File

@@ -111,55 +111,7 @@ void DiagramImageItem::mousePressEvent(QGraphicsSceneMouseEvent *e) {
*/
void DiagramImageItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) {
Q_UNUSED (event);
if (diagram() -> isReadOnly()) return;
//the range for scale image and divisor factor
int min_range = 1;
int max_range = 200;
int factor_range = 100;
//the dialog
QDialog property_dialog;
property_dialog.setWindowTitle(tr("\311diter les propri\351t\351s d'une image", "window title"));
//the main layout
QVBoxLayout *dialog_layout = new QVBoxLayout(&property_dialog);
//GroupBox for resizer image
QGroupBox *resize_groupe = new QGroupBox(tr("Dimension de l'image", "image size"));
dialog_layout -> addWidget(resize_groupe);
QHBoxLayout *resize_layout = new QHBoxLayout(resize_groupe);
//slider
QSlider *slider = new QSlider(Qt::Horizontal, &property_dialog);
slider->setRange(min_range, max_range);
qreal scale_= scale();
slider -> setValue(scale_*factor_range);
//spinbox
QSpinBox *spin_box = new QSpinBox(&property_dialog);
spin_box -> setRange(min_range, max_range);
spin_box -> setValue(scale_*factor_range);
spin_box -> setSuffix(" %");
//synchro slider with spinbox
connect(slider, SIGNAL(valueChanged(int)), spin_box, SLOT(setValue(int)));
connect(slider, SIGNAL(valueChanged(int)), this, SLOT(PreviewScale(int)));
connect(spin_box, SIGNAL(valueChanged(int)), slider, SLOT(setValue(int)));
//add slider and spinbox to layout
resize_layout -> addWidget(slider);
resize_layout -> addWidget(spin_box);
//dialog button, box
QDialogButtonBox *dbb = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
dialog_layout -> addWidget(dbb);
connect(dbb, SIGNAL(accepted()), &property_dialog, SLOT(accept()));
connect(dbb, SIGNAL(rejected()), &property_dialog, SLOT(reject()));
//dialog is accepted...
if (property_dialog.exec() == QDialog::Accepted) {
qreal new_scale = slider -> value();
new_scale /= factor_range;
if (scale_ != new_scale) diagram()->undoStack().push(new ImageResizerCommand(this, scale_, new_scale));
}
//...or not
else setScale(scale_);
return;
edit();
}
/**
@@ -266,7 +218,55 @@ void DiagramImageItem::PreviewScale(int scale) {
* @brief Edit the image with ....
*/
void DiagramImageItem::edit() {
// waiting
if (diagram() -> isReadOnly()) return;
//the range for scale image and divisor factor
int min_range = 1;
int max_range = 200;
int factor_range = 100;
//the dialog
QDialog property_dialog;
property_dialog.setWindowTitle(tr("\311diter les propri\351t\351s d'une image", "window title"));
//the main layout
QVBoxLayout *dialog_layout = new QVBoxLayout(&property_dialog);
//GroupBox for resizer image
QGroupBox *resize_groupe = new QGroupBox(tr("Dimension de l'image", "image size"));
dialog_layout -> addWidget(resize_groupe);
QHBoxLayout *resize_layout = new QHBoxLayout(resize_groupe);
//slider
QSlider *slider = new QSlider(Qt::Horizontal, &property_dialog);
slider->setRange(min_range, max_range);
qreal scale_= scale();
slider -> setValue(scale_*factor_range);
//spinbox
QSpinBox *spin_box = new QSpinBox(&property_dialog);
spin_box -> setRange(min_range, max_range);
spin_box -> setValue(scale_*factor_range);
spin_box -> setSuffix(" %");
//synchro slider with spinbox
connect(slider, SIGNAL(valueChanged(int)), spin_box, SLOT(setValue(int)));
connect(slider, SIGNAL(valueChanged(int)), this, SLOT(PreviewScale(int)));
connect(spin_box, SIGNAL(valueChanged(int)), slider, SLOT(setValue(int)));
//add slider and spinbox to layout
resize_layout -> addWidget(slider);
resize_layout -> addWidget(spin_box);
//dialog button, box
QDialogButtonBox *dbb = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
dialog_layout -> addWidget(dbb);
connect(dbb, SIGNAL(accepted()), &property_dialog, SLOT(accept()));
connect(dbb, SIGNAL(rejected()), &property_dialog, SLOT(reject()));
//dialog is accepted...
if (property_dialog.exec() == QDialog::Accepted) {
qreal new_scale = slider -> value();
new_scale /= factor_range;
if (scale_ != new_scale) diagram()->undoStack().push(new ImageResizerCommand(this, scale_, new_scale));
}
//...or not
else setScale(scale_);
return;
}
void DiagramImageItem::setPixmap(const QPixmap &pixmap) {

View File

@@ -426,14 +426,20 @@ void DiagramView::mousePressEvent(QMouseEvent *e) {
switchToVisualisationModeIfNeeded(e);
fresh_focus_in_ = false;
}
if (isInteractive() && !scene -> isReadOnly() && current_behavior > noAction && e -> buttons() == Qt::LeftButton) {
if (isInteractive() && !scene -> isReadOnly() && e -> buttons() == Qt::LeftButton) {
switch (current_behavior) {
case noAction:
break;
case addingText:
addDiagramTextAtPos(mapToScene(e -> pos()));
break;
case addingImage:
addDiagramImageAtPos(mapToScene(e -> pos()));
break;
case dragView:
break;
default:
break;
}
current_behavior = noAction;
}
@@ -1261,6 +1267,21 @@ void DiagramView::addImage() {
}
current_behavior = addingImage;
}
/**
* @brief DiagramView::editImage
* open edit image dialog if only one image is selected
*/
void DiagramView::editImage() {
if (scene -> isReadOnly()) return;
QList <QGraphicsItem *> images = diagram() -> selectedContent().items(DiagramContent::Images);
if (images.count() != 1) return;
DiagramImageItem *image;
if ((image = qgraphicsitem_cast<DiagramImageItem *> (images.first()))) {
image -> edit();
}
}
/**
* @brief DiagramView::addDiagramImageAtPos
* @param pos
@@ -1338,9 +1359,8 @@ void DiagramView::contextMenuEvent(QContextMenuEvent *e) {
context_menu -> addAction(qde -> delete_selection);
context_menu -> addAction(qde -> rotate_selection);
context_menu -> addAction(qde -> rotate_texts);
context_menu -> addAction(qde -> add_edittext);
context_menu -> addAction(qde -> edit_selection);
context_menu -> addAction(qde -> find_element);
context_menu -> addAction(qde -> edit_element);
context_menu -> addAction(qde -> selection_prop);
}

View File

@@ -75,6 +75,7 @@ class DiagramView : public QGraphicsView {
void addText();
void editText();
void addImage();
void editImage();
IndependentTextItem *addDiagramTextAtPos(const QPointF &);
DiagramImageItem *addDiagramImageAtPos(const QPointF &);

View File

@@ -157,7 +157,7 @@ void PastePartsCommand::undo() {
editor_view_ -> offset_paste_count_ = old_offset_paste_count_;
editor_view_ -> start_top_left_corner_ = old_start_top_left_corner_;
}
editor_view_ -> zoomFit();
editor_view_ -> adjustSceneRect();
}
/// refait le coller
@@ -176,7 +176,7 @@ void PastePartsCommand::redo() {
}
}
editor_scene_ -> slot_select(content_);
editor_view_ -> zoomFit();
editor_view_ -> adjustSceneRect();
}
/**

View File

@@ -385,9 +385,17 @@ void ElementScene::setGrid(int x_g, int y_g) {
representer tout l'element ou seulement les elements selectionnes
@return un document XML decrivant l'element
*/
const QDomDocument ElementScene::toXml(bool all_parts) const {
//define the size of the element by the upper multiple of 10
const QDomDocument ElementScene::toXml(bool all_parts) {
QRectF size= elementSceneGeometricRect();
//if the element doesn't contains the origin point of the scene
//we move the element to the origin for solve this default before saving
if (!size.contains(0,0) && all_parts) {
centerElementToOrigine();
//recalcul the size after movement
size= elementSceneGeometricRect();
}
//define the size of the element by the upper multiple of 10
int upwidth = ((qRound(size.width())/10)*10)+10;
if ((qRound(size.width())%10) > 6) upwidth+=10;
@@ -598,6 +606,11 @@ void ElementScene::paste() {
}
void ElementScene::contextMenu(QContextMenuEvent *event) {
if (behavior == ElementScene::Normal)
element_editor -> contextMenu(event);
}
/**
Selectionne une liste de parties
@param content liste des parties a selectionner
@@ -1143,6 +1156,33 @@ bool ElementScene::zValueLessThan(QGraphicsItem *item1, QGraphicsItem *item2) {
return(item1-> zValue() < item2 -> zValue());
}
/**
* @brief ElementScene::centerElementToOrigine
* try to center better is possible the element to the scene
* (the calcul isn't optimal but work good)
*/
void ElementScene::centerElementToOrigine() {
QRectF size= elementSceneGeometricRect();
int center_x = qRound(size.center().x());
int center_y = qRound(size.center().y());
//define the movement of translation
int move_x = center_x - (qRound(center_x) %10);
if (center_x < 0) move_x -= 10;
int move_y = center_y - (qRound(center_y) %10);
if (center_y < 0) move_y -= 10;
//move each primitive by @move
foreach (QGraphicsItem *qgi, items()) {
if (qgi -> type() == ElementPrimitiveDecorator::Type) continue;
if (qgi -> type() == QGraphicsRectItem::Type) continue;
//deselect item for disable decorator
qgi -> setSelected(false);
qgi -> moveBy(-(move_x), -(move_y));
}
emit (needZoomFit());
}
/**
Ensure the decorator is adequately shown, hidden or updated so it always
represents the current selection.

View File

@@ -121,7 +121,7 @@ class ElementScene : public QGraphicsScene {
virtual int xGrid() const;
virtual int yGrid() const;
virtual void setGrid(int, int);
virtual const QDomDocument toXml(bool = true) const;
virtual const QDomDocument toXml(bool = true);
virtual QRectF boundingRectFromXml(const QDomDocument &);
virtual void fromXml(const QDomDocument &, const QPointF & = QPointF(), bool = true, ElementContent * = 0);
virtual void reset();
@@ -138,6 +138,7 @@ class ElementScene : public QGraphicsScene {
void cut();
void copy();
void paste();
void contextMenu (QContextMenuEvent *event);
protected:
virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *);
@@ -158,6 +159,7 @@ class ElementScene : public QGraphicsScene {
bool mustSnapToGrid(QGraphicsSceneMouseEvent *);
static bool zValueLessThan(QGraphicsItem *, QGraphicsItem *);
QMutex *decorator_lock_;
void centerElementToOrigine();
public slots:
void slot_move();
@@ -199,6 +201,8 @@ class ElementScene : public QGraphicsScene {
void partsZValueChanged();
/// Signal emitted when users have defined the copy/paste area
void pasteAreaDefined(const QRectF &);
/// Signal emitted when need zoomFit
void needZoomFit();
};
Q_DECLARE_OPERATORS_FOR_FLAGS(ElementScene::ItemOptions)

View File

@@ -36,6 +36,7 @@ ElementView::ElementView(ElementScene *scene, QWidget *parent) :
zoomReset();
connect(scene_, SIGNAL(pasteAreaDefined(const QRectF &)), this, SLOT(pasteAreaDefined(const QRectF &)));
connect(scene_, SIGNAL(partsAdded()), this, SLOT(adjustSceneRect()));
connect(scene_, SIGNAL(needZoomFit()), this, SLOT(zoomFit()));
}
/// Destructeur
@@ -65,6 +66,10 @@ QRectF ElementView::viewedSceneRect() const {
return(QRectF(scene_left_top, scene_right_bottom));
}
void ElementView::contextMenuEvent(QContextMenuEvent *event) {
scene_ -> contextMenu(event);
}
/**
Definit l'ElementScene visualisee par cette ElementView
@param s l'ElementScene visualisee par cette ElementView

View File

@@ -40,6 +40,7 @@ class ElementView : public QGraphicsView {
ElementScene *scene() const;
void setScene(ElementScene *);
QRectF viewedSceneRect() const;
void contextMenuEvent(QContextMenuEvent *event);
protected:
void mousePressEvent(QMouseEvent *);

View File

@@ -376,7 +376,7 @@ void QETElementEditor::setupMenus() {
paste_from_menu -> setIcon(QET::Icons::EditPaste);
paste_from_menu -> addAction(paste_from_file);
paste_from_menu -> addAction(paste_from_elmt);
edit_menu -> addAction(undo);
edit_menu -> addAction(redo);
edit_menu -> addSeparator();
@@ -400,7 +400,7 @@ void QETElementEditor::setupMenus() {
edit_menu -> addAction(edit_raise);
edit_menu -> addAction(edit_lower);
edit_menu -> addAction(edit_backward);
display_menu -> addAction(zoom_in);
display_menu -> addAction(zoom_out);
display_menu -> addAction(zoom_fit);
@@ -411,6 +411,34 @@ void QETElementEditor::setupMenus() {
insertMenu(settings_menu_, display_menu);
}
/**
* @brief QETElementEditor::contextMenuEvent
* @param event
*/
void QETElementEditor::contextMenu(QContextMenuEvent *event) {
QMenu menu(this);
menu.addAction(undo);
menu.addAction(redo);
menu.addAction(selectall);
menu.addAction(deselectall);
menu.addAction(inv_select);
menu.addSeparator();
menu.addAction(edit_delete);
menu.addAction(cut);
menu.addAction(copy);
menu.addSeparator();
menu.addAction(paste);
menu.addAction(paste_in_area);
menu.addMenu(paste_from_menu);
menu.addSeparator();
menu.addAction(edit_forward);
menu.addAction(edit_raise);
menu.addAction(edit_lower);
menu.addAction(edit_backward);
menu.exec(event -> globalPos());
}
/**
Met a jour les menus
*/

View File

@@ -113,11 +113,12 @@ class QETElementEditor : public QETMainWindow {
static QPointF pasteOffset();
static QET::OrientedMovement pasteMovement();
static QString getOpenElementFileName(QWidget * = 0, const QString & = QString());
void contextMenu(QContextMenuEvent *event);
protected:
void closeEvent(QCloseEvent *);
virtual void firstActivation(QEvent *);
private:
void setupActions();
void setupMenus();

View File

@@ -26,7 +26,7 @@ namespace QET {
/// QElectroTech version (as string, used to mark projects and elements XML documents)
const QString version = "0.3";
/// QElectroTech displayed version
const QString displayedVersion = "0.3rc";
const QString displayedVersion = "0.3";
QString license();
/// Orientation (used for electrical elements and their terminals)
enum Orientation {North, East, South, West};

View File

@@ -209,14 +209,13 @@ void QETDiagramEditor::actions() {
rotate_selection = new QAction(QET::Icons::ObjectRotateRight, tr("Pivoter"), this);
rotate_texts = new QAction(QET::Icons::ObjectRotateRight, tr("Orienter les textes"), this);
find_element = new QAction( tr("Retrouver dans le panel"), this);
edit_element = new QAction(QET::Icons::ElementEdit, tr("\311diter l'\351l\351ment"), this);
edit_selection = new QAction(QET::Icons::ElementEdit, tr("\311diter l'item s\351lectionn\351"), this);
selection_prop = new QAction(QET::Icons::DialogInformation, tr("Propri\351t\351s de la s\351lection"), this);
conductor_reset = new QAction(QET::Icons::ConductorSettings, tr("R\351initialiser les conducteurs"), this);
infos_diagram = new QAction(QET::Icons::DialogInformation, tr("Propri\351t\351s du sch\351ma"), this);
add_text = new QAction(QET::Icons::PartTextField, tr("Ajouter un champ de texte"), this);
add_edittext = new QAction(QET::Icons::EditText, tr("\311diter le champ de texte"), this);
add_column = new QAction(QET::Icons::EditTableInsertColumnRight, tr("Ajouter une colonne"), this);
add_image = new QAction(QET::Icons::adding_image, tr("Ajouter une image"), this);
add_image = new QAction(QET::Icons::adding_image, tr("Ajouter une image"), this);
remove_column = new QAction(QET::Icons::EditTableDeleteColumn, tr("Enlever une colonne"), this);
add_row = new QAction(QET::Icons::EditTableInsertRowUnder, tr("Ajouter une ligne"), this);
remove_row = new QAction(QET::Icons::EditTableDeleteRow, tr("Enlever une ligne"), this);
@@ -274,6 +273,7 @@ void QETDiagramEditor::actions() {
selection_prop -> setShortcut(QKeySequence(tr("Ctrl+J")));
conductor_reset -> setShortcut(QKeySequence(tr("Ctrl+K")));
infos_diagram -> setShortcut(QKeySequence(tr("Ctrl+L")));
edit_selection -> setShortcut(QKeySequence(tr("Ctrl+E")));
prj_add_diagram -> setShortcut(QKeySequence(tr("Ctrl+T")));
@@ -310,7 +310,6 @@ void QETDiagramEditor::actions() {
rotate_selection -> setStatusTip(tr("Pivote les \351l\351ments et textes s\351lectionn\351s", "status bar tip"));
rotate_texts -> setStatusTip(tr("Pivote les textes s\351lectionn\351s \340 un angle pr\351cis", "status bar tip"));
find_element -> setStatusTip(tr("Retrouve l'\351l\351ment s\351lectionn\351 dans le panel", "status bar tip"));
edit_element -> setStatusTip(tr("Retrouve l'\351l\351ment s\351lectionn\351 dans le panel avant de l'\351diter", "status bar tip"));
selection_prop -> setStatusTip(tr("\311dite les propri\351t\351s des objets s\351lectionn\351", "status bar tip"));
conductor_reset -> setStatusTip(tr("Recalcule les chemins des conducteurs sans tenir compte des modifications", "status bar tip"));
infos_diagram -> setStatusTip(tr("\311dite les informations affich\351es par le cartouche", "status bar tip"));
@@ -338,7 +337,7 @@ void QETDiagramEditor::actions() {
// traitements speciaux
add_text -> setCheckable(true);
add_image -> setCheckable(true);
add_image -> setCheckable(true);
windowed_view_mode -> setCheckable(true);
tabbed_view_mode -> setCheckable(true);
mode_selection -> setCheckable(true);
@@ -364,8 +363,7 @@ void QETDiagramEditor::actions() {
connect(rotate_selection, SIGNAL(triggered()), this, SLOT(slot_rotate()) );
connect(rotate_texts, SIGNAL(triggered()), this, SLOT(slot_rotateTexts()) );
connect(find_element, SIGNAL(triggered()), this, SLOT(findSelectedElementInPanel()));
connect(edit_element, SIGNAL(triggered()), this, SLOT(findSelectedElementInPanel()));
connect(edit_element, SIGNAL(triggered()), this, SLOT(editSelectedElementInEditor()));
connect(edit_selection, SIGNAL(triggered()), this, SLOT(slot_editSelection()) );
connect(windowed_view_mode, SIGNAL(triggered()), this, SLOT(setWindowedMode()) );
connect(tabbed_view_mode, SIGNAL(triggered()), this, SLOT(setTabbedMode()) );
connect(mode_selection, SIGNAL(triggered()), this, SLOT(slot_setSelectionMode()) );
@@ -400,7 +398,6 @@ void QETDiagramEditor::actions() {
connect(conductor_reset, SIGNAL(triggered()), this, SLOT(slot_resetConductors()) );
connect(infos_diagram, SIGNAL(triggered()), this, SLOT(editCurrentDiagramProperties()));
connect(add_text, SIGNAL(triggered()), this, SLOT(slot_addText()) );
connect(add_edittext, SIGNAL(triggered()), this, SLOT(slot_editText()) );
connect(add_image, SIGNAL(triggered()), this, SLOT(slot_addImage()) );
connect(add_column, SIGNAL(triggered()), this, SLOT(slot_addColumn()) );
connect(remove_column, SIGNAL(triggered()), this, SLOT(slot_removeColumn()) );
@@ -476,7 +473,7 @@ void QETDiagramEditor::menus() {
menu_edition -> addAction(delete_selection);
menu_edition -> addAction(rotate_selection);
menu_edition -> addAction(rotate_texts);
menu_edition -> addAction(add_edittext);
menu_edition -> addAction(edit_selection);
menu_edition -> addAction(selection_prop);
menu_edition -> addSeparator();
menu_edition -> addAction(conductor_reset);
@@ -1193,7 +1190,6 @@ void QETDiagramEditor::slot_updateComplexActions() {
// number of selected elements
int selected_elements_count = dv ? dv -> diagram() -> selectedContent().count(DiagramContent::Elements) : 0;
find_element -> setEnabled(selected_elements_count == 1);
edit_element -> setEnabled(selected_elements_count == 1);
// actions ayant aussi besoin d'items (elements, conducteurs, textes, ...) selectionnes
bool copiable_items = dv ? (dv -> hasCopiableItems()) : false;
@@ -1209,7 +1205,35 @@ void QETDiagramEditor::slot_updateComplexActions() {
int selected_texts = dv ? (dv -> diagram() -> selectedTexts().count()) : 0;
int selected_conductor_texts = dv ? (dv -> diagram() -> selectedConductorTexts().count()) : 0;
rotate_texts -> setEnabled(editable_diagram && selected_texts);
add_edittext -> setEnabled(editable_diagram && selected_texts == 1 && !selected_conductor_texts);
// actions need only one editable item
int selected_image = dv ? dv -> diagram() -> selectedContent().count(DiagramContent::Images) : 0;
int selected_editable = selected_elements_count + (selected_texts - selected_conductor_texts) + selected_image;
if (selected_editable == 1) {
edit_selection -> setEnabled(true);
//edit element
if (selected_elements_count) {
edit_selection -> setText(tr("\311diter l'\351lement", "edit element"));
edit_selection -> setIcon(QET::Icons::ElementEdit);
}
//edit text field
else if (selected_texts) {
edit_selection -> setText(tr("\311diter le champ de texte", "edit text field"));
edit_selection -> setIcon(QET::Icons::EditText);
}
//edit image
else if (selected_image) {
edit_selection -> setText(tr("\311diter l'image", "edit image"));
edit_selection -> setIcon(QET::Icons::resize_image);
}
}
//not an editable item
else {
edit_selection -> setText(tr("\311diter l'objet s\351lectionn\351", "edit selected item"));
edit_selection -> setIcon(QET::Icons::ElementEdit);
edit_selection -> setEnabled(false);
}
}
@@ -1501,12 +1525,22 @@ void QETDiagramEditor::slot_addImage() {
dv -> addImage();
}
}
/**
to Edit en text through the html editor
*/
void QETDiagramEditor::slot_editText() {
* @brief QETDiagramEditor::slot_editSelection
* edit the selected item if he can be edited and if only one item is selected
*/
void QETDiagramEditor::slot_editSelection() {
if (DiagramView *dv = currentDiagram()) {
dv -> editText();
DiagramContent dc = dv -> diagram() -> selectedContent();
if (dc.count(DiagramContent::SelectedOnly | DiagramContent::All) != 1) return;
if (dc.count(DiagramContent::Elements)) {
findSelectedElementInPanel();
editSelectedElementInEditor();
}
else if (dc.count(DiagramContent::TextFields)) dv -> editText();
else if (dc.count(DiagramContent::Images)) dv -> editImage();
}
}
@@ -1767,7 +1801,6 @@ void QETDiagramEditor::diagramWasAdded(DiagramView *dv) {
connect(dv, SIGNAL(selectionChanged()), this, SLOT(slot_updateComplexActions()));
connect(dv, SIGNAL(modeChanged()), this, SLOT(slot_updateModeActions()));
connect(dv, SIGNAL(textAdded(bool)), add_text, SLOT(setChecked(bool)));
connect(dv, SIGNAL(textAdded(bool)), add_edittext, SLOT(setChecked(bool)));
connect(dv, SIGNAL(ImageAdded(bool)), add_image, SLOT(setChecked(bool)));
connect(dv, SIGNAL(ImageAddedCanceled(bool)), add_image, SLOT(setChecked(bool)));
}

View File

@@ -123,8 +123,8 @@ class QETDiagramEditor : public QETMainWindow {
void slot_editConductor();
void slot_resetConductors();
void slot_addText();
void slot_editText();
void slot_addImage();
void slot_editSelection();
void setWindowedMode();
void setTabbedMode();
void readSettings();
@@ -190,13 +190,11 @@ class QETDiagramEditor : public QETMainWindow {
QAction *rotate_selection; ///< Rotate selected elements and text items by 90 degrees
QAction *rotate_texts; ///< Direct selected text items to a specific angle
QAction *find_element; ///< Find the selected element in the panel
QAction *edit_element; ///< Edit the selected element
QAction *selection_prop; ///< Show a dialog describing the selection
QAction *conductor_reset; ///< Reset paths of selected conductors
QAction *conductor_default; ///< Show a dialog to edit default conductor properties
QAction *infos_diagram; ///< Show a dialog to edit diagram properties
QAction *add_text; ///< Tool to add an independent text item on diagrams
QAction *add_edittext; ///< Tool to add an independent text item on diagrams
QAction *add_column; ///< Increase diagram width by adding an extra column
QAction *remove_column; ///< Decrease diagram width by removing the last column
QAction *add_row; ///< Increase diagram height by adding an extra row
@@ -216,7 +214,9 @@ class QETDiagramEditor : public QETMainWindow {
QAction *cascade_window; ///< Show MDI subwindows as cascade
QAction *prev_window; ///< Switch to the previous document
QAction *next_window; ///< Switch to the next document
QAction *add_image; ///< Tool to add an independent image item on diagrams
QAction *add_image; ///< Tool to add an independent image item on diagrams
QAction *edit_selection; ///< To edit selected item
private:
QMdiArea workspace;
QSignalMapper windowMapper;

View File

@@ -153,6 +153,7 @@ namespace QET {
QIcon ZoomOriginal;
QIcon ZoomOut;
QIcon adding_image;
QIcon resize_image;
}
}
@@ -312,7 +313,6 @@ void QET::Icons::initIcons() {
NewDiagram .addFile(":/ico/128x128/diagram.png");
North .addFile(":/ico/16x16/north.png");
ObjectLocked .addFile(":/ico/22x22/object-locked.png");
ObjectRotateRight .addFile(":/ico/16x16/object-rotate-right.png");
ObjectRotateRight .addFile(":/ico/22x22/object-rotate-right.png");
ObjectUnlocked .addFile(":/ico/22x22/object-unlocked.png");
Orientations .addFile(":/ico/16x16/orientations.png");
@@ -350,6 +350,7 @@ void QET::Icons::initIcons() {
Raise .addFile(":/ico/22x22/raise.png");
Remove .addFile(":/ico/16x16/list-remove.png");
Remove .addFile(":/ico/22x22/list-remove.png");
resize_image .addFile(":/ico/22x22/transform-scale.png");
Restore .addFile(":/ico/22x22/restaurer.png");
SendBackward .addFile(":/ico/22x22/send_backward.png");
Settings .addFile(":/ico/128x128/settings.png");

View File

@@ -162,6 +162,7 @@ namespace QET {
extern QIcon ZoomOriginal;
extern QIcon ZoomOut;
extern QIcon adding_image;
extern QIcon resize_image;
}
}
#endif