Implementation des methodes et attributs relatifs aux conducteurs unifilaires

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@150 bfdf4180-ca20-0410-9c96-a3a8aa849046

conducer.cpp

@@ -57,6 +57,7 @@ Conducer::Conducer(Terminal *p1, Terminal* p2, Element *parent, QGraphicsScene *
 	text_item -> setPlainText("_");
 	text_item -> previous_text = "_";
 	calculateTextItemPosition();
+	//setSingleLine(true);
 	text_item -> setParentItem(this);
 }
 
@@ -416,6 +417,13 @@ void Conducer::paint(QPainter *qp, const QStyleOptionGraphicsItem */*qsogi*/, QW
 	
 	// dessin du conducteur
 	qp -> drawPath(path());
+	if (isSingleLine()) {
+		singleLineProperties.draw(
+			qp,
+			middleSegment() -> isHorizontal() ? QET::Horizontal : QET::Vertical,
+			QRectF(middleSegment() -> middle() - QPointF(7.5, 7.5), QSizeF(15.0, 15.0))
+		);
+	}
 	
 	// dessin des points d'accroche du conducteur si celui-ci est selectionne
 	if (isSelected()) {
@@ -776,8 +784,17 @@ bool Conducer::hasClickedOn(QPointF press_point, QPointF point) const {
 	@return true si le chargement a reussi, false sinon
 */
 bool Conducer::fromXml(QDomElement &e) {
-	text_item -> setPlainText(e.attribute("num"));
+	// recupere la "configuration" du conducteur
-	text_item -> previous_text = e.attribute("num");
+	if (e.attribute("singleline") == "true") {
+		// recupere les parametres specifiques a un conducteur unifilaire
+		singleLineProperties.fromXml(e);
+		setSingleLine(true);
+	} else {
+		// recupere le champ de texte
+		text_item -> setPlainText(e.attribute("num"));
+		text_item -> previous_text = e.attribute("num");
+		setSingleLine(false);
+	}
 	
 	// parcourt les elements XML "segment" et en extrait deux listes de longueurs
 	// les segments non valides sont ignores
@@ -854,19 +871,26 @@ QDomElement Conducer::toXml(QDomDocument &d, QHash<Terminal *, int> &table_adr_i
 	QDomElement e = d.createElement("conducer");
 	e.setAttribute("terminal1", table_adr_id.value(terminal1));
 	e.setAttribute("terminal2", table_adr_id.value(terminal2));
-	e.setAttribute("num",    text_item -> toPlainText());
 	
 	// on n'exporte les segments du conducteur que si ceux-ci ont
 	// ete modifies par l'utilisateur
-	if (!modified_path) return(e);
+	if (modified_path) {
+		// parcours et export des segments
+		QDomElement current_segment;
+		foreach(ConducerSegment *segment, segmentsList()) {
+			current_segment = d.createElement("segment");
+			current_segment.setAttribute("orientation", segment -> isHorizontal() ? "horizontal" : "vertical");
+			current_segment.setAttribute("length", segment -> length());
+			e.appendChild(current_segment);
+		}
+	}
 	
-	// parcours et export des segments
+	// exporte la "configuration" du conducteur
-	QDomElement current_segment;
+	e.setAttribute("singleline", isSingleLine() ? "true" : "false");
-	foreach(ConducerSegment *segment, segmentsList()) {
+	if (isSingleLine()) {
-		current_segment = d.createElement("segment");
+		singleLineProperties.toXml(d, e);
-		current_segment.setAttribute("orientation", segment -> isHorizontal() ? "horizontal" : "vertical");
+	} else {
-		current_segment.setAttribute("length", segment -> length());
+		e.setAttribute("num", text_item -> toPlainText());
-		e.appendChild(current_segment);
 	}
 	return(e);
 }
@@ -975,3 +999,175 @@ void Conducer::setProfile(const ConducerProfile &cp) {
 	}
 	calculateTextItemPosition();
 }
+
+bool Conducer::isSingleLine() const {
+	return(is_single_line);
+}
+
+void Conducer::setSingleLine(bool sl) {
+	is_single_line = sl;
+	text_item -> setVisible(!is_single_line);
+}
+
+/**
+	Constructeur par defaut
+*/
+SingleLineProperties::SingleLineProperties() :
+	hasGround(true),
+	hasNeutral(true),
+	phases(1)
+{
+}
+
+/// Destructeur
+SingleLineProperties::~SingleLineProperties() {
+}
+
+/**
+	Definit le nombre de phases (0, 1, 2, ou 3)
+	@param n Nombre de phases
+*/
+void SingleLineProperties::setPhasesCount(int n) {
+	phases = qBound(0, n, 3);
+}
+
+/// @return le nombre de phases (0, 1, 2, ou 3)
+unsigned short int SingleLineProperties::phasesCount() {
+	return(phases);
+}
+
+/**
+	Dessine les symboles propres a un conducteur unifilaire
+	@param painter QPainter a utiliser pour dessiner les symboles
+	@param direction direction du segment sur lequel les symboles apparaitront
+	@param rect rectangle englobant le dessin ; utilise pour specifier a la fois la position et la taille du dessin
+*/
+void SingleLineProperties::draw(QPainter *painter, QET::ConducerSegmentType direction, const QRectF &rect) {
+	// s'il n'y a rien a dessiner, on retourne immediatement
+	if (!hasNeutral && !hasGround && !phases) return;
+	
+	// prepare le QPainter
+	painter -> save();
+	QPen pen(painter -> pen());
+	pen.setCapStyle(Qt::FlatCap);
+	pen.setJoinStyle(Qt::MiterJoin);
+	painter -> setPen(pen);
+	painter -> setRenderHint(QPainter::Antialiasing, true);
+	
+	uint symbols_count = (hasNeutral ? 1 : 0) + (hasGround ? 1 : 0) + phases;
+	qreal interleave;
+	qreal symbol_width;
+	if (direction == QET::Horizontal) {
+		interleave = rect.width() / symbols_count;
+		symbol_width = rect.width() / 12;
+		for (uint i = 1 ; i <= symbols_count ; ++ i) {
+			// dessine le tronc du symbole
+			QPointF symbol_p1(rect.x() + (i * interleave) + symbol_width, rect.y() + rect.height() * 0.75);
+			QPointF symbol_p2(rect.x() + (i * interleave) - symbol_width, rect.y() + rect.height() * 0.25);
+			painter -> drawLine(QLineF(symbol_p1, symbol_p2));
+			
+			// dessine le reste des symboles terre et neutre
+			if (hasGround && i == 1) {
+				drawGround(painter, direction, symbol_p2, symbol_width * 2.0);
+			} else if (hasNeutral && ((i == 1 && !hasGround) || (i == 2 && hasGround))) {
+				drawNeutral(painter, direction, symbol_p2, symbol_width * 1.5);
+			}
+		}
+	} else {
+		interleave = rect.height() / symbols_count;
+		symbol_width = rect.height() / 12;
+		for (uint i = 1 ; i <= symbols_count ; ++ i) {
+			// dessine le tronc du symbole
+			QPointF symbol_p2(rect.x() + rect.width() * 0.75, rect.y() + (i * interleave) - symbol_width);
+			QPointF symbol_p1(rect.x() + rect.width() * 0.25, rect.y() + (i * interleave) + symbol_width);
+			painter -> drawLine(QLineF(symbol_p1, symbol_p2));
+			
+			// dessine le reste des symboles terre et neutre
+			if (hasGround && i == 1) {
+				drawGround(painter, direction, symbol_p2, symbol_width * 2.0);
+			} else if (hasNeutral && ((i == 1 && !hasGround) || (i == 2 && hasGround))) {
+				drawNeutral(painter, direction, symbol_p2, symbol_width * 1.5);
+			}
+		}
+	}
+	painter -> restore();
+}
+
+/**
+	Dessine le segment correspondant au symbole de la terre sur un conducteur unifilaire
+	@param painter QPainter a utiliser pour dessiner le segment
+	@param direction direction du segment sur lequel le symbole apparaitra
+	@param center centre du segment
+	@param size taille du segment
+*/
+void SingleLineProperties::drawGround(QPainter *painter, QET::ConducerSegmentType direction, QPointF center, qreal size) {
+	painter -> save();
+	
+	// prepare le QPainter
+	painter -> setRenderHint(QPainter::Antialiasing, false);
+	QPen pen2(painter -> pen());
+	pen2.setCapStyle(Qt::SquareCap);
+	painter -> setPen(pen2);
+	
+	// dessine le segment representant la terre
+	qreal half_size = size / 2.0;
+	QPointF offset_point(
+		(direction == QET::Horizontal) ? half_size : 0.0,
+		(direction == QET::Horizontal) ? 0.0 : half_size
+	);
+	painter -> drawLine(
+		QLineF(
+			center + offset_point,
+			center - offset_point
+		)
+	);
+	
+	painter -> restore();
+}
+
+/**
+	Dessine le cercle correspondant au symbole du neutre sur un conducteur unifilaire
+	@param painter QPainter a utiliser pour dessiner le segment
+	@param direction direction du segment sur lequel le symbole apparaitra
+	@param center centre du cercle
+	@param size diametre du cercle
+*/
+void SingleLineProperties::drawNeutral(QPainter *painter, QET::ConducerSegmentType, QPointF center, qreal size) {
+	painter -> save();
+	
+	// prepare le QPainter
+	painter -> setBrush(Qt::black);
+	
+	// desine le cercle representant le neutre
+	painter -> drawEllipse(
+		QRectF(
+			center - QPointF(size / 2.0, size / 2.0),
+			QSizeF(size, size)
+		)
+	);
+	
+	painter -> restore();
+}
+
+/**
+	exporte les parametres du conducteur unifilaire sous formes d'attributs XML
+	ajoutes a l'element e.
+	@param d Document XML ; utilise pour ajouter (potentiellement) des elements XML
+	@param e Element XML auquel seront ajoutes des attributs
+*/
+void SingleLineProperties::toXml(QDomDocument &, QDomElement &e) const {
+	e.setAttribute("ground",  hasGround  ? "true" : "false");
+	e.setAttribute("neutral", hasNeutral ? "true" : "false");
+	e.setAttribute("phase",   phases);
+}
+
+/**
+	importe les parametres du conducteur unifilaire a partir des attributs XML
+	de l'element e
+	@param e Element XML dont les attributs seront lus
+*/
+void SingleLineProperties::fromXml(QDomElement &e) {
+	hasGround  = e.attribute("ground")  == "true";
+	hasNeutral = e.attribute("neutral") == "true";
+	setPhasesCount(e.attribute("phase").toInt());
+}

conducer.h

@@ -6,6 +6,26 @@
 #include "diagramtextitem.h"
 class ConducerSegment;
 class Element;
+/**
+	Cette classe represente les proprietes specifiques a un conducteur unifilaire
+*/
+class SingleLineProperties {
+	public:
+	SingleLineProperties();
+	virtual ~SingleLineProperties();
+	void setPhasesCount(int);
+	unsigned short int phasesCount();
+	void draw(QPainter *, QET::ConducerSegmentType, const QRectF &);
+	void toXml(QDomDocument &, QDomElement &) const;
+	void fromXml(QDomElement &);
+	bool hasGround;
+	bool hasNeutral;
+	private:
+	unsigned short int phases;
+	void drawGround (QPainter *, QET::ConducerSegmentType, QPointF, qreal);
+	void drawNeutral(QPainter *, QET::ConducerSegmentType, QPointF, qreal);
+};
+
 /**
 	Cette classe represente un conducteur. Un conducteur relie deux bornes d'element.
 */
@@ -27,24 +47,8 @@ class Conducer : public QGraphicsPathItem {
 	Terminal *terminal1;
 	///Deuxieme borne a laquelle le fil est rattache
 	Terminal *terminal2;
-	
+	/// caracteristiques des conducteurs unifilaires
-	private:
+	SingleLineProperties singleLineProperties;
-	/// booleen indiquant si le fil est encore valide
-	bool destroyed;
-	DiagramTextItem *text_item;
-	ConducerSegment *segments;
-	QPointF press_point;
-	bool moving_point;
-	bool moving_segment;
-	int moved_point;
-	qreal previous_z_value;
-	ConducerSegment *moved_segment;
-	bool modified_path;
-	bool has_to_save_profile;
-	ConducerProfile conducer_profile;
-	static QPen conducer_pen;
-	static QBrush conducer_brush;
-	static bool pen_and_brush_initialized;
 	
 	// methodes
 	public:
@@ -64,6 +68,8 @@ class Conducer : public QGraphicsPathItem {
 	QDomElement toXml(QDomDocument &, QHash<Terminal *, int> &) const;
 	const QList<ConducerSegment *> segmentsList() const;
 	void setProfile(const ConducerProfile &);
+	void setSingleLine(bool);
+	bool isSingleLine() const;
 	
 	protected:
 	virtual void mousePressEvent(QGraphicsSceneMouseEvent *);
@@ -71,6 +77,33 @@ class Conducer : public QGraphicsPathItem {
 	virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *);
 	virtual void hoverMoveEvent(QGraphicsSceneHoverEvent *);
 	
+	private:
+	/// booleen indiquant si le fil est encore valide
+	bool destroyed;
+	/// booleen indiquant le mode du conducteur : unifilaire ou non
+	bool is_single_line;
+	/// champ de texte editable pour les conducteurs non unifilaires
+	DiagramTextItem *text_item;
+	/// Segments composant le conducteur
+	ConducerSegment *segments;
+	/// Attributs lies aux manipulations a la souris
+	QPointF press_point;
+	bool moving_point;
+	bool moving_segment;
+	int moved_point;
+	qreal previous_z_value;
+	ConducerSegment *moved_segment;
+	/// booleen indiquant si le conducteur a ete modifie manuellement par l'utilisateur
+	bool modified_path;
+	/// booleen indiquant s'il faut sauver le profil courant au plus tot
+	bool has_to_save_profile;
+	/// profil du conducteur : "photo" de ce a quoi le conducteur doit ressembler
+	ConducerProfile conducer_profile;
+	/// QPen et QBrush utilises pour dessiner les conducteurs
+	static QPen conducer_pen;
+	static QBrush conducer_brush;
+	static bool pen_and_brush_initialized;
+	
 	private:
 	void segmentsToPath();
 	void saveProfile(bool = true);

lang/qet_en.ts

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS><TS version="1.1" language="en">
-<defaultcodec></defaultcodec>
 <context>
     <name>AboutQET</name>
     <message>
@@ -679,47 +678,47 @@ Please check rights of the directory </translation>
 <context>
     <name>ExportDialog</name>
     <message>
-        <location filename="../exportdialog.cpp" line="201"/>
+        <location filename="../exportdialog.cpp" line="206"/>
         <source>Aper&#xe7;u</source>
         <translation>Preview</translation>
     </message>
     <message>
-        <location filename="../exportdialog.cpp" line="171"/>
+        <location filename="../exportdialog.cpp" line="176"/>
         <source>Bitmap (*.bmp)</source>
         <translation>Bitmap (*.bmp)</translation>
     </message>
     <message>
-        <location filename="../exportdialog.cpp" line="141"/>
+        <location filename="../exportdialog.cpp" line="142"/>
         <source>Conserver les couleurs</source>
         <translation>Keep colors</translation>
     </message>
     <message>
-        <location filename="../exportdialog.cpp" line="93"/>
+        <location filename="../exportdialog.cpp" line="94"/>
         <source>Conserver les proportions</source>
         <translation>Keep aspect ratio</translation>
     </message>
     <message>
-        <location filename="../exportdialog.cpp" line="121"/>
+        <location filename="../exportdialog.cpp" line="122"/>
         <source>Dessiner la grille</source>
         <translation>Draw the grid</translation>
     </message>
     <message>
-        <location filename="../exportdialog.cpp" line="126"/>
+        <location filename="../exportdialog.cpp" line="127"/>
         <source>Dessiner le cadre</source>
         <translation>Draw the border</translation>
     </message>
     <message>
-        <location filename="../exportdialog.cpp" line="131"/>
+        <location filename="../exportdialog.cpp" line="132"/>
         <source>Dessiner le cartouche</source>
         <translation>Draw the inset</translation>
     </message>
     <message>
-        <location filename="../exportdialog.cpp" line="136"/>
+        <location filename="../exportdialog.cpp" line="137"/>
         <source>Dessiner les colonnes</source>
         <translation>Draw columns</translation>
     </message>
     <message>
-        <location filename="../exportdialog.cpp" line="69"/>
+        <location filename="../exportdialog.cpp" line="70"/>
         <source>Dimensions</source>
         <translation>Dimensions</translation>
     </message>
@@ -729,90 +728,95 @@ Please check rights of the directory </translation>
         <translation>Export</translation>
     </message>
     <message>
-        <location filename="../exportdialog.cpp" line="112"/>
+        <location filename="../exportdialog.cpp" line="113"/>
         <source>Exporter le cadre</source>
         <translation>Export the border</translation>
     </message>
     <message>
-        <location filename="../exportdialog.cpp" line="115"/>
+        <location filename="../exportdialog.cpp" line="116"/>
         <source>Exporter les &#xe9;l&#xe9;ments</source>
         <translation>Export only elements</translation>
     </message>
     <message>
-        <location filename="../exportdialog.cpp" line="244"/>
+        <location filename="../exportdialog.cpp" line="249"/>
         <source>Exporter vers le fichier</source>
         <translation>Export to file</translation>
     </message>
     <message>
-        <location filename="../exportdialog.cpp" line="305"/>
+        <location filename="../exportdialog.cpp" line="313"/>
         <source>Fichier non sp&#xe9;cifi&#xe9;</source>
         <translation>Filename not given</translation>
     </message>
     <message>
-        <location filename="../exportdialog.cpp" line="167"/>
+        <location filename="../exportdialog.cpp" line="172"/>
         <source>Format :</source>
         <translation>Format :</translation>
     </message>
     <message>
-        <location filename="../exportdialog.cpp" line="73"/>
+        <location filename="../exportdialog.cpp" line="74"/>
         <source>Hauteur :</source>
         <translation>Height :</translation>
     </message>
     <message>
-        <location filename="../exportdialog.cpp" line="327"/>
+        <location filename="../exportdialog.cpp" line="335"/>
         <source>Il semblerait que vous n&apos;ayez pas les permissions n&#xe9;cessaires pour &#xe9;crire dans ce fichier..</source>
         <translation>It seems you don&apos;t have the permissions needed to write this file..</translation>
     </message>
     <message>
-        <location filename="../exportdialog.cpp" line="247"/>
+        <location filename="../exportdialog.cpp" line="252"/>
         <source>Images (*.png *.bmp *.jpg)</source>
         <translation>Pictures (*.png *.bmp *.jpg)</translation>
     </message>
     <message>
-        <location filename="../exportdialog.cpp" line="326"/>
+        <location filename="../exportdialog.cpp" line="334"/>
         <source>Impossible d&apos;&#xe9;crire dans ce fichier</source>
         <translation>Can&apos;t Write to the file</translation>
     </message>
     <message>
-        <location filename="../exportdialog.cpp" line="170"/>
+        <location filename="../exportdialog.cpp" line="175"/>
         <source>JPEG (*.jpg)</source>
         <translation>JPEG (*.jpg)</translation>
     </message>
     <message>
-        <location filename="../exportdialog.cpp" line="83"/>
+        <location filename="../exportdialog.cpp" line="84"/>
         <source>Largeur :</source>
         <translation>Width :</translation>
     </message>
     <message>
-        <location filename="../exportdialog.cpp" line="159"/>
+        <location filename="../exportdialog.cpp" line="164"/>
         <source>Nom de fichier :</source>
         <translation>Filename : </translation>
     </message>
     <message>
-        <location filename="../exportdialog.cpp" line="107"/>
+        <location filename="../exportdialog.cpp" line="108"/>
         <source>Options</source>
         <translation>Options</translation>
     </message>
     <message>
-        <location filename="../exportdialog.cpp" line="161"/>
+        <location filename="../exportdialog.cpp" line="166"/>
         <source>Parcourir</source>
         <translation>Browse</translation>
     </message>
     <message>
-        <location filename="../exportdialog.cpp" line="169"/>
+        <location filename="../exportdialog.cpp" line="174"/>
         <source>PNG (*.png)</source>
         <translation>PNG (*.png)</translation>
     </message>
     <message>
-        <location filename="../exportdialog.cpp" line="90"/>
+        <location filename="../exportdialog.cpp" line="91"/>
         <source>px</source>
         <translation>px</translation>
     </message>
     <message>
-        <location filename="../exportdialog.cpp" line="306"/>
+        <location filename="../exportdialog.cpp" line="314"/>
         <source>Vous devez sp&#xe9;cifier le chemin du fichier dans lequel sera enregistr&#xe9;e l&apos;image.</source>
         <translation>You must give a filename to save the picture.</translation>
     </message>
+    <message>
+        <location filename="../exportdialog.cpp" line="146"/>
+        <source>Dessiner les bornes</source>
+        <translation>Draw terminals</translation>
+    </message>
 </context>
 <context>
     <name>HotspotEditor</name>