kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-03-04 12:49:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Corrections diverses

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@204 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
xavierqet
2007-11-04 17:37:10 +00:00
parent 6c4a7ace87
commit 317256b134
10 changed files with 35 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
conductor.cpp
View File

@@ -78,8 +78,7 @@ Conductor::~Conductor() {
if (!isDestroyed()) destroy(); if (!isDestroyed()) destroy();
// supprime les segments // supprime les segments
while (segments -> hasNextSegment()) delete segments -> nextSegment(); deleteSegments();
delete segments;
} }
/** /**
@@ -780,14 +779,7 @@ QList<QPointF> Conductor::segmentsToPoints() const {
*/ */
void Conductor::pointsToSegments(QList<QPointF> points_list) { void Conductor::pointsToSegments(QList<QPointF> points_list) {
// supprime les segments actuels // supprime les segments actuels
if (segments != NULL) { deleteSegments();
ConductorSegment *segment = segments;
while (segment -> hasNextSegment()) {
ConductorSegment *nextsegment = segment -> nextSegment();
delete segment;
segment = nextsegment;
}
}
// cree les segments a partir de la liste de points // cree les segments a partir de la liste de points
ConductorSegment *last_segment = NULL; ConductorSegment *last_segment = NULL;
@@ -1243,3 +1235,12 @@ void Conductor::setProfiles(const ConductorProfilesGroup &cpg) {
calculateTextItemPosition(); calculateTextItemPosition();
} }
} }
/// Supprime les segments
void Conductor::deleteSegments() {
if (segments != NULL) {
while (segments -> hasNextSegment()) delete segments -> nextSegment();
delete segments;
segments = NULL;
}
}

1
conductor.h
View File

@@ -108,6 +108,7 @@ class Conductor : public QGraphicsPathItem {
bool hasClickedOn(QPointF, QPointF) const; bool hasClickedOn(QPointF, QPointF) const;
void calculateTextItemPosition(); void calculateTextItemPosition();
Qt::Corner currentPathType() const; Qt::Corner currentPathType() const;
void deleteSegments();
static int getCoeff(const qreal &, const qreal &); static int getCoeff(const qreal &, const qreal &);
static int getSign(const qreal &); static int getSign(const qreal &);
QHash<ConductorSegmentProfile *, qreal> shareOffsetBetweenSegments(const qreal &offset, const QList<ConductorSegmentProfile *> &, const qreal & = 0.01) const; QHash<ConductorSegmentProfile *, qreal> shareOffsetBetweenSegments(const qreal &offset, const QList<ConductorSegmentProfile *> &, const qreal & = 0.01) const;

2
diagram.cpp
View File

@@ -38,6 +38,8 @@ Diagram::Diagram(QObject *parent) :
Destructeur Destructeur
*/ */
Diagram::~Diagram() { Diagram::~Diagram() {
if (conductor_setter -> scene()) removeItem(conductor_setter);
delete conductor_setter;
} }
/** /**

10
editor/qetelementeditor.cpp
View File

@@ -155,11 +155,11 @@ void QETElementEditor::setupActions() {
} }
void QETElementEditor::setupMenus() { void QETElementEditor::setupMenus() {
file_menu = new QMenu(tr("Fichier")); file_menu = new QMenu(tr("Fichier"), this);
edit_menu = new QMenu(tr("\311dition")); edit_menu = new QMenu(tr("\311dition"), this);
display_menu = new QMenu(tr("Affichage")); display_menu = new QMenu(tr("Affichage"), this);
tools_menu = new QMenu(tr("Outils")); tools_menu = new QMenu(tr("Outils"), this);
help_menu = new QMenu(tr("Aide")); help_menu = new QMenu(tr("Aide"), this);
file_menu -> setTearOffEnabled(true); file_menu -> setTearOffEnabled(true);
edit_menu -> setTearOffEnabled(true); edit_menu -> setTearOffEnabled(true);

1
element.h
View File

@@ -28,7 +28,6 @@ class Element : public QGraphicsItem {
QSize dimensions; QSize dimensions;
QPoint hotspot_coord; QPoint hotspot_coord;
QPixmap apercu; QPixmap apercu;
QMenu menu;
// methodes // methodes
public: public:

10
elementspanel.cpp
View File

@@ -161,17 +161,17 @@ void ElementsPanel::addFile(QTreeWidgetItem *qtwi_parent, QString fichier) {
QString whats_this = tr("Ceci est un \351l\351ment que vous pouvez ins\351rer dans votre sch\351ma par cliquer-d\351placer"); QString whats_this = tr("Ceci est un \351l\351ment que vous pouvez ins\351rer dans votre sch\351ma par cliquer-d\351placer");
QString tool_tip = tr("Cliquer-d\351posez cet \351l\351ment sur le sch\351ma pour ins\351rer un \351l\351ment "); QString tool_tip = tr("Cliquer-d\351posez cet \351l\351ment sur le sch\351ma pour ins\351rer un \351l\351ment ");
int etat; int etat;
CustomElement *elmt_perso = new CustomElement(fichier, 0, 0, &etat); CustomElement elmt_perso(fichier, 0, 0, &etat);
if (etat != 0) { if (etat != 0) {
qDebug() << "Le chargement du composant" << fichier << "a echoue avec le code d'erreur" << etat; qDebug() << "Le chargement du composant" << fichier << "a echoue avec le code d'erreur" << etat;
return; return;
} }
QTreeWidgetItem *qtwi = new QTreeWidgetItem(qtwi_parent, QStringList(elmt_perso -> nom())); QTreeWidgetItem *qtwi = new QTreeWidgetItem(qtwi_parent, QStringList(elmt_perso.nom()));
qtwi -> setStatusTip(0, tool_tip + "\253 " + elmt_perso -> nom() + " \273"); qtwi -> setStatusTip(0, tool_tip + "\253 " + elmt_perso.nom() + " \273");
qtwi -> setToolTip(0, elmt_perso -> nom()); qtwi -> setToolTip(0, elmt_perso.nom());
qtwi -> setWhatsThis(0, whats_this); qtwi -> setWhatsThis(0, whats_this);
qtwi -> setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled); qtwi -> setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled);
qtwi -> setIcon(0, QIcon(elmt_perso -> pixmap())); qtwi -> setIcon(0, QIcon(elmt_perso.pixmap()));
qtwi -> setData(0, 42, fichier); qtwi -> setData(0, 42, fichier);
} }

16
nameslist.cpp
View File

@@ -151,16 +151,16 @@ bool NamesList::operator==(const NamesList &nl) const {
@param fallback_name Le nom a retourner si aucun nom approprie n'est trouve @param fallback_name Le nom a retourner si aucun nom approprie n'est trouve
@return Le nom approprie en fonction de la langue du systeme @return Le nom approprie en fonction de la langue du systeme
*/ */
const QString &NamesList::name(const QString &fallback_name) const { QString NamesList::name(const QString &fallback_name) const {
// recupere les deux premiers caracteres de la locale en cours du systeme // recupere les deux premiers caracteres de la locale en cours du systeme
QString system_language = QLocale::system().name().left(2); QString system_language = QLocale::system().name().left(2);
QString *returned_name; QString returned_name;
if (hash_names[system_language] != QString()) { if (!hash_names[system_language].isEmpty()) {
returned_name = new QString(hash_names[system_language]); returned_name = hash_names[system_language];
} else if (hash_names["en"] != QString()) { } else if (!hash_names["en"].isEmpty()) {
returned_name = new QString(hash_names["en"]); returned_name = hash_names["en"];
} else { } else {
returned_name = new QString(fallback_name); returned_name = fallback_name;
} }
return(*returned_name); return(returned_name);
} }

2
nameslist.h
View File

@@ -33,7 +33,7 @@ class NamesList {
const QString operator[](const QString &) const; const QString operator[](const QString &) const;
bool operator!=(const NamesList &) const; bool operator!=(const NamesList &) const;
bool operator==(const NamesList &) const; bool operator==(const NamesList &) const;
const QString &name(const QString & = QString()) const; QString name(const QString & = QString()) const;
// methodes relatives a XML // methodes relatives a XML
void fromXml(const QDomElement &); void fromXml(const QDomElement &);

1
qetapp.cpp
View File

@@ -104,6 +104,7 @@ QETApp::QETApp(int &argc, char **argv) : QApplication(argc, argv) {
/// Destructeur /// Destructeur
QETApp::~QETApp() { QETApp::~QETApp() {
delete qsti;
} }
/** /**

2
qetdiagrameditor.cpp
View File

@@ -395,7 +395,7 @@ void QETDiagramEditor::menus() {
menu_edition -> addAction(shrink_diagram); menu_edition -> addAction(shrink_diagram);
// menu Configurer > Afficher // menu Configurer > Afficher
QMenu *menu_aff_aff = new QMenu(tr("Afficher")); QMenu *menu_aff_aff = new QMenu(tr("Afficher"), this);
menu_aff_aff -> setIcon(QIcon(":/ico/toolbars.png")); menu_aff_aff -> setIcon(QIcon(":/ico/toolbars.png"));
menu_aff_aff -> setTearOffEnabled(true); menu_aff_aff -> setTearOffEnabled(true);
menu_aff_aff -> addAction(main_bar -> toggleViewAction()); menu_aff_aff -> addAction(main_bar -> toggleViewAction());