Merge sources dir branch devel to trunk

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2613 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
scorpio810
2013-11-14 10:11:22 +00:00
parent 434849c3eb
commit 971ce1facb
54 changed files with 594 additions and 1152 deletions

View File

@@ -248,30 +248,6 @@ class ChangeNamesCommand : public ElementEditionCommand {
NamesList names_after;
};
/**
This command changes the allowed orientations of an electrical element.
*/
class ChangeOrientationsCommand : public ElementEditionCommand {
// constructors, destructor
public:
ChangeOrientationsCommand(ElementScene *, const OrientationSet &, const OrientationSet &, QUndoCommand * = 0);
virtual ~ChangeOrientationsCommand();
private:
ChangeOrientationsCommand(const ChangeOrientationsCommand &);
// methods
public:
virtual void undo();
virtual void redo();
// attributes
private:
/// Former orientations
OrientationSet ori_before;
/// New orientations
OrientationSet ori_after;
};
/**
This command changes the zValue of a set of primitives when editing an
electrical element.
@@ -312,29 +288,6 @@ class ChangeZValueCommand : public ElementEditionCommand {
Option option;
};
/**
This command enables or disables internal connections for an electrical
element.
*/
class AllowInternalConnectionsCommand : public ElementEditionCommand {
// constructors, destructor
public:
AllowInternalConnectionsCommand(ElementScene *, bool, QUndoCommand * = 0);
virtual ~AllowInternalConnectionsCommand();
private:
AllowInternalConnectionsCommand(const AllowInternalConnectionsCommand &);
// methods
public:
virtual void undo();
virtual void redo();
// attributes
private:
/// whether internal connections are allowed afterward
bool ic;
};
/**
This command changes extra information carried by an electrical element.
*/