kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-18 13:30:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Amelioration de la classe DiagramContent

Browse Source 
Modifications pour corriger quelques regressions


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@212 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
xavierqet
2007-11-11 16:12:45 +00:00
parent be6ba77656
commit 4856b3dd7b
6 changed files with 95 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
diagramcommands.cpp
View File

@@ -124,13 +124,13 @@ DeleteElementsCommand::DeleteElementsCommand(
removed_content(content),
diagram(dia)
{
setText(QObject::tr("supprimer ") + removed_content.sentence(true));
diagram -> qgiManager().manage(removed_content.items());
setText(QObject::tr("supprimer ") + removed_content.sentence(DiagramContent::All));
diagram -> qgiManager().manage(removed_content.items(DiagramContent::All));
}
/// Destructeur
DeleteElementsCommand::~DeleteElementsCommand() {
diagram -> qgiManager().release(removed_content.items());
diagram -> qgiManager().release(removed_content.items(DiagramContent::All));
}
/// annule les suppressions
@@ -141,7 +141,7 @@ void DeleteElementsCommand::undo() {
}
// remet les conducteurs
foreach(Conductor *c, removed_content.conductors()) {
foreach(Conductor *c, removed_content.conductors(DiagramContent::AnyConductor)) {
diagram -> addItem(c);
c -> terminal1 -> addConductor(c);
c -> terminal2 -> addConductor(c);
@@ -156,7 +156,7 @@ void DeleteElementsCommand::undo() {
/// refait les suppressions
void DeleteElementsCommand::redo() {
// enleve les conducteurs
foreach(Conductor *c, removed_content.conductors()) {
foreach(Conductor *c, removed_content.conductors(DiagramContent::AnyConductor)) {
c -> terminal1 -> removeConductor(c);
c -> terminal2 -> removeConductor(c);
diagram -> removeItem(c);
@@ -189,15 +189,17 @@ PasteDiagramCommand::PasteDiagramCommand(
QUndoCommand(parent),
content(c),
diagram(dia),
filter(DiagramContent::Elements|DiagramContent::TextFields|DiagramContent::ConductorsToMove),
first_redo(true)
{
setText(QObject::tr("coller ") + content.sentence());
diagram -> qgiManager().manage(content.items());
setText(QObject::tr("coller ") + content.sentence(filter));
diagram -> qgiManager().manage(content.items(filter));
}
/// Destructeur
PasteDiagramCommand::~PasteDiagramCommand() {
diagram -> qgiManager().release(content.items());
diagram -> qgiManager().release(content.items(filter));
}
/// annule le coller
@@ -251,7 +253,7 @@ CutDiagramCommand::CutDiagramCommand(
) :
DeleteElementsCommand(dia, content, parent)
{
setText(QObject::tr("couper ") + content.sentence(true));
setText(QObject::tr("couper ") + content.sentence(DiagramContent::All));
}
/// Destructeur
@@ -277,7 +279,7 @@ MoveElementsCommand::MoveElementsCommand(
movement(m),
first_redo(true)
{
setText(QObject::tr("d\351placer ") + content_to_move.sentence());
setText(QObject::tr("d\351placer ") + content_to_move.sentence(DiagramContent::Elements|DiagramContent::TextFields|DiagramContent::ConductorsToUpdate|DiagramContent::ConductorsToMove));
}
/// Destructeur