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

Basic Shapes: Added Delete shape (not from keyboard DEL)

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2907 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
abhishekm71
2014-03-06 14:04:19 +00:00
parent 020d4f575c
commit b3654fa5fa
4 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sources/diagram.cpp
View File

@@ -1277,6 +1277,8 @@ DiagramContent Diagram::selectedContent() {
} }
} else if (DiagramImageItem *dii = qgraphicsitem_cast<DiagramImageItem *>(item)) { } else if (DiagramImageItem *dii = qgraphicsitem_cast<DiagramImageItem *>(item)) {
dc.images << dii; dc.images << dii;
} else if (QetShapeItem *dsi = qgraphicsitem_cast<QetShapeItem *>(item)) {
dc.shapes << dsi;
} }
} }

9
sources/diagramcommands.cpp
View File

@@ -260,6 +260,10 @@ void DeleteElementsCommand::undo() {
foreach(DiagramImageItem *dii, removed_content.images) { foreach(DiagramImageItem *dii, removed_content.images) {
diagram -> addItem(dii); diagram -> addItem(dii);
} }
foreach(QetShapeItem *dsi, removed_content.shapes) {
diagram -> addItem(dsi);
}
} }
/// refait les suppressions /// refait les suppressions
@@ -284,6 +288,11 @@ void DeleteElementsCommand::redo() {
foreach(DiagramImageItem *dii, removed_content.images) { foreach(DiagramImageItem *dii, removed_content.images) {
diagram -> removeItem(dii); diagram -> removeItem(dii);
} }
//enleve les shapes
foreach(QetShapeItem *dsi, removed_content.shapes) {
diagram -> removeItem(dsi);
}
} }
/** /**

2
sources/diagramcontent.h
View File

@@ -50,7 +50,7 @@ class DiagramContent {
AnyConductor = 56, AnyConductor = 56,
Shapes = 64, Shapes = 64,
All = 127, All = 127,
SelectedOnly = 128, SelectedOnly = 128
}; };
/// Hold electrical elements /// Hold electrical elements

4
sources/qetdiagrameditor.cpp
View File

@@ -1226,7 +1226,9 @@ void QETDiagramEditor::slot_updateComplexActions() {
// actions need only one editable item // actions need only one editable item
int selected_image = dv ? dv -> diagram() -> selectedContent().count(DiagramContent::Images) : 0; int selected_image = dv ? dv -> diagram() -> selectedContent().count(DiagramContent::Images) : 0;
int selected_editable = selected_elements_count + (selected_texts - selected_conductor_texts) + selected_image;
int selected_shape = dv ? dv -> diagram() -> selectedContent().count(DiagramContent::Shapes) : 0;
int selected_editable = selected_elements_count + (selected_texts - selected_conductor_texts) + selected_image + selected_shape;
if (selected_editable == 1) { if (selected_editable == 1) {
edit_selection -> setEnabled(true); edit_selection -> setEnabled(true);