kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-19 14:50:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor change: refresh indent

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2735 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
scorpio810
2014-01-11 22:38:30 +00:00
parent d25e07db7c
commit 99fa838bdd
1 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
sources/diagramcommands.cpp
View File

@@ -55,13 +55,13 @@ AddElementCommand::~AddElementCommand() {
/// Annule l'ajout /// Annule l'ajout
void AddElementCommand::undo() { void AddElementCommand::undo() {
diagram->showMe(); diagram -> showMe();
diagram -> removeElement(element); diagram -> removeElement(element);
} }
/// Refait l'ajout /// Refait l'ajout
void AddElementCommand::redo() { void AddElementCommand::redo() {
diagram->showMe(); diagram -> showMe();
diagram -> addElement(element); diagram -> addElement(element);
element -> setPos(position); element -> setPos(position);
element -> setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); element -> setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
@@ -90,13 +90,13 @@ AddTextCommand::~AddTextCommand() {
/// Annule l'ajout /// Annule l'ajout
void AddTextCommand::undo() { void AddTextCommand::undo() {
diagram->showMe(); diagram -> showMe();
diagram -> removeIndependentTextItem(textitem); diagram -> removeIndependentTextItem(textitem);
} }
/// Refait l'ajout /// Refait l'ajout
void AddTextCommand::redo() { void AddTextCommand::redo() {
diagram->showMe(); diagram -> showMe();
diagram -> addIndependentTextItem(textitem); diagram -> addIndependentTextItem(textitem);
textitem -> setPos(position); textitem -> setPos(position);
} }
@@ -124,13 +124,13 @@ AddImageCommand::~AddImageCommand() {
///Annule l'ajout ///Annule l'ajout
void AddImageCommand::undo() { void AddImageCommand::undo() {
diagram->showMe(); diagram -> showMe();
diagram -> removeItem(imageitem); diagram -> removeItem(imageitem);
} }
///Refait l'ajout ///Refait l'ajout
void AddImageCommand::redo() { void AddImageCommand::redo() {
diagram->showMe(); diagram -> showMe();
diagram -> addDiagramImageItem(imageitem); diagram -> addDiagramImageItem(imageitem);
imageitem -> setPos(position - imageitem -> boundingRect().center()); imageitem -> setPos(position - imageitem -> boundingRect().center());
} }
@@ -160,13 +160,13 @@ AddConductorCommand::~AddConductorCommand() {
/// Annule l'ajout /// Annule l'ajout
void AddConductorCommand::undo() { void AddConductorCommand::undo() {
diagram->showMe(); diagram -> showMe();
diagram -> removeConductor(conductor); diagram -> removeConductor(conductor);
} }
/// Refait l'ajout /// Refait l'ajout
void AddConductorCommand::redo() { void AddConductorCommand::redo() {
diagram->showMe(); diagram -> showMe();
diagram -> addConductor(conductor); diagram -> addConductor(conductor);
} }
@@ -203,7 +203,7 @@ DeleteElementsCommand::~DeleteElementsCommand() {
/// annule les suppressions /// annule les suppressions
void DeleteElementsCommand::undo() { void DeleteElementsCommand::undo() {
diagram->showMe(); diagram -> showMe();
// remet les elements // remet les elements
foreach(Element *e, removed_content.elements) { foreach(Element *e, removed_content.elements) {
diagram -> addElement(e); diagram -> addElement(e);
@@ -226,7 +226,7 @@ void DeleteElementsCommand::undo() {
/// refait les suppressions /// refait les suppressions
void DeleteElementsCommand::redo() { void DeleteElementsCommand::redo() {
diagram->showMe(); diagram -> showMe();
// enleve les conducteurs // enleve les conducteurs
foreach(Conductor *c, removed_content.conductors(DiagramContent::AnyConductor)) { foreach(Conductor *c, removed_content.conductors(DiagramContent::AnyConductor)) {
diagram -> removeConductor(c); diagram -> removeConductor(c);
@@ -284,7 +284,7 @@ PasteDiagramCommand::~PasteDiagramCommand() {
/// annule le coller /// annule le coller
void PasteDiagramCommand::undo() { void PasteDiagramCommand::undo() {
diagram->showMe(); diagram -> showMe();
// remove the conductors // remove the conductors
foreach(Conductor *c, content.conductorsToMove) diagram -> removeConductor(c); foreach(Conductor *c, content.conductorsToMove) diagram -> removeConductor(c);
@@ -300,7 +300,7 @@ void PasteDiagramCommand::undo() {
/// refait le coller /// refait le coller
void PasteDiagramCommand::redo() { void PasteDiagramCommand::redo() {
diagram->showMe(); diagram -> showMe();
if (first_redo) first_redo = false; if (first_redo) first_redo = false;
else { else {
// paste the elements // paste the elements
@@ -391,13 +391,13 @@ MoveElementsCommand::~MoveElementsCommand() {
/// annule le deplacement /// annule le deplacement
void MoveElementsCommand::undo() { void MoveElementsCommand::undo() {
diagram->showMe(); diagram -> showMe();
move(-movement); move(-movement);
} }
/// refait le deplacement /// refait le deplacement
void MoveElementsCommand::redo() { void MoveElementsCommand::redo() {
diagram->showMe(); diagram -> showMe();
if (first_redo) first_redo = false; if (first_redo) first_redo = false;
else move(movement); else move(movement);
} }
@@ -495,13 +495,13 @@ MoveElementsTextsCommand::~MoveElementsTextsCommand() {
/// annule le deplacement /// annule le deplacement
void MoveElementsTextsCommand::undo() { void MoveElementsTextsCommand::undo() {
diagram->showMe(); diagram -> showMe();
move(-movement); move(-movement);
} }
/// refait le deplacement /// refait le deplacement
void MoveElementsTextsCommand::redo() { void MoveElementsTextsCommand::redo() {
diagram->showMe(); diagram -> showMe();
if (first_redo) first_redo = false; if (first_redo) first_redo = false;
else move(movement); else move(movement);
} }
@@ -542,7 +542,7 @@ MoveConductorsTextsCommand::~MoveConductorsTextsCommand() {
/// annule le deplacement /// annule le deplacement
void MoveConductorsTextsCommand::undo() { void MoveConductorsTextsCommand::undo() {
diagram->showMe(); diagram -> showMe();
foreach(ConductorTextItem *cti, texts_to_move_.keys()) { foreach(ConductorTextItem *cti, texts_to_move_.keys()) {
QPointF movement = texts_to_move_[cti].first; QPointF movement = texts_to_move_[cti].first;
bool was_already_moved = texts_to_move_[cti].second; bool was_already_moved = texts_to_move_[cti].second;
@@ -556,7 +556,7 @@ void MoveConductorsTextsCommand::undo() {
/// refait le deplacement /// refait le deplacement
void MoveConductorsTextsCommand::redo() { void MoveConductorsTextsCommand::redo() {
diagram->showMe(); diagram -> showMe();
if (first_redo) { if (first_redo) {
first_redo = false; first_redo = false;
} else { } else {
@@ -631,13 +631,13 @@ ChangeDiagramTextCommand::~ChangeDiagramTextCommand() {
/// annule la modification de texte /// annule la modification de texte
void ChangeDiagramTextCommand::undo() { void ChangeDiagramTextCommand::undo() {
diagram->showMe(); diagram -> showMe();
text_item -> setHtml(text_before); text_item -> setHtml(text_before);
} }
/// refait la modification de texte /// refait la modification de texte
void ChangeDiagramTextCommand::redo() { void ChangeDiagramTextCommand::redo() {
diagram->showMe(); diagram -> showMe();
if (first_redo) { if (first_redo) {
first_redo = false; first_redo = false;
} else { } else {
@@ -678,7 +678,7 @@ RotateElementsCommand::~RotateElementsCommand() {
/// defait le pivotement /// defait le pivotement
void RotateElementsCommand::undo() { void RotateElementsCommand::undo() {
diagram->showMe(); diagram -> showMe();
foreach(Element *e, elements_to_rotate) { foreach(Element *e, elements_to_rotate) {
e -> rotateBy(-applied_rotation_angle_); e -> rotateBy(-applied_rotation_angle_);
} }
@@ -696,7 +696,7 @@ void RotateElementsCommand::undo() {
/// refait le pivotement /// refait le pivotement
void RotateElementsCommand::redo() { void RotateElementsCommand::redo() {
diagram->showMe(); diagram -> showMe();
foreach(Element *e, elements_to_rotate) { foreach(Element *e, elements_to_rotate) {
e -> rotateBy(applied_rotation_angle_); e -> rotateBy(applied_rotation_angle_);
} }
@@ -752,7 +752,7 @@ RotateTextsCommand::~RotateTextsCommand() {
Annule la rotation des textes Annule la rotation des textes
*/ */
void RotateTextsCommand::undo() { void RotateTextsCommand::undo() {
diagram->showMe(); diagram -> showMe();
foreach(DiagramTextItem *text, texts_to_rotate.keys()) { foreach(DiagramTextItem *text, texts_to_rotate.keys()) {
if (ConductorTextItem *cti = qgraphicsitem_cast<ConductorTextItem *>(text)) if (ConductorTextItem *cti = qgraphicsitem_cast<ConductorTextItem *>(text))
cti -> forceRotateByUser(previous_rotate_by_user_[cti]); cti -> forceRotateByUser(previous_rotate_by_user_[cti]);
@@ -764,7 +764,7 @@ void RotateTextsCommand::undo() {
Applique l'angle de rotation aux textes Applique l'angle de rotation aux textes
*/ */
void RotateTextsCommand::redo() { void RotateTextsCommand::redo() {
diagram->showMe(); diagram -> showMe();
foreach(DiagramTextItem *text, texts_to_rotate.keys()) { foreach(DiagramTextItem *text, texts_to_rotate.keys()) {
if (ConductorTextItem *cti = qgraphicsitem_cast<ConductorTextItem *>(text)) { if (ConductorTextItem *cti = qgraphicsitem_cast<ConductorTextItem *>(text)) {
//we grab the previous rotation by user of each ConductorTextItem //we grab the previous rotation by user of each ConductorTextItem
@@ -821,14 +821,14 @@ ChangeConductorCommand::~ChangeConductorCommand() {
/// Annule la modification du conducteur /// Annule la modification du conducteur
void ChangeConductorCommand::undo() { void ChangeConductorCommand::undo() {
diagram->showMe(); diagram -> showMe();
conductor -> setProfile(old_profile, path_type); conductor -> setProfile(old_profile, path_type);
conductor -> textItem() -> setPos(text_pos_before_mov_); conductor -> textItem() -> setPos(text_pos_before_mov_);
} }
/// Refait la modification du conducteur /// Refait la modification du conducteur
void ChangeConductorCommand::redo() { void ChangeConductorCommand::redo() {
diagram->showMe(); diagram -> showMe();
if (first_redo) { if (first_redo) {
first_redo = false; first_redo = false;
} else { } else {
@@ -875,7 +875,7 @@ ResetConductorCommand::~ResetConductorCommand() {
/// Annule la reinitialisation des conducteurs /// Annule la reinitialisation des conducteurs
void ResetConductorCommand::undo() { void ResetConductorCommand::undo() {
diagram->showMe(); diagram -> showMe();
foreach(Conductor *c, conductors_profiles.keys()) { foreach(Conductor *c, conductors_profiles.keys()) {
c -> setProfiles(conductors_profiles[c]); c -> setProfiles(conductors_profiles[c]);
} }
@@ -883,7 +883,7 @@ void ResetConductorCommand::undo() {
/// Refait la reinitialisation des conducteurs /// Refait la reinitialisation des conducteurs
void ResetConductorCommand::redo() { void ResetConductorCommand::redo() {
diagram->showMe(); diagram -> showMe();
foreach(Conductor *c, conductors_profiles.keys()) { foreach(Conductor *c, conductors_profiles.keys()) {
c -> setProfiles(ConductorProfilesGroup()); c -> setProfiles(ConductorProfilesGroup());
} }
@@ -915,14 +915,14 @@ ChangeTitleBlockCommand::~ChangeTitleBlockCommand() {
/// Annule la modification de cartouche /// Annule la modification de cartouche
void ChangeTitleBlockCommand::undo() { void ChangeTitleBlockCommand::undo() {
diagram->showMe(); diagram -> showMe();
diagram -> border_and_titleblock.importTitleBlock(old_titleblock); diagram -> border_and_titleblock.importTitleBlock(old_titleblock);
diagram -> invalidate(diagram -> border()); diagram -> invalidate(diagram -> border());
} }
/// Refait la modification de cartouche /// Refait la modification de cartouche
void ChangeTitleBlockCommand::redo() { void ChangeTitleBlockCommand::redo() {
diagram->showMe(); diagram -> showMe();
diagram -> border_and_titleblock.importTitleBlock(new_titleblock); diagram -> border_and_titleblock.importTitleBlock(new_titleblock);
diagram -> invalidate(diagram -> border()); diagram -> invalidate(diagram -> border());
} }
@@ -948,13 +948,13 @@ ChangeBorderCommand::~ChangeBorderCommand() {
/// Annule les changements apportes au schema /// Annule les changements apportes au schema
void ChangeBorderCommand::undo() { void ChangeBorderCommand::undo() {
diagram->showMe(); diagram -> showMe();
diagram -> border_and_titleblock.importBorder(old_properties); diagram -> border_and_titleblock.importBorder(old_properties);
} }
/// Refait les changements apportes au schema /// Refait les changements apportes au schema
void ChangeBorderCommand::redo() { void ChangeBorderCommand::redo() {
diagram->showMe(); diagram -> showMe();
diagram -> border_and_titleblock.importBorder(new_properties); diagram -> border_and_titleblock.importBorder(new_properties);
} }
@@ -993,7 +993,7 @@ void ChangeConductorPropertiesCommand::setNewSettings(const ConductorProperties
doivent avoir ete definis a l'aide de setNewSettings et setOldSettings doivent avoir ete definis a l'aide de setNewSettings et setOldSettings
*/ */
void ChangeConductorPropertiesCommand::undo() { void ChangeConductorPropertiesCommand::undo() {
diagram->showMe(); diagram -> showMe();
if (old_settings_set && new_settings_set) { if (old_settings_set && new_settings_set) {
conductor -> setProperties(old_properties); conductor -> setProperties(old_properties);
conductor -> update(); conductor -> update();
@@ -1005,7 +1005,7 @@ void ChangeConductorPropertiesCommand::undo() {
doivent avoir ete definis a l'aide de setNewSettings et setOldSettings doivent avoir ete definis a l'aide de setNewSettings et setOldSettings
*/ */
void ChangeConductorPropertiesCommand::redo() { void ChangeConductorPropertiesCommand::redo() {
diagram->showMe(); diagram -> showMe();
if (old_settings_set && new_settings_set) { if (old_settings_set && new_settings_set) {
conductor -> setProperties(new_properties); conductor -> setProperties(new_properties);
conductor -> update(); conductor -> update();
@@ -1058,7 +1058,7 @@ void ChangeSeveralConductorsPropertiesCommand::setNewSettings(const ConductorPro
doivent avoir ete definis a l'aide de setNewSettings et setOldSettings doivent avoir ete definis a l'aide de setNewSettings et setOldSettings
*/ */
void ChangeSeveralConductorsPropertiesCommand::undo() { void ChangeSeveralConductorsPropertiesCommand::undo() {
diagram->showMe(); diagram -> showMe();
if (old_settings_set && new_settings_set) { if (old_settings_set && new_settings_set) {
int i=0; int i=0;
foreach(Conductor *c, conductors) { foreach(Conductor *c, conductors) {
@@ -1074,7 +1074,7 @@ void ChangeSeveralConductorsPropertiesCommand::undo() {
doivent avoir ete definis a l'aide de setNewSettings et setOldSettings doivent avoir ete definis a l'aide de setNewSettings et setOldSettings
*/ */
void ChangeSeveralConductorsPropertiesCommand::redo() { void ChangeSeveralConductorsPropertiesCommand::redo() {
diagram->showMe(); diagram -> showMe();
if (old_settings_set && new_settings_set) { if (old_settings_set && new_settings_set) {
//new propertie are the same for each conductor //new propertie are the same for each conductor
@@ -1121,7 +1121,7 @@ ImageResizerCommand::~ImageResizerCommand() {}
* @brief ImageResizerCommand::undo set the old size * @brief ImageResizerCommand::undo set the old size
*/ */
void ImageResizerCommand::undo() { void ImageResizerCommand::undo() {
diagram->showMe(); diagram -> showMe();
image_ -> setScale(old_size); image_ -> setScale(old_size);
} }
@@ -1129,7 +1129,7 @@ void ImageResizerCommand::undo() {
* @brief ImageResizerCommand::redo set the new size * @brief ImageResizerCommand::redo set the new size
*/ */
void ImageResizerCommand::redo() { void ImageResizerCommand::redo() {
diagram->showMe(); diagram -> showMe();
if (old_size<new_size) setText(QObject::tr("Agrandire une image \340 %1 %").arg(new_size*100)); if (old_size<new_size) setText(QObject::tr("Agrandire une image \340 %1 %").arg(new_size*100));
else setText(QObject::tr("R\351duire une image \340 %1 %").arg(new_size*100)); else setText(QObject::tr("R\351duire une image \340 %1 %").arg(new_size*100));
image_ -> setScale(new_size); image_ -> setScale(new_size);