Compare commits

...

58 Commits
0.1b ... 0.1

Author SHA1 Message Date
xavierqet
4d5a4fdf4f Tag de la version 0.1 finale
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/tags/0.1@313 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-03-08 15:43:41 +00:00
xavierqet
507183cf04 Mise a jour du fichier CREDIT (remerciements)
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@312 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-03-08 15:36:51 +00:00
benoit
71ff71d7c1 Ajout sonnerie sirene et avertisseur.
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@311 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-03-08 15:26:34 +00:00
xavierqet
f28ec9c891 Arrondi des coordonnees dans la collection officielle
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@310 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-03-06 19:43:05 +00:00
xavierqet
c746eaf19d Traduction des convertisseurs
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@309 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-03-03 19:12:39 +00:00
benoit
5a309dca33 Ajout de convertisseurs.
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@308 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-03-03 17:06:36 +00:00
xavierqet
a65a7c548d Ajout d'une categorie principale dans le .desktop
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@306 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-03-02 15:47:08 +00:00
xavierqet
91e3f9e2da Correction d'un bug lors du deplacement d'un element en maintenant Ctrl enfonce.
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@305 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-03-01 17:39:44 +00:00
xavierqet
943a9d348a La compensation du bug de rendu de la QGraphicsView se fait desormais en fonction d'un parametre dans la configuration.
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@304 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-02-25 18:28:19 +00:00
xavierqet
68e3bbcb37 Correction de la correction pour Windows.
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@303 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-02-24 20:55:10 +00:00
xavierqet
9c9ecad579 Corrections pour Windows.
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@302 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-02-24 20:50:27 +00:00
xavierqet
801d1acaaa Amelioration du support de l'impression
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@301 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-02-24 20:13:45 +00:00
xavierqet
854336e569 L'installation ajoute desormais une icone et un .desktop sous UNIX
Mise a jour de la DTD, toujours inutilisee


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@300 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-02-23 13:22:23 +00:00
xavierqet
5c7044fbdb L'installation copie desormais les fichiers CREDIT et README avec le fichier LICENSE
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@299 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-02-06 22:44:59 +00:00
xavierqet
c3ea627d9c Mise a jour des mentions legales dans le code et dans le dialogue "A propos"
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@298 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-02-06 19:40:45 +00:00
xavierqet
c44a8cb51a L'edition directe d'un texte ou d'un champ de texte genere desormais un objet d'annulation
La liste des parties se rafraichit desormais lors d'un annuler/refaire


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@296 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-01-29 21:22:13 +00:00
benoit
b42bc62e9e Mise a jour des sources multifilaires : probleme de rendu a l'impression.
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@295 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-01-27 19:45:17 +00:00
xavierqet
74e301e655 Correction des noms des elements du commit precedent
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@294 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-01-27 14:36:08 +00:00
benoit
81f18ba8a8 Ajout elements : Tore de courants + bornes.
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@293 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-01-27 14:06:15 +00:00
xavierqet
ac19515895 Traduction des elements des deux revisions precedentes
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@292 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-01-25 19:08:23 +00:00
benoit
d6f81b64da Ajout des sources multifilaires
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@291 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-01-25 18:55:22 +00:00
benoit
ea87ae0ee8 Suppression de l'interrupteur laisse pour compatibilite.
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@290 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-01-25 18:40:19 +00:00
benoit
8b5b005a55 ajout composant et modification mineur
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@289 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-01-25 18:38:49 +00:00
xavierqet
8d3962b71c Traduction des noms de quelques categories
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@288 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-01-20 21:18:59 +00:00
xavierqet
1a79cd5a94 Correction du commit precedent
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@287 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-01-20 21:04:09 +00:00
xavierqet
e12e4f7076 Traduction en anglais de la categorie des porte-fusibles
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@286 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-01-20 20:58:26 +00:00
benoit
f55421c0c2 Ajout des porte-fusibles.
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@285 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-01-20 20:51:45 +00:00
xavierqet
4d0c61937c Correction dans l'editeur pour le trace d'un polygone
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@284 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-01-20 20:28:52 +00:00
xavierqet
cec010c1e7 Ajout d'un bouton pour effacer le filtre dans le panel d'elements
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@283 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-01-20 18:50:10 +00:00
xavierqet
fe06bfd425 Traduction des noms des semi-conducteurs
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@282 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-01-20 17:27:53 +00:00
benoit
43182b73a0 Retouche qualite symboles + premiers semiconducteurs.
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@281 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-01-20 17:00:33 +00:00
xavierqet
cf66a18795 Recharger le panel d'elements reapplique desormais le filtre
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@280 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-01-19 19:19:11 +00:00
xavierqet
01f4eb4a21 Ajout du fichier spec pour le packaging en RPM
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@279 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-01-19 18:05:14 +00:00
xavierqet
1e23544364 Corrections sur les noms des elements
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@278 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-01-19 00:32:54 +00:00
benoit
71cbc8af6b Probleme d'antialiasing.
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@277 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-01-18 18:36:23 +00:00
benoit
5792d964e7 Ajout d'interrupteurs a plusieurs positions.
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@276 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-01-18 14:47:11 +00:00
benoit
3f0a44cb6a Mise a jour de l'interrupteur (conservation de l'interrupteur non mis a jour pour compatibilite).
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@275 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-01-18 14:41:54 +00:00
benoit
c7a6d7cf67 Ajout moteur et generatrice continue.
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@274 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-01-18 14:20:21 +00:00
benoit
c67c2a402e Ajout de composant (lampe clignotante & Lader)
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@273 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-01-18 13:39:14 +00:00
xavierqet
61ce4af8b3 Utilisation du style de jointure "Bevel" plutot que "Miter" dans l'editeur de schemas = harmonisation avec les autres rendus (editeur, depot sur le site)
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@272 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-01-14 21:26:24 +00:00
xavierqet
263b6ba8a7 Correction du nom du fichier pour la borne de continuite
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@271 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-01-13 16:00:07 +00:00
benoit
717d826078 Ajout de composants
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@270 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-01-12 19:14:53 +00:00
xavierqet
d560883c6b Correction d'un bug lors de l'enregistrement d'un champ de texte sur element avec plusieurs lignes
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@269 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-01-11 20:01:27 +00:00
xavierqet
d2c5fbd8c2 Ajout d'une description et d'un resume rapide de la procedure d'installation.
Mise a jour du fichier CREDIT.
Le tout en anglais et en francais.


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@268 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-01-09 18:01:46 +00:00
xavierqet
8cd94b3137 Correction dans la description du projet : make install copie desormais le binaire sur le systeme
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@267 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-01-08 20:35:22 +00:00
xavierqet
3fe46a9f3b Ajout du zoom dans l'editeur d'element
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@266 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-01-07 19:40:08 +00:00
xavierqet
7a1ffcbd7f Ajout de barres d'outils a l'editeur d'element
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@265 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-01-07 18:51:18 +00:00
xavierqet
ba01ad5cf1 Correction de l'antialiasing sur un moteur
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@264 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-01-07 18:49:51 +00:00
benoit
b561b8394b Ajout d'un moteur triphase a double enroulement.
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@263 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-01-06 14:37:23 +00:00
xavierqet
3ca301ddb4 Correction du conflit de raccourci clavier dans l'editeur d'elements.
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@262 bfdf4180-ca20-0410-9c96-a3a8aa849046
2008-01-04 18:55:05 +00:00
xavierqet
e5007a1b8b "Panel d'Appareils" renomme en "Panel d'Elements"
Mise a jour des traductions


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@261 bfdf4180-ca20-0410-9c96-a3a8aa849046
2007-12-30 19:10:51 +00:00
benoit
ab562f780b Ajout des contacts specifiques aux relais thermiques.
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@260 bfdf4180-ca20-0410-9c96-a3a8aa849046
2007-12-30 17:29:16 +00:00
xavierqet
64c92fe23e Corrections des noms de certains elements
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@259 bfdf4180-ca20-0410-9c96-a3a8aa849046
2007-12-30 16:57:07 +00:00
benoit
45c07ee6b5 Ajout des fins de courses.
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@258 bfdf4180-ca20-0410-9c96-a3a8aa849046
2007-12-30 16:29:16 +00:00
benoit
1ba0c114de Ajout du moteur monophase
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@257 bfdf4180-ca20-0410-9c96-a3a8aa849046
2007-12-30 15:46:04 +00:00
xavierqet
8e1ae1233b Dans l'editeur d'elements, le premier niveau des collections est desormais etendu par defaut
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@256 bfdf4180-ca20-0410-9c96-a3a8aa849046
2007-12-29 19:05:50 +00:00
xavierqet
396dd54e8e Ajout d'un champ de texte pour filtrer le contenu du panel d'elements
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@255 bfdf4180-ca20-0410-9c96-a3a8aa849046
2007-12-29 15:00:30 +00:00
xavierqet
6bf8eed171 Correction des positions des bornes du sectionneur triphase
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@254 bfdf4180-ca20-0410-9c96-a3a8aa849046
2007-12-23 19:55:37 +00:00
213 changed files with 2205 additions and 356 deletions

23
CREDIT
View File

@@ -1,6 +1,23 @@
Merci à Trolltech pour la bibliothèque Qt ( http://trolltech.com/ ), sous
[en]
Thanks to Trolltech for their Qt library ( http://trolltech.com/ ), licensed
under GNU/GPL.
Thanks to Everaldo Coelho for the Crystal SVG icons theme (
http://www.everaldo.com/crystal/ ) licensed under LGPL, and to the KDE
project ( http://www.kde.org/ ).
Thanks to Loic for his mathematics-related explanations.
Thanks to Nicolas for the Mac OS X experimentations.
Thanks to Remi Collet for the Fedora packaging.
Thanks to TuxFamily ( http://tuxfamily.org ) for hosting the project.
Thanks to `Nishiki' for his elements and his support.
[fr]
Merci à Trolltech pour la bibliothèque Qt ( http://trolltech.com/ ), sous
licence GNU/GPL.
Merci à Everaldo Coelho pour le thème d'icônes Crystal SVG (
Merci à Everaldo Coelho pour le thème d'icônes Crystal SVG (
http://www.everaldo.com/crystal/ ) sous licence LGPL, ainsi qu'au projet KDE (
http://www.kde.org/ ).
Merci à Loic pour ses explications d'ordre mathématique.
Merci à Loic pour ses explications d'ordre mathématique.
Merci à Nicolas pour les expérimentations Mac OS X.
Merci à Remi Collet pour les paquets Fedora.
Merci à TuxFamily ( http://tuxfamily.org ) pour l'hébergement du projet.
Merci à `Nishiki' pour ses éléments et son soutien.

19
INSTALL Normal file
View File

@@ -0,0 +1,19 @@
[en]
Requirements :
libQt4 (see packages libqt4*)
cupsys-bsd for printing
Howto compile :
$ qmake (qmake-qt4 for Debian-based systems)
$ make
# make install
[fr]
Pré-requis :
libQt4 (paquets libqt4*)
cupsys-bsd pour l'impression
Comment compiler :
$ qmake (qmake-qt4 pour les systèmes basés sur Debian)
$ make
# make install

9
README Normal file
View File

@@ -0,0 +1,9 @@
[en]
QElectroTech is a Qt4 application to design electric diagrams. It uses XML
files for elements and diagrams, and includes both a diagram editor and an
element editor.
[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 ainsi qu'un éditeur d'élément.

View File

@@ -1,5 +1,5 @@
/*
Copyright 2006-2007 Xavier Guerrin
Copyright 2006-2008 Xavier Guerrin
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
@@ -82,7 +82,7 @@ QWidget *AboutQET::ongletAPropos() const {
QLabel *apropos = new QLabel(
tr("QElectroTech, une application de r\351alisation de sch\351mas \351lectriques.") +
"<br><br>" +
tr("\251 2006-2007 Les d\351veloppeurs de QElectroTech") +
tr("\251 2006-2008 Les d\351veloppeurs de QElectroTech") +
"<br><br>"
"<a href=\"http://qelectrotech.tuxfamily.org/\">"
"http://qelectrotech.tuxfamily.org/</a>"

View File

@@ -1,5 +1,5 @@
/*
Copyright 2006-2007 Xavier Guerrin
Copyright 2006-2008 Xavier Guerrin
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify

View File

@@ -1,5 +1,5 @@
/*
Copyright 2006-2007 Xavier Guerrin
Copyright 2006-2008 Xavier Guerrin
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify

View File

@@ -1,5 +1,5 @@
/*
Copyright 2006-2007 Xavier Guerrin
Copyright 2006-2008 Xavier Guerrin
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify

View File

@@ -1,5 +1,5 @@
/*
Copyright 2006-2007 Xavier Guerrin
Copyright 2006-2008 Xavier Guerrin
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
@@ -41,6 +41,8 @@ Conductor::Conductor(Terminal *p1, Terminal* p2, Element *parent, QGraphicsScene
terminal2(p2),
destroyed(false),
segments(NULL),
moving_point(false),
moving_segment(false),
previous_z_value(zValue()),
modified_path(false),
has_to_save_profile(false)

View File

@@ -1,5 +1,5 @@
/*
Copyright 2006-2007 Xavier Guerrin
Copyright 2006-2008 Xavier Guerrin
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify

View File

@@ -1,5 +1,5 @@
/*
Copyright 2006-2007 Xavier Guerrin
Copyright 2006-2008 Xavier Guerrin
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify

View File

@@ -1,5 +1,5 @@
/*
Copyright 2006-2007 Xavier Guerrin
Copyright 2006-2008 Xavier Guerrin
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify

View File

@@ -1,5 +1,5 @@
/*
Copyright 2006-2007 Xavier Guerrin
Copyright 2006-2008 Xavier Guerrin
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify

View File

@@ -1,5 +1,5 @@
/*
Copyright 2006-2007 Xavier Guerrin
Copyright 2006-2008 Xavier Guerrin
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify

View File

@@ -1,5 +1,5 @@
/*
Copyright 2006-2007 Xavier Guerrin
Copyright 2006-2008 Xavier Guerrin
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify

View File

@@ -1,5 +1,5 @@
/*
Copyright 2006-2007 Xavier Guerrin
Copyright 2006-2008 Xavier Guerrin
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify

View File

@@ -1,5 +1,5 @@
/*
Copyright 2006-2007 Xavier Guerrin
Copyright 2006-2008 Xavier Guerrin
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify

View File

@@ -1,5 +1,5 @@
/*
Copyright 2006-2007 Xavier Guerrin
Copyright 2006-2008 Xavier Guerrin
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify

View File

@@ -1,5 +1,5 @@
/*
Copyright 2006-2007 Xavier Guerrin
Copyright 2006-2008 Xavier Guerrin
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify

View File

@@ -1,5 +1,5 @@
/*
Copyright 2006-2007 Xavier Guerrin
Copyright 2006-2008 Xavier Guerrin
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify

View File

@@ -1,5 +1,5 @@
/*
Copyright 2006-2007 Xavier Guerrin
Copyright 2006-2008 Xavier Guerrin
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify

View File

@@ -1,5 +1,5 @@
/*
Copyright 2006-2007 Xavier Guerrin
Copyright 2006-2008 Xavier Guerrin
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify

View File

@@ -1,5 +1,5 @@
/*
Copyright 2006-2007 Xavier Guerrin
Copyright 2006-2008 Xavier Guerrin
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify

View File

@@ -1,5 +1,5 @@
/*
Copyright 2006-2007 Xavier Guerrin
Copyright 2006-2008 Xavier Guerrin
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
@@ -122,7 +122,7 @@ CustomElement::CustomElement(QString &nom_fichier, QGraphicsItem *qgi, Diagram *
QPen t;
t.setColor(Qt::black);
t.setWidthF(1.0);
t.setJoinStyle(Qt::MiterJoin);
t.setJoinStyle(Qt::BevelJoin);
qp.setPen(t);
// extrait les noms de la definition XML
@@ -420,6 +420,7 @@ bool CustomElement::parseInput(QDomElement &e) {
ElementTextItem *eti = new ElementTextItem(e.attribute("text"), this);
eti -> setFont(QFont(QETApp::diagramTextsFont(), size));
eti -> setPos(pos_x, pos_y);
eti -> setOriginalPos(QPointF(pos_x, pos_y));
if (e.attribute("rotate") == "true") eti -> setFollowParentRotations(true);
return(true);
}
@@ -513,7 +514,7 @@ void CustomElement::setPainterStyle(QDomElement &e, QPainter &qp) {
QBrush brush = qp.brush();
// attributs par defaut
pen.setJoinStyle(Qt::MiterJoin);
pen.setJoinStyle(Qt::BevelJoin);
pen.setCapStyle(Qt::SquareCap);
pen.setColor(Qt::black);
pen.setStyle(Qt::SolidLine);

View File

@@ -1,5 +1,5 @@
/*
Copyright 2006-2007 Xavier Guerrin
Copyright 2006-2008 Xavier Guerrin
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify

View File

@@ -1,5 +1,5 @@
/*
Copyright 2006-2007 Xavier Guerrin
Copyright 2006-2008 Xavier Guerrin
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify

View File

@@ -1,5 +1,5 @@
/*
Copyright 2006-2007 Xavier Guerrin
Copyright 2006-2008 Xavier Guerrin
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify

View File

@@ -1,5 +1,5 @@
/*
Copyright 2006-2007 Xavier Guerrin
Copyright 2006-2008 Xavier Guerrin
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify

View File

@@ -1,5 +1,5 @@
/*
Copyright 2006-2007 Xavier Guerrin
Copyright 2006-2008 Xavier Guerrin
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify

View File

@@ -1,5 +1,5 @@
/*
Copyright 2006-2007 Xavier Guerrin
Copyright 2006-2008 Xavier Guerrin
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify

View File

@@ -1,5 +1,5 @@
/*
Copyright 2006-2007 Xavier Guerrin
Copyright 2006-2008 Xavier Guerrin
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify

302
diagramprintdialog.cpp Normal file
View File

@@ -0,0 +1,302 @@
/*
Copyright 2006-2007 Xavier Guerrin
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
QElectroTech is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/
#include "diagramprintdialog.h"
#include <math.h>
/**
Constructeur
@param dia Schema a imprimer
@param printer Imprimante a utiliser
@param parent Widget parent du dialogue
*/
DiagramPrintDialog::DiagramPrintDialog(Diagram *dia, QWidget *parent) :
QWidget(parent),
diagram(dia),
dialog(0)
{
// initialise l'imprimante
printer = new QPrinter();
}
/**
Destructeur
*/
DiagramPrintDialog::~DiagramPrintDialog() {
delete dialog;
delete printer;
}
/**
Definit le nom du PDF si l'utilisateur choisit une sortie vers un PDF
*/
void DiagramPrintDialog::setPDFName(const QString &name) {
pdf_name = name;
}
/**
@return le nom du PDF
*/
QString DiagramPrintDialog::PDFName() const {
return(pdf_name);
}
/**
Execute le dialogue d'impression
*/
void DiagramPrintDialog::exec() {
// affichage du dialogue d'impression standard
QPrintDialog print_dialog(printer);
print_dialog.setEnabledOptions(QAbstractPrintDialog::PrintToFile);
#ifndef Q_OS_WIN32
if (!pdf_name.isEmpty()) printer -> setOutputFileName(pdf_name);
#endif
if (print_dialog.exec() == QDialog::Rejected) return;
/*
Apres l'execution de ce premier dialogue, on connait le format papier a
utiliser, son orientation et on est sur que tout cela est supporte par
l'imprimante.
On peut donc en deduire le nombre de pages a imprimer
*/
// affichage d'un second dialogue, non standard, pour connaitre les pages a imprimer
buildDialog();
if (dialog -> exec() == QDialog::Rejected) return;
// effectue l'impression en elle-meme
print();
}
/**
@param fullPage true pour utiliser toute la feuille dans le calcul
@return Le nombre de pages necessaires pour imprimer le schema
avec l'orientation et le format papier utilise dans l'imprimante en cours.
*/
int DiagramPrintDialog::pagesCount(bool fullpage) const {
return(horizontalPagesCount(fullpage) * verticalPagesCount(fullpage));
}
/**
@param fullPage true pour utiliser toute la feuille dans le calcul
@return La largeur du "poster" en nombre de pages pour imprimer le schema
avec l'orientation et le format papier utilise dans l'imprimante en cours.
*/
int DiagramPrintDialog::horizontalPagesCount(bool fullpage) const {
// note : pageRect et Paper Rect tiennent compte de l'orientation du papier
QRect printable_area = fullpage ? printer -> paperRect() : printer -> pageRect();
QRect diagram_rect = diagram -> border().toRect();
int h_pages_count = int(ceil(qreal(diagram_rect.width()) / qreal(printable_area.width())));
return(h_pages_count);
}
/**
@param fullPage true pour utiliser toute la feuille dans le calcul
@return La largeur du "poster" en nombre de pages pour imprimer le schema
avec l'orientation et le format papier utilise dans l'imprimante en cours.
*/
int DiagramPrintDialog::verticalPagesCount(bool fullpage) const {
// note : pageRect et Paper Rect tiennent compte de l'orientation du papier
QRect printable_area = fullpage ? printer -> paperRect() : printer -> pageRect();
QRect diagram_rect = diagram -> border().toRect();
int v_pages_count = int(ceil(qreal(diagram_rect.height()) / qreal(printable_area.height())));
return(v_pages_count);
}
/**
Construit un dialogue non standard pour demander les pages a imprimer a l'utilisateur
*/
void DiagramPrintDialog::buildDialog() {
dialog = new QDialog();
dialog -> setWindowTitle(tr("Options d'impression"));
options_label = new QLabel();
use_full_page = new QCheckBox(tr("Utiliser toute la feuille"));
fit_diagram_to_page = new QCheckBox(tr("Adapter le sch\351ma \340 la page"));
range_from_label = new QLabel(tr("Plage de "));
start_page = new QSpinBox();
to_label = new QLabel(tr(" \340 "));
end_page = new QSpinBox();
buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
QHBoxLayout *pages_layout = new QHBoxLayout();
pages_layout -> addWidget(range_from_label);
pages_layout -> addWidget(start_page);
pages_layout -> addWidget(to_label);
pages_layout -> addWidget(end_page);
QVBoxLayout *dialog_layout = new QVBoxLayout(dialog);
dialog_layout -> addWidget(options_label);
dialog_layout -> addWidget(use_full_page);
dialog_layout -> addWidget(fit_diagram_to_page);
dialog_layout -> addLayout(pages_layout);
dialog_layout -> addStretch();
dialog_layout -> addWidget(buttons);
connect(use_full_page, SIGNAL(stateChanged(int)), this, SLOT(updateDialog()));
connect(fit_diagram_to_page, SIGNAL(stateChanged(int)), this, SLOT(updateDialog()));
connect(start_page, SIGNAL(valueChanged(int)), this, SLOT(checkStartPage()));
connect(end_page, SIGNAL(valueChanged(int)), this, SLOT(checkEndPage()));
connect(buttons, SIGNAL(accepted()), dialog, SLOT(accept()));
connect(buttons, SIGNAL(rejected()), dialog, SLOT(reject()));
updateDialog();
}
/**
Assure la coherence du dialogue
*/
void DiagramPrintDialog::updateDialog() {
int pages_count;
// si on adapte le schema a la page, alors il n'y a qu'une page a imprimer
if (fit_diagram_to_page -> isChecked()) {
pages_count = 1;
} else {
pages_count = pagesCount(use_full_page -> isChecked());
}
options_label -> setText(tr("Nombre total de pages : ") + QString("%1").arg(pages_count));
setPagesRangeVisible(pages_count > 1);
start_page -> setRange(1, pages_count);
end_page -> setRange(1, pages_count);
end_page -> setValue(pages_count);
}
/**
S'assure que la premiere page ne soit pas superieure a la derniere page
*/
void DiagramPrintDialog::checkStartPage() {
if (start_page -> value() > end_page -> value()) {
start_page -> blockSignals(true);
start_page -> setValue(end_page -> value());
start_page -> blockSignals(false);
}
}
/**
S'assure que la derniere page ne soit pas inferieure a la premiere page
*/
void DiagramPrintDialog::checkEndPage() {
if (end_page -> value() < start_page -> value()) {
end_page -> blockSignals(true);
end_page -> setValue(start_page -> value());
end_page -> blockSignals(false);
}
}
/**
@param visible true pour afficher les pages, false sinon
*/
void DiagramPrintDialog::setPagesRangeVisible(bool visible) {
range_from_label -> setVisible(visible);
start_page -> setVisible(visible);
to_label -> setVisible(visible);
end_page -> setVisible(visible);
}
/**
Effectue l'impression elle-meme
*/
void DiagramPrintDialog::print() {
// recupere les informations collectees dans le second dialogue
bool full_page = use_full_page -> isChecked();
bool fit_page = fit_diagram_to_page -> isChecked();
int first_page = start_page -> value();
int last_page = end_page -> value();
// parametre l'imprimante
printer -> setFullPage(full_page);
// QPainter utiliser pour effectuer le rendu
QPainter qp(printer);
// impression physique (!= fichier PDF)
if (printer -> outputFileName().isEmpty()) {
// lorsqu'on imprime en paysage sur imprimante reelle, il faut pivoter soi-meme le rendu
if (printer -> orientation() == QPrinter::Landscape) {
qp.rotate(90.0);
qp.translate(0.0, -printer -> pageRect().height());
}
}
diagram -> setDisplayGrid(false);
diagram -> setDrawTerminals(false);
if (fit_page) {
// impression adaptee sur une seule page
diagram -> render(&qp, QRectF(), diagram -> border(), Qt::KeepAspectRatio);
} else {
// impression sur une ou plusieurs pages
QRect diagram_rect = diagram -> border().toRect();
QRect printed_area = full_page ? printer -> paperRect() : printer -> pageRect();
int used_width = printed_area.width();
int used_height = printed_area.height();
int h_pages_count = horizontalPagesCount(full_page);
int v_pages_count = verticalPagesCount(full_page);
QVector< QVector< QRect > > pages_grid;
// le schema est imprime sur une matrice de feuilles
// parcourt les lignes de la matrice
int y_offset = 0;
for (int i = 0 ; i < v_pages_count ; ++ i) {
pages_grid << QVector< QRect >();
// parcourt les feuilles de la ligne
int x_offset = 0;
for (int j = 0 ; j < h_pages_count ; ++ j) {
pages_grid.last() << QRect(
QPoint(x_offset, y_offset),
QSize(
qMin(used_width, diagram_rect.width() - x_offset),
qMin(used_height, diagram_rect.height() - y_offset)
)
);
x_offset += used_width;
}
y_offset += used_height;
}
// ne retient que les pages a imprimer
QVector<QRect> pages_to_print;
for (int i = 0 ; i < v_pages_count ; ++ i) {
for (int j = 0 ; j < h_pages_count ; ++ j) {
int page_number = (i * h_pages_count) + j + 1;
if (page_number >= first_page && page_number <= last_page) {
pages_to_print << pages_grid.at(i).at(j);
}
}
}
// parcourt les pages pour impression
for (int i = 0 ; i < pages_to_print.count() ; ++ i) {
QRect current_rect(pages_to_print.at(i));
diagram -> render(
&qp,
QRect(QPoint(0,0), current_rect.size()),
current_rect.translated(diagram_rect.topLeft()),
Qt::KeepAspectRatio
);
if (i != pages_to_print.count() - 1) {
printer -> newPage();
}
}
}
diagram -> setDrawTerminals(true);
diagram -> setDisplayGrid(true);
}

71
diagramprintdialog.h Normal file
View File

@@ -0,0 +1,71 @@
/*
Copyright 2006-2007 Xavier Guerrin
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
QElectroTech is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef DIAGRAM_PRINT_DIALOG_H
#define DIAGRAM_PRINT_DIALOG_H
#include <QtGui>
#include "diagram.h"
/**
Cette classe represente le dialogue de configuration de l'impression d'un
schema electrique.
Elle se charge egalement de l'impression elle-meme
*/
class DiagramPrintDialog : public QWidget {
Q_OBJECT
// Constructeurs, destructeur
public:
DiagramPrintDialog(Diagram *, QWidget * = 0);
virtual ~DiagramPrintDialog();
private:
DiagramPrintDialog(const DiagramPrintDialog &);
// methodes
public:
void setPDFName(const QString &);
QString PDFName() const;
int pagesCount(bool = false) const;
int horizontalPagesCount(bool = false) const;
int verticalPagesCount(bool = false) const;
void exec();
private:
void buildDialog();
void print();
private slots:
void updateDialog();
void checkStartPage();
void checkEndPage();
void setPagesRangeVisible(bool);
// attributs
private:
Diagram *diagram;
QPrinter *printer;
QString pdf_name;
QDialog *dialog;
QLabel *options_label;
QLabel *range_from_label;
QLabel *to_label;
QCheckBox *use_full_page;
QCheckBox *fit_diagram_to_page;
QSpinBox *start_page;
QSpinBox *end_page;
QDialogButtonBox *buttons;
};
#endif

View File

@@ -1,5 +1,5 @@
/*
Copyright 2006-2007 Xavier Guerrin
Copyright 2006-2008 Xavier Guerrin
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify

View File

@@ -1,5 +1,5 @@
/*
Copyright 2006-2007 Xavier Guerrin
Copyright 2006-2008 Xavier Guerrin
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify

View File

@@ -1,5 +1,5 @@
/*
Copyright 2006-2007 Xavier Guerrin
Copyright 2006-2008 Xavier Guerrin
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
@@ -19,6 +19,7 @@
#include "diagram.h"
#include "customelement.h"
#include "exportdialog.h"
#include "diagramprintdialog.h"
#include "conductor.h"
#include "diagramcommands.h"
#include "conductorpropertieswidget.h"
@@ -530,31 +531,20 @@ void DiagramView::dialogExport() {
Imprime le schema.
*/
void DiagramView::dialogPrint() {
// initialise l'acces a l'imprimante
QPrinter qprin;
#ifndef Q_OS_WIN32
qprin.setOutputFormat(QPrinter::PdfFormat);
#endif
qprin.setOrientation(QPrinter::Landscape);
qprin.setPageSize(QPrinter::A4);
QPrintDialog qpd(&qprin, this);
if (qpd.exec() == QDialog::Accepted) {
QPainter qp(&qprin);
// impression physique (!= fichier PDF)
if (qprin.outputFileName().isEmpty()) {
// lorsqu'on imprime en paysage sur imprimante reelle, il faut pivoter soi-meme le rendu
if (qprin.orientation() == QPrinter::Landscape) {
qp.rotate(90.0);
qp.translate(0.0, -qprin.pageRect().height());
}
}
scene -> setDisplayGrid(false);
scene -> setDrawTerminals(false);
scene -> render(&qp, QRectF(), scene -> border(), Qt::KeepAspectRatio);
scene -> setDrawTerminals(true);
scene -> setDisplayGrid(true);
// determine un nom possible pour le pdf
QString pdf_file_name;
if (!file_name.isEmpty()) {
pdf_file_name = file_name;
pdf_file_name.replace(QRegExp("\\.qet$", Qt::CaseInsensitive), "");
} else {
pdf_file_name = QDir::homePath() + tr("schema");
}
pdf_file_name += ".pdf";
DiagramPrintDialog print_dialog(scene, this);
print_dialog.setPDFName(pdf_file_name);
print_dialog.exec();
}
/**

View File

@@ -1,5 +1,5 @@
/*
Copyright 2006-2007 Xavier Guerrin
Copyright 2006-2008 Xavier Guerrin
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify

View File

@@ -283,7 +283,7 @@ void ElementScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *e) {
}
}
} else if (e -> button() & Qt::RightButton) {
if (behavior == Polygon) {
if (behavior == Polygon && current_polygon != NULL) {
behavior = Normal;
undo_stack.push(new AddPartCommand(tr("polygone"), this, current_polygon));
current_polygon = NULL;

View File

@@ -27,10 +27,8 @@ ElementView::ElementView(ElementScene *scene, QWidget *parent) :
{
setInteractive(true);
setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
//setTransformationAnchor(QGraphicsView::AnchorUnderMouse);
setResizeAnchor(QGraphicsView::AnchorUnderMouse);
//setSceneRect(QRectF(0.0, 0.0, 50.0, 200.0));
scale(4.0, 4.0);
zoomReset();
}
/// Destructeur
@@ -64,3 +62,67 @@ bool ElementView::event(QEvent *e) {
}
return(QGraphicsView::event(e));
}
/**
Agrandit le schema (+33% = inverse des -25 % de zoomMoins())
*/
void ElementView::zoomIn() {
scale(4.0/3.0, 4.0/3.0);
}
/**
Retrecit le schema (-25% = inverse des +33 % de zoomPlus())
*/
void ElementView::zoomOut() {
scale(0.75, 0.75);
}
/**
Agrandit ou rectrecit le schema de facon a ce que tous les elements du
schema soient visibles a l'ecran. S'il n'y a aucun element sur le schema,
le zoom est reinitialise
*/
void ElementView::zoomFit() {
adjustSceneRect();
fitInView(sceneRect(), Qt::KeepAspectRatio);
}
/**
Reinitialise le zoom
*/
void ElementView::zoomReset() {
resetMatrix();
scale(4.0, 4.0);
}
/**
Ajuste le sceneRect (zone du schema visualisee par l'ElementView) afin que
celui inclut a la fois les parties dans et en dehors du cadre et le cadre
lui-meme.
*/
void ElementView::adjustSceneRect() {
QRectF old_scene_rect = scene_ -> sceneRect();
QRectF new_scene_rect = scene_ -> sceneContent();
setSceneRect(new_scene_rect);
// met a jour la scene
scene_ -> update(old_scene_rect.united(new_scene_rect));
}
/**
Gere les actions liees a la rollette de la souris
@param e QWheelEvent decrivant l'evenement rollette
*/
void ElementView::wheelEvent(QWheelEvent *e) {
// si la touche Ctrl est enfoncee, on zoome / dezoome
if (e -> modifiers() & Qt::ControlModifier) {
if (e -> delta() > 0) {
zoomIn();
} else {
zoomOut();
}
} else {
QAbstractScrollArea::wheelEvent(e);
}
}

View File

@@ -39,6 +39,15 @@ class ElementView : public QGraphicsView {
void setScene(ElementScene *);
protected:
bool event(QEvent *);
void wheelEvent(QWheelEvent *);
// slots
public slots:
void zoomIn();
void zoomOut();
void zoomFit();
void zoomReset();
void adjustSceneRect();
//attributs
private:

View File

@@ -251,3 +251,13 @@ int PartArc::startAngle() const {
bool PartArc::isUseless() const {
return(rect().isNull() || !angle());
}
/**
@return le rectangle delimitant cette partie.
*/
QRectF PartArc::boundingRect() const {
qreal adjust = 1.5;
QRectF r(QGraphicsEllipseItem::boundingRect().normalized());
r.adjust(-adjust, -adjust, adjust, adjust);
return(r);
}

View File

@@ -52,6 +52,7 @@ class PartArc : public QGraphicsEllipseItem, public CustomElementGraphicPart {
virtual const QDomElement toXml(QDomDocument &) const;
virtual void fromXml(const QDomElement &);
virtual QPointF sceneTopLeft() const;
virtual QRectF boundingRect() const;
virtual void setAngle(int);
virtual void setStartAngle(int);
virtual int angle() const;

View File

@@ -187,3 +187,13 @@ QPointF PartEllipse::sceneTopLeft() const {
bool PartEllipse::isUseless() const {
return(rect().isNull());
}
/**
@return le rectangle delimitant cette partie.
*/
QRectF PartEllipse::boundingRect() const {
qreal adjust = 1.5;
QRectF r(QGraphicsEllipseItem::boundingRect().normalized());
r.adjust(-adjust, -adjust, adjust, adjust);
return(r);
}

View File

@@ -50,6 +50,7 @@ class PartEllipse : public QGraphicsEllipseItem, public CustomElementGraphicPart
virtual const QDomElement toXml(QDomDocument &) const;
virtual void fromXml(const QDomElement &);
virtual QPointF sceneTopLeft() const;
virtual QRectF boundingRect() const;
virtual void setProperty(const QString &, const QVariant &);
virtual QVariant property(const QString &);
virtual bool isUseless() const;

View File

@@ -251,4 +251,3 @@ QRectF PartLine::boundingRect() const {
bool PartLine::isUseless() const {
return(sceneP1() == sceneP2());
}

View File

@@ -163,3 +163,13 @@ bool PartPolygon::isUseless() const {
return(true);
}
/**
@return le rectangle delimitant cette partie.
*/
QRectF PartPolygon::boundingRect() const {
qreal adjust = 1.5;
QRectF r(QGraphicsPolygonItem::boundingRect());
r.adjust(-adjust, -adjust, adjust, adjust);
return(r);
}

View File

@@ -61,6 +61,7 @@ class PartPolygon : public QGraphicsPolygonItem, public CustomElementGraphicPart
virtual QString name() const { return(QObject::tr("polygone")); }
void fromXml(const QDomElement &);
const QDomElement toXml(QDomDocument &) const;
virtual QRectF boundingRect() const;
void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
void setClosed(bool c);
bool isClosed() const;

View File

@@ -17,6 +17,7 @@
*/
#include "parttext.h"
#include "texteditor.h"
#include "editorcommands.h"
#include "elementscene.h"
#include "qetapp.h"
@@ -126,6 +127,18 @@ QPointF PartText::margin() const {
*/
void PartText::focusOutEvent(QFocusEvent *e) {
QGraphicsTextItem::focusOutEvent(e);
if (previous_text != toPlainText()) {
undoStack().push(
new ChangePartCommand(
TextEditor::tr("texte") + " " + name(),
this,
"text",
previous_text,
toPlainText()
)
);
previous_text = toPlainText();
}
setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
}
@@ -136,6 +149,7 @@ void PartText::focusOutEvent(QFocusEvent *e) {
void PartText::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *e) {
setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsFocusable);
setTextInteractionFlags(Qt::TextEditorInteraction);
previous_text = toPlainText();
QGraphicsTextItem::mouseDoubleClickEvent(e);
setFocus(Qt::MouseFocusReason);
}

View File

@@ -63,5 +63,6 @@ class PartText : public QGraphicsTextItem, public CustomElementPart {
private:
QPointF margin() const;
QString previous_text;
};
#endif

View File

@@ -17,6 +17,7 @@
*/
#include "parttextfield.h"
#include "textfieldeditor.h"
#include "editorcommands.h"
#include "qetapp.h"
/**
@@ -144,6 +145,18 @@ QPointF PartTextField::margin() const {
*/
void PartTextField::focusOutEvent(QFocusEvent *e) {
QGraphicsTextItem::focusOutEvent(e);
if (previous_text != toPlainText()) {
undoStack().push(
new ChangePartCommand(
TextFieldEditor::tr("texte") + " " + name(),
this,
"text",
previous_text,
toPlainText()
)
);
previous_text = toPlainText();
}
setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
}
@@ -154,6 +167,7 @@ void PartTextField::focusOutEvent(QFocusEvent *e) {
void PartTextField::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *e) {
setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsFocusable);
setTextInteractionFlags(Qt::TextEditorInteraction);
previous_text = toPlainText();
QGraphicsTextItem::mouseDoubleClickEvent(e);
setFocus(Qt::MouseFocusReason);
}

View File

@@ -69,5 +69,6 @@ class PartTextField : public QGraphicsTextItem, public CustomElementPart {
private:
QPointF margin() const;
QString previous_text;
};
#endif

View File

@@ -69,6 +69,10 @@ void QETElementEditor::setupActions() {
deselectall = new QAction( tr("D\351s\351lectionner tout"), this);
inv_select = new QAction( tr("Inverser la s\351lection"), this);
edit_delete = new QAction(QIcon(":/ico/delete.png"), tr("&Supprimer"), this);
zoom_in = new QAction(QIcon(":/ico/viewmag+.png"), tr("Zoom avant"), this);
zoom_out = new QAction(QIcon(":/ico/viewmag-.png"), tr("Zoom arri\350re"), this);
zoom_fit = new QAction(QIcon(":/ico/viewmagfit.png"), tr("Zoom adapt\351"), this);
zoom_reset = new QAction(QIcon(":/ico/viewmag.png"), tr("Pas de zoom"), this);
edit_size_hs = new QAction(QIcon(":/ico/hotspot.png"), tr("\311diter la taille et le point de saisie"), this);
edit_names = new QAction(QIcon(":/ico/names.png"), tr("\311diter les noms"), this);
edit_ori = new QAction(QIcon(":/ico/orientations.png"), tr("\311diter les orientations"), this);
@@ -96,12 +100,18 @@ void QETElementEditor::setupActions() {
new_element -> setShortcut(QKeySequence::New);
open -> setShortcut(QKeySequence::Open);
save -> setShortcut(QKeySequence::Save);
reload -> setShortcut(QKeySequence::Refresh);
reload -> setShortcut(Qt::Key_F5);
quit -> setShortcut(QKeySequence(tr("Ctrl+Q")));
selectall -> setShortcut(QKeySequence::SelectAll);
deselectall -> setShortcut(QKeySequence(tr("Ctrl+Shift+A")));
inv_select -> setShortcut(QKeySequence(tr("Ctrl+I")));
edit_delete -> setShortcut(QKeySequence(tr("Suppr")));
zoom_in -> setShortcut(QKeySequence::ZoomIn);
zoom_out -> setShortcut(QKeySequence::ZoomOut);
zoom_fit -> setShortcut(QKeySequence(tr("Ctrl+9")));
zoom_reset -> setShortcut(QKeySequence(tr("Ctrl+0")));
edit_names -> setShortcut(QKeySequence(tr("Ctrl+E")));
edit_size_hs -> setShortcut(QKeySequence(tr("Ctrl+R")));
edit_ori -> setShortcut(QKeySequence(tr("Ctrl+T")));
@@ -120,6 +130,10 @@ void QETElementEditor::setupActions() {
connect(selectall, SIGNAL(triggered()), ce_scene, SLOT(slot_selectAll()));
connect(deselectall, SIGNAL(triggered()), ce_scene, SLOT(slot_deselectAll()));
connect(inv_select, SIGNAL(triggered()), ce_scene, SLOT(slot_invertSelection()));
connect(zoom_in, SIGNAL(triggered()), ce_view, SLOT(zoomIn()));
connect(zoom_out, SIGNAL(triggered()), ce_view, SLOT(zoomOut()));
connect(zoom_fit, SIGNAL(triggered()), ce_view, SLOT(zoomFit()));
connect(zoom_reset, SIGNAL(triggered()), ce_view, SLOT(zoomReset()));
connect(edit_delete, SIGNAL(triggered()), ce_scene, SLOT(slot_delete()));
connect(edit_size_hs, SIGNAL(triggered()), ce_scene, SLOT(slot_editSizeHotSpot()));
connect(edit_names, SIGNAL(triggered()), ce_scene, SLOT(slot_editNames()));
@@ -184,12 +198,48 @@ void QETElementEditor::setupActions() {
parts_toolbar -> addAction(xml_preview);
*/
main_toolbar = new QToolBar(tr("Outils"), this);
main_toolbar -> setObjectName("main_toolbar");
view_toolbar = new QToolBar(tr("Affichage"), this);
view_toolbar -> setObjectName("display");
element_toolbar = new QToolBar(tr("\311l\351ment"), this);
element_toolbar -> setObjectName("element_toolbar");
depth_toolbar = new QToolBar(tr("Profondeur"), this);
depth_toolbar -> setObjectName("depth_toolbar");
main_toolbar -> addAction(new_element);
main_toolbar -> addAction(open);
main_toolbar -> addAction(save);
main_toolbar -> addAction(save_as);
main_toolbar -> addAction(reload);
main_toolbar -> addSeparator();
main_toolbar -> addAction(undo);
main_toolbar -> addAction(redo);
main_toolbar -> addSeparator();
main_toolbar -> addAction(edit_delete);
view_toolbar -> addAction(zoom_in);
view_toolbar -> addAction(zoom_out);
view_toolbar -> addAction(zoom_fit);
view_toolbar -> addAction(zoom_reset);
element_toolbar -> addAction(edit_size_hs);
element_toolbar -> addAction(edit_names);
element_toolbar -> addAction(edit_ori);
depth_toolbar -> addAction(edit_forward);
depth_toolbar -> addAction(edit_raise);
depth_toolbar -> addAction(edit_lower);
depth_toolbar -> addAction(edit_backward);
addToolBar(Qt::TopToolBarArea, main_toolbar);
addToolBar(Qt::TopToolBarArea, view_toolbar);
addToolBar(Qt::TopToolBarArea, element_toolbar);
addToolBar(Qt::TopToolBarArea, depth_toolbar);
addToolBar(Qt::LeftToolBarArea, parts_toolbar);
connect(ce_scene, SIGNAL(selectionChanged()), this, SLOT(slot_updateInformations()));
connect(ce_scene, SIGNAL(selectionChanged()), this, SLOT(slot_updateMenus()));
connect(&(ce_scene -> undoStack()), SIGNAL(cleanChanged(bool)), this, SLOT(slot_updateMenus()));
connect(&(ce_scene -> undoStack()), SIGNAL(cleanChanged(bool)), this, SLOT(slot_updateTitle()));
connect(&(ce_scene -> undoStack()), SIGNAL(indexChanged(int)), this, SLOT(slot_updatePartsList()));
}
/**
@@ -470,6 +520,7 @@ void QETElementEditor::fromFile(const QString &filepath) {
// memorise le fichier
setFileName(filepath);
slot_updateMenus();
}

View File

@@ -59,10 +59,11 @@ class QETElementEditor : public QMainWindow {
/// actions du menu edition
QAction *selectall, *deselectall, *inv_select;
QAction *undo, *redo;
QAction *zoom_in, *zoom_out, *zoom_fit, *zoom_reset;
QAction *edit_delete, *edit_size_hs, *edit_names, *edit_ori;
QAction *edit_raise, *edit_lower, *edit_backward, *edit_forward;
/// barre d'outils
QToolBar *parts_toolbar;
/// barres d'outils
QToolBar *parts_toolbar, *main_toolbar, *view_toolbar, *depth_toolbar, *element_toolbar;
/// actions de la barre d'outils
QActionGroup *parts;
QAction *move, *add_line, *add_circle, *add_ellipse, *add_polygon, *add_text;

View File

@@ -1,5 +1,5 @@
/*
Copyright 2006-2007 Xavier Guerrin
Copyright 2006-2008 Xavier Guerrin
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
@@ -49,7 +49,7 @@ void Element::paint(QPainter *painter, const QStyleOptionGraphicsItem *options,
#ifdef Q_WS_X11
// corrige un bug de rendu ne se produisant que lors du rendu sur QGraphicsScene sous X11 au zoom par defaut
static bool must_correct_rendering_bug = !QString(qVersion()).startsWith("4.4");
static bool must_correct_rendering_bug = QETApp::settings().value("correct-rendering", true).toBool();
if (must_correct_rendering_bug) {
Diagram *dia = diagram();
if (dia && options -> levelOfDetail == 1.0 && widget) {
@@ -258,11 +258,21 @@ void Element::setPos(qreal x, qreal y) {
setPos(QPointF(x, y));
}
/**
Gere l'enfoncement d'un bouton de la souris
*/
void Element::mousePressEvent(QGraphicsSceneMouseEvent *e) {
if (!isSelected() && e -> modifiers() & Qt::ControlModifier) {
setSelected(true);
}
QGraphicsItem::mousePressEvent(e);
}
/**
Gere les mouvements de souris lies a l'element
*/
void Element::mouseMoveEvent(QGraphicsSceneMouseEvent *e) {
if (e -> buttons() & Qt::LeftButton) {
if (isSelected() && e -> buttons() & Qt::LeftButton) {
QPointF oldPos = pos();
setPos(mapToParent(e -> pos()) - matrix().map(e -> buttonDownPos(Qt::LeftButton)));
if (Diagram *diagram_ptr = diagram()) {

View File

@@ -1,5 +1,5 @@
/*
Copyright 2006-2007 Xavier Guerrin
Copyright 2006-2008 Xavier Guerrin
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
@@ -114,6 +114,7 @@ class Element : public QGraphicsItem {
protected:
void drawAxes(QPainter *, const QStyleOptionGraphicsItem *);
void mousePressEvent(QGraphicsSceneMouseEvent *);
void mouseMoveEvent(QGraphicsSceneMouseEvent *);
void mouseReleaseEvent(QGraphicsSceneMouseEvent *);

View File

@@ -1,5 +1,5 @@
/*
Copyright 2006-2007 Xavier Guerrin
Copyright 2006-2008 Xavier Guerrin
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify

View File

@@ -1,5 +1,5 @@
/*
Copyright 2006-2007 Xavier Guerrin
Copyright 2006-2008 Xavier Guerrin
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify

View File

@@ -0,0 +1,15 @@
<definition width="50" version="0.1" hotspot_x="25" hotspot_y="30" height="40" type="element" orientation="dnnn" >
<names>
<name lang="en" >Input</name>
<name lang="fr" >Entrée</name>
</names>
<description>
<input x="-18" y="-10" size="9" rotate="true" text="_" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="10" y2="-5" x2="10" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="-10" y2="5" x2="-10" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="10" y2="0" x2="24" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-24" y2="0" x2="-10" />
<terminal x="24" y="0" orientation="e" />
<terminal x="-24" y="0" orientation="w" />
</description>
</definition>

View File

@@ -0,0 +1,16 @@
<definition width="50" version="0.1" hotspot_x="25" hotspot_y="30" height="40" type="element" orientation="dnnn" >
<names>
<name lang="en" >Input (down front)</name>
<name lang="fr" >Entrée (front descendant)</name>
</names>
<description>
<text x="-4.25" y="5.25" size="9" text="N" />
<input x="-18" y="-10" size="9" rotate="true" text="_" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="10" y2="-5" x2="10" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="-10" y2="5" x2="-10" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="10" y2="0" x2="24" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-24" y2="0" x2="-10" />
<terminal x="24" y="0" orientation="e" />
<terminal x="-24" y="0" orientation="w" />
</description>
</definition>

View File

@@ -0,0 +1,16 @@
<definition width="50" version="0.1" hotspot_x="25" hotspot_y="30" height="40" type="element" orientation="dnnn" >
<names>
<name lang="en" >Input (up front)</name>
<name lang="fr" >Entrée (front montant)</name>
</names>
<description>
<text x="-3.5" y="5.25" size="9" text="P" />
<input x="-18" y="-10" size="9" rotate="true" text="_" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="10" y2="-5" x2="10" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="-10" y2="5" x2="-10" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="10" y2="0" x2="24" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-24" y2="0" x2="-10" />
<terminal x="24" y="0" orientation="e" />
<terminal x="-24" y="0" orientation="w" />
</description>
</definition>

View File

@@ -0,0 +1,16 @@
<definition width="50" version="0.1" hotspot_x="25" hotspot_y="30" height="40" type="element" orientation="dnnn" >
<names>
<name lang="en" >Input (negative logic)</name>
<name lang="fr" >Entrée (NF)</name>
</names>
<description>
<line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="-7" y2="-5" x2="7" />
<input x="-18" y="-10" size="9" rotate="true" text="_" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="10" y2="-5" x2="10" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="-10" y2="5" x2="-10" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="10" y2="0" x2="24" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-24" y2="0" x2="-10" />
<terminal x="24" y="0" orientation="e" />
<terminal x="-24" y="0" orientation="w" />
</description>
</definition>

View File

@@ -0,0 +1,6 @@
<qet-directory>
<names>
<name lang="en" >Inputs</name>
<name lang="fr" >Entrées</name>
</names>
</qet-directory>

View File

@@ -0,0 +1,6 @@
<qet-directory>
<names>
<name lang="en" >Outputs</name>
<name lang="fr" >Sorties</name>
</names>
</qet-directory>

View File

@@ -0,0 +1,14 @@
<definition width="50" version="0.1" hotspot_x="25" hotspot_y="30" height="40" type="element" orientation="dnnn" >
<names>
<name lang="en" >Output</name>
<name lang="fr" >Sortie</name>
</names>
<description>
<arc width="4" x="6" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="80" angle="-160" />
<input x="-18" y="-10" size="9" rotate="true" text="_" />
<arc width="4" x="-10" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-100" angle="-160" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="10" y2="0" x2="24" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-24" y2="0" x2="-10" />
<terminal x="-24" y="0" orientation="w" />
</description>
</definition>

View File

@@ -0,0 +1,15 @@
<definition width="50" version="0.1" hotspot_x="25" hotspot_y="30" height="40" type="element" orientation="dnnn" >
<names>
<name lang="en" >Output (reset)</name>
<name lang="fr" >Sortie (reset)</name>
</names>
<description>
<text x="-4.25" y="5.25" size="9" text="R" />
<arc width="4" x="6" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="80" angle="-160" />
<input x="-18" y="-10" size="9" rotate="true" text="_" />
<arc width="4" x="-10" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-100" angle="-160" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="10" y2="0" x2="24" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-24" y2="0" x2="-10" />
<terminal x="-24" y="0" orientation="w" />
</description>
</definition>

View File

@@ -0,0 +1,15 @@
<definition width="50" version="0.1" hotspot_x="25" hotspot_y="30" height="40" type="element" orientation="dnnn" >
<names>
<name lang="en" >Output (set)</name>
<name lang="fr" >Sortie (set)</name>
</names>
<description>
<arc width="4" x="6" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="80" angle="-160" />
<input x="-18" y="-10" size="9" rotate="true" text="_" />
<arc width="4" x="-10" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-100" angle="-160" />
<text x="-4.25" y="5.25" size="9" text="S" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="10" y2="0" x2="24" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-24" y2="0" x2="-10" />
<terminal x="-24" y="0" orientation="w" />
</description>
</definition>

View File

@@ -0,0 +1,6 @@
<qet-directory>
<names>
<name lang="fr">Ladder</name>
<name lang="en">Ladder</name>
</names>
</qet-directory>

View File

@@ -0,0 +1,6 @@
<qet-directory>
<names>
<name lang="fr">Automatisme</name>
<name lang="en">Automatism</name>
</names>
</qet-directory>

View File

@@ -0,0 +1,6 @@
<qet-directory>
<names>
<name lang="en" >Transducers</name>
<name lang="fr" >Capteurs</name>
</names>
</qet-directory>

View File

@@ -0,0 +1,6 @@
<qet-directory>
<names>
<name lang="en" >Sensors</name>
<name lang="fr" >Sondes</name>
</names>
</qet-directory>

View File

@@ -0,0 +1,6 @@
<qet-directory>
<names>
<name lang="en" >Current toroidal core</name>
<name lang="fr" >Tores de courant</name>
</names>
</qet-directory>

View File

@@ -0,0 +1,17 @@
<definition width="40" version="0.1" hotspot_x="15" hotspot_y="25" height="40" type="element" orientation="dyyy" >
<names>
<name lang="en" >1-pole toroidal core</name>
<name lang="fr" >Tore 1 pôle</name>
</names>
<description>
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="5" y2="-10" x2="5" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="14" y2="-10" x2="5" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="14" y2="0" x2="10" />
<ellipse width="20" x="-10" y="-2.5" antialias="true" height="5" style="line-style:dashed;line-weight:thin;filling:white;color:black" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="0" y2="10" x2="0" />
<terminal x="0" y="-16" orientation="n" />
<terminal x="0" y="11" orientation="s" />
<terminal x="15" y="0" orientation="e" />
<terminal x="15" y="-10" orientation="e" />
</description>
</definition>

View File

@@ -0,0 +1,20 @@
<definition width="50" version="0.1" hotspot_x="25" hotspot_y="25" height="40" type="element" orientation="dyyy" >
<names>
<name lang="en" >2-poles toroidal core</name>
<name lang="fr" >Tore 2 pôles</name>
</names>
<description>
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="5" y2="-10" x2="5" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="14" y2="-10" x2="5" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="14" y2="0" x2="10" />
<ellipse width="30" x="-20" y="-2.5" antialias="true" height="5" style="line-style:dashed;line-weight:thin;filling:white;color:black" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="-10" y2="10" x2="-10" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="0" y2="10" x2="0" />
<terminal x="0" y="-16" orientation="n" />
<terminal x="0" y="11" orientation="s" />
<terminal x="15" y="0" orientation="e" />
<terminal x="15" y="-10" orientation="e" />
<terminal x="-10" y="-16" orientation="n" />
<terminal x="-10" y="11" orientation="s" />
</description>
</definition>

View File

@@ -0,0 +1,23 @@
<definition width="60" version="0.1" hotspot_x="35" hotspot_y="25" height="40" type="element" orientation="dyyy" >
<names>
<name lang="en" >3-poles toroidal core</name>
<name lang="fr" >Tore 3 pôles</name>
</names>
<description>
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="5" y2="-10" x2="5" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="14" y2="-10" x2="5" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="14" y2="0" x2="10" />
<ellipse width="40" x="-30" y="-2.5" antialias="true" height="5" style="line-style:dashed;line-weight:thin;filling:white;color:black" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="-10" y2="10" x2="-10" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="0" y2="10" x2="0" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="-20" y2="10" x2="-20" />
<terminal x="0" y="-16" orientation="n" />
<terminal x="0" y="11" orientation="s" />
<terminal x="15" y="0" orientation="e" />
<terminal x="15" y="-10" orientation="e" />
<terminal x="-10" y="-16" orientation="n" />
<terminal x="-10" y="11" orientation="s" />
<terminal x="-20" y="-16" orientation="n" />
<terminal x="-20" y="11" orientation="s" />
</description>
</definition>

View File

@@ -0,0 +1,26 @@
<definition width="70" version="0.1" hotspot_x="45" hotspot_y="25" height="40" type="element" orientation="dyyy" >
<names>
<name lang="en" >4-poles toroidal core</name>
<name lang="fr" >Tore 4 pôles</name>
</names>
<description>
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="5" y2="-10" x2="5" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="14" y2="-10" x2="5" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="14" y2="0" x2="10" />
<ellipse width="50" x="-40" y="-2.5" antialias="true" height="5" style="line-style:dashed;line-weight:thin;filling:white;color:black" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="-10" y2="10" x2="-10" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="0" y2="10" x2="0" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="-30" y2="10" x2="-30" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="-20" y2="10" x2="-20" />
<terminal x="0" y="-16" orientation="n" />
<terminal x="0" y="11" orientation="s" />
<terminal x="15" y="0" orientation="e" />
<terminal x="15" y="-10" orientation="e" />
<terminal x="-10" y="-16" orientation="n" />
<terminal x="-10" y="11" orientation="s" />
<terminal x="-30" y="-16" orientation="n" />
<terminal x="-20" y="-16" orientation="n" />
<terminal x="-30" y="11" orientation="s" />
<terminal x="-20" y="11" orientation="s" />
</description>
</definition>

View File

@@ -0,0 +1,11 @@
<definition width="10" version="0.1" hotspot_x="5" hotspot_y="25" height="30" type="element" orientation="dyyy" >
<names>
<name lang="en" >Input terminal</name>
<name lang="fr" >Borne entrée</name>
</names>
<description>
<polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-5" x1="-4" y2="1" x2="0" y3="-5" x3="4" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="0" x2="0" />
<terminal x="0" y="-21" orientation="n" />
</description>
</definition>

View File

@@ -0,0 +1,14 @@
<definition width="10" version="0.1" hotspot_x="5" hotspot_y="25" height="50" type="element" orientation="dyyy" >
<names>
<name lang="en" >Dual terminal</name>
<name lang="fr" >Double borne</name>
</names>
<description>
<polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-1" x1="-4" y2="5" x2="0" y3="-1" x3="4" />
<polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-5" x1="-4" y2="1" x2="0" y3="-5" x3="4" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5.5" x1="0" y2="20" x2="0" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="0" x2="0" />
<terminal x="0" y="-21" orientation="n" />
<terminal x="0" y="21" orientation="s" />
</description>
</definition>

View File

@@ -0,0 +1,11 @@
<definition width="10" version="0.1" hotspot_x="5" hotspot_y="5" height="30" type="element" orientation="dyyy" >
<names>
<name lang="en" >Output terminal</name>
<name lang="fr" >Borne sortie</name>
</names>
<description>
<polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-1" x1="-4" y2="5" x2="0" y3="-1" x3="4" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5.5" x1="0" y2="20" x2="0" />
<terminal x="0" y="21" orientation="s" />
</description>
</definition>

View File

@@ -0,0 +1,15 @@
<definition width="30" version="0.1" hotspot_x="10" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy" >
<names>
<name lang="en" >Terminal block</name>
<name lang="fr" >Borne continuité</name>
</names>
<description>
<input x="5" y="8" size="7" text="_" />
<input x="5" y="-5" size="10" text="_" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="3" x2="0" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="0" y2="-3" x2="0" />
<circle x="-2.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5" />
<terminal x="0" y="-10" orientation="n" />
<terminal x="0" y="10" orientation="s" />
</description>
</definition>

View File

@@ -0,0 +1,13 @@
<definition width="30" version="0.1" hotspot_x="10" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy" >
<names>
<name lang="en" >Terminal block</name>
<name lang="fr" >Borne finale</name>
</names>
<description>
<input x="5" y="8" size="7" text="_" />
<input x="5" y="-5" size="10" text="_" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="0" y2="-3" x2="0" />
<circle x="-2.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5" />
<terminal x="0" y="-10" orientation="n" />
</description>
</definition>

View File

@@ -0,0 +1,6 @@
<qet-directory>
<names>
<name lang="fr">Bornes</name>
<name lang="en">Terminals</name>
</names>
</qet-directory>

View File

@@ -4,6 +4,7 @@
<name lang="fr" >Contact simple (étanche)</name>
</names>
<description>
<polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="0" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12" x1="-8.5" y2="12" x2="-8.5" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12" x1="8.5" y2="12" x2="8.5" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-14.5" x1="-6" y2="-14.5" x2="6" />
@@ -14,8 +15,6 @@
<arc width="5" x="3.5" y="9.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90" />
<input x="12.75" y="3" size="9" text="_" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-10" x2="0" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="20" x2="0" />
<line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-5" y2="10" x2="0" />
<terminal x="0" y="-21" orientation="n" />
<terminal x="0" y="21" orientation="s" />
</description>

View File

@@ -4,6 +4,7 @@
<name lang="fr" >Contact simple (NF / étanche)</name>
</names>
<description>
<polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="5" y2="10" x2="0" y3="20" x3="0" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="0" y2="-9" x2="6" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12" x1="-8.5" y2="12" x2="-8.5" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12" x1="8.5" y2="12" x2="8.5" />
@@ -15,8 +16,6 @@
<arc width="5" x="3.5" y="9.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90" />
<input x="12.75" y="3" size="9" text="_" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-9" x2="0" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="20" x2="0" />
<line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="5" y2="10" x2="0" />
<terminal x="0" y="-21" orientation="n" />
<terminal x="0" y="21" orientation="s" />
</description>

View File

@@ -0,0 +1,16 @@
<definition width="30" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
<names>
<name lang="en" >Limit (NC)</name>
<name lang="fr" >Fin de course (NF)</name>
</names>
<description>
<polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="5" y2="10" x2="0" y3="20" x3="0" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5.25" x1="1.25" y2="-5.25" x2="3.25" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4" x1="1.25" y2="-5.25" x2="1.25" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="0" y2="-9" x2="6" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-9" x2="0" />
<input x="5.75" y="3" size="9" text="_" />
<terminal x="0" y="-21" orientation="n" />
<terminal x="0" y="21" orientation="s" />
</description>
</definition>

View File

@@ -0,0 +1,14 @@
<definition width="30" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
<names>
<name lang="en" >Limit</name>
<name lang="fr" >Fin de course</name>
</names>
<description>
<polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="0" />
<polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-4" x1="-4" y2="-3" x2="-6.75" y3="4.85" x3="-1.55" />
<input x="2.75" y="3" size="9" text="_" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-10" x2="0" />
<terminal x="0" y="-21" orientation="n" />
<terminal x="0" y="21" orientation="s" />
</description>
</definition>

View File

@@ -0,0 +1,6 @@
<qet-directory>
<names>
<name lang="en">Limits</name>
<name lang="fr" >Fins de courses</name>
</names>
</qet-directory>

View File

@@ -0,0 +1,19 @@
<definition width="50" version="0.1" hotspot_x="10" hotspot_y="35" height="60" type="element" orientation="dyyy" >
<names>
<name lang="en" >Switch 2 positions</name>
<name lang="fr" >Interrupteur 2 positions</name>
</names>
<description>
<input x="22" y="-7" size="9" text="_" />
<line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="9" y2="1" x2="2" />
<ellipse width="3" x="18.5" y="-1.5" antialias="true" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black" />
<ellipse width="3" x="8.5" y="-16.5" antialias="true" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black" />
<ellipse width="3" x="-1.5" y="-1.5" antialias="true" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" x1="0" y2="10" x2="0" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" x1="20" y2="10" x2="20" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="10" y2="-30" x2="10" />
<terminal x="0" y="10" orientation="s" />
<terminal x="20" y="10" orientation="s" />
<terminal x="10" y="-30" orientation="n" />
</description>
</definition>

View File

@@ -0,0 +1,20 @@
<definition width="50" version="0.1" hotspot_x="10" hotspot_y="35" height="60" type="element" orientation="dyyy" >
<names>
<name lang="en" >Switch 3 positions including neutral</name>
<name lang="fr" >Interrupteur 3 positions dont neutre</name>
</names>
<description>
<polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1" x1="10" y2="4" x2="8" y3="4" x3="12" />
<input x="22" y="-7" size="9" text="_" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="10" y2="1" x2="10" />
<ellipse width="3" x="18.5" y="-1.5" antialias="true" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black" />
<ellipse width="3" x="8.5" y="-16.5" antialias="true" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black" />
<ellipse width="3" x="-1.5" y="-1.5" antialias="true" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" x1="0" y2="10" x2="0" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" x1="20" y2="10" x2="20" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="10" y2="-30" x2="10" />
<terminal x="0" y="10" orientation="s" />
<terminal x="20" y="10" orientation="s" />
<terminal x="10" y="-30" orientation="n" />
</description>
</definition>

View File

@@ -1,14 +1,13 @@
<definition width="30" version="0.1" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
<names>
<name lang="en" >On-off switch</name>
<name lang="en" >Switch</name>
<name lang="fr" >Interrupteur</name>
</names>
<description>
<polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="0" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-12.5" x2="0" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="20" x2="0" />
<line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-5" y2="10" x2="0" />
<input x="2.75" y="3" size="9" text="_" />
<circle x="-1.750000000000001" y="-11.75000000000002" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3.5" />
<circle x="-1.75" y="-11.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3.5" />
<terminal x="0" y="-21" orientation="n" />
<terminal x="0" y="21" orientation="s" />
</description>

View File

@@ -0,0 +1,6 @@
<qet-directory>
<names>
<name lang="en" >Switchs</name>
<name lang="fr" >Interrupteurs</name>
</names>
</qet-directory>

View File

@@ -4,9 +4,8 @@
<name lang="fr" >Bouton poussoir</name>
</names>
<description>
<polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="0" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-10" x2="0" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="20" x2="0" />
<line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-5" y2="10" x2="0" />
<input x="2.75" y="3" size="9" text="_" />
<line antialias="false" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-5" x1="-10" y2="5" x2="-10" />
<line antialias="false" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-10" y2="0" x2="-3" />

View File

@@ -4,10 +4,9 @@
<name lang="fr" >Bouton poussoir (NF)</name>
</names>
<description>
<polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="5" y2="10" x2="0" y3="20" x3="0" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="0" y2="-9" x2="6" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-9" x2="0" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="20" x2="0" />
<line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="5" y2="10" x2="0" />
<input x="5.75" y="3" size="9" text="_" />
<line antialias="false" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-5" x1="-10" y2="5" x2="-10" />
<line antialias="false" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-10" y2="0" x2="3" />

View File

@@ -4,10 +4,9 @@
<name lang="fr" >Contact puissance contacteur (NF)</name>
</names>
<description>
<polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="5" y2="10" x2="0" y3="20" x3="0" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="0" y2="-9" x2="6" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-9" x2="0" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="20" x2="0" />
<line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="5" y2="10" x2="0" />
<input x="5.75" y="3" size="9" text="KM_" />
<arc width="5" x="-2.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180" />
<terminal x="0" y="21" orientation="s" />

View File

@@ -4,21 +4,18 @@
<name lang="fr" >Contact puissance contacteur (NF)</name>
</names>
<description>
<polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="25" y2="10" x2="20" y3="20" x3="20" />
<polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="15" y2="10" x2="10" y3="20" x3="10" />
<polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="5" y2="10" x2="0" y3="20" x3="0" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="0" y2="-9" x2="6" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-9" x2="0" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="20" x2="0" />
<line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="5" y2="10" x2="0" />
<input x="25" y="3" size="9" text="KM_" />
<arc width="5" x="-2.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="10" y2="-9" x2="16" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="10" y2="-9" x2="10" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="10" y2="20" x2="10" />
<line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="15" y2="10" x2="10" />
<arc width="5" x="7.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="20" y2="-9" x2="26" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="20" y2="-9" x2="20" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="20" y2="20" x2="20" />
<line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="25" y2="10" x2="20" />
<arc width="5" x="17.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180" />
<terminal x="0" y="21" orientation="s" />
<terminal x="0" y="-21" orientation="n" />

View File

@@ -4,25 +4,21 @@
<name lang="fr" >Contact puissance contacteur (NF)</name>
</names>
<description>
<polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="5" y2="10" x2="0" y3="20" x3="0" />
<polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="35" y2="10" x2="30" y3="20" x3="30" />
<polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="15" y2="10" x2="10" y3="20" x3="10" />
<polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="25" y2="10" x2="20" y3="20" x3="20" />
<input x="35" y="3" size="9" text="KM_" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="0" y2="-9" x2="6" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-9" x2="0" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="20" x2="0" />
<line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="5" y2="10" x2="0" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="10" y2="-9" x2="16" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="10" y2="-9" x2="10" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="10" y2="20" x2="10" />
<line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="15" y2="10" x2="10" />
<arc width="5" x="7.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="20" y2="-9" x2="26" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="20" y2="-9" x2="20" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="20" y2="20" x2="20" />
<line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="25" y2="10" x2="20" />
<arc width="5" x="17.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="30" y2="-9" x2="36" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="30" y2="-9" x2="30" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="30" y2="20" x2="30" />
<line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="35" y2="10" x2="30" />
<arc width="5" x="27.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180" />
<terminal x="0" y="21" orientation="s" />
<terminal x="0" y="-21" orientation="n" />

View File

@@ -4,26 +4,22 @@
<name lang="fr" >Contact puissance contacteur (NF)</name>
</names>
<description>
<polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="15" y2="10" x2="10" y3="20" x3="10" />
<polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="35" y2="10" x2="30" y3="20" x3="30" />
<polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="5" y2="10" x2="0" y3="20" x3="0" />
<polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="25" y2="10" x2="20" y3="20" x3="20" />
<input x="35" y="3" size="9" text="KM_" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="0" y2="-9" x2="6" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-9" x2="0" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="20" x2="0" />
<line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="5" y2="10" x2="0" />
<arc width="5" x="-2.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="10" y2="-9" x2="16" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="10" y2="-9" x2="10" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="10" y2="20" x2="10" />
<line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="15" y2="10" x2="10" />
<arc width="5" x="7.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="20" y2="-9" x2="26" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="20" y2="-9" x2="20" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="20" y2="20" x2="20" />
<line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="25" y2="10" x2="20" />
<arc width="5" x="17.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="30" y2="-9" x2="36" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="30" y2="-9" x2="30" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="30" y2="20" x2="30" />
<line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="35" y2="10" x2="30" />
<arc width="5" x="27.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180" />
<terminal x="0" y="21" orientation="s" />
<terminal x="0" y="-21" orientation="n" />

View File

@@ -4,9 +4,8 @@
<name lang="fr" >Contact puissance contacteur</name>
</names>
<description>
<polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="0" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-10" x2="0" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="20" x2="0" />
<line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-5" y2="10" x2="0" />
<input x="2.75" y="3" size="9" text="KM_" />
<arc width="5" x="-2.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180" />
<terminal x="0" y="-21" orientation="n" />

View File

@@ -4,18 +4,15 @@
<name lang="fr" >Contact puissance contacteur</name>
</names>
<description>
<polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="15" y2="10" x2="20" y3="20" x3="20" />
<polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="0" />
<polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="5" y2="10" x2="10" y3="20" x3="10" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-10" x2="0" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="20" x2="0" />
<line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-5" y2="10" x2="0" />
<input x="25" y="3" size="9" text="KM_" />
<arc width="5" x="-2.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="10" y2="-10" x2="10" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="10" y2="20" x2="10" />
<line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="5" y2="10" x2="10" />
<arc width="5" x="7.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="20" y2="-10" x2="20" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="20" y2="20" x2="20" />
<line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="15" y2="10" x2="20" />
<arc width="5" x="17.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180" />
<terminal x="0" y="-21" orientation="n" />
<terminal x="0" y="21" orientation="s" />

View File

@@ -4,21 +4,17 @@
<name lang="fr" >Contact puissance contacteur</name>
</names>
<description>
<polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="5" y2="10" x2="10" y3="20" x3="10" />
<polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="25" y2="10" x2="30" y3="20" x3="30" />
<polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="15" y2="10" x2="20" y3="20" x3="20" />
<polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="0" />
<input x="35" y="3" size="9" text="KM_" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-10" x2="0" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="20" x2="0" />
<line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-5" y2="10" x2="0" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="10" y2="-10" x2="10" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="10" y2="20" x2="10" />
<line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="5" y2="10" x2="10" />
<arc width="5" x="7.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="20" y2="-10" x2="20" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="20" y2="20" x2="20" />
<line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="15" y2="10" x2="20" />
<arc width="5" x="17.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="30" y2="-10" x2="30" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="30" y2="20" x2="30" />
<line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="25" y2="10" x2="30" />
<arc width="5" x="27.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180" />
<terminal x="0" y="-21" orientation="n" />
<terminal x="0" y="21" orientation="s" />

View File

@@ -4,22 +4,18 @@
<name lang="fr" >Contact puissance contacteur</name>
</names>
<description>
<polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="5" y2="10" x2="10" y3="20" x3="10" />
<polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="25" y2="10" x2="30" y3="20" x3="30" />
<polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="15" y2="10" x2="20" y3="20" x3="20" />
<polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="0" />
<input x="35" y="3" size="9" text="KM_" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-10" x2="0" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="20" x2="0" />
<line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-5" y2="10" x2="0" />
<arc width="5" x="-2.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="10" y2="-10" x2="10" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="10" y2="20" x2="10" />
<line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="5" y2="10" x2="10" />
<arc width="5" x="7.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="20" y2="-10" x2="20" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="20" y2="20" x2="20" />
<line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="15" y2="10" x2="20" />
<arc width="5" x="17.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="30" y2="-10" x2="30" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="30" y2="20" x2="30" />
<line antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="25" y2="10" x2="30" />
<arc width="5" x="27.5" y="-14.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180" />
<terminal x="0" y="-21" orientation="n" />
<terminal x="0" y="21" orientation="s" />

View File

@@ -0,0 +1,16 @@
<definition width="40" version="0.1" hotspot_x="20" hotspot_y="25" height="50" type="element" orientation="dnny" >
<names>
<name lang="en" >Contact relais thermique (NO)</name>
<name lang="fr" >Contact relais thermique (NO)</name>
</names>
<description>
<polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="0" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-9" y2="4" x2="-9" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-7" y2="2" x2="-7" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-3" y2="0" x2="-9" />
<input x="2.75" y="3" size="9" text="F_" />
<line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-10" x2="0" />
<terminal x="0" y="-21" orientation="n" />
<terminal x="0" y="21" orientation="s" />
</description>
</definition>

Some files were not shown because too many files have changed in this diff Show More