Movement of objects with the arrow keys in symbol editor

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@527 0fc631ac-6414-0410-93d0-97cfa31319b6

src/data/action/symbol.cpp

@@ -23,8 +23,9 @@ String action_name_for(const set<SymbolPartP>& parts, const String& action) {
 
 // ----------------------------------------------------------------------------- : Moving symbol parts
 
-SymbolPartMoveAction::SymbolPartMoveAction(const set<SymbolPartP>& parts)
+SymbolPartMoveAction::SymbolPartMoveAction(const set<SymbolPartP>& parts, const Vector2D& delta)
 	: parts(parts)
+	, delta(delta), moved(-delta)
 	, min_pos(Vector2D::infinity()), max_pos(-Vector2D::infinity())
 	, constrain(false)
 	, snap(0)
@@ -419,3 +420,57 @@ void ReorderSymbolPartsAction::perform(bool to_undo) {
 	assert(part_id2 < symbol.parts.size());
 	swap(symbol.parts[part_id1], symbol.parts[part_id2]);
 }
+
+// ----------------------------------------------------------------------------- : Group symbol parts
+
+GroupSymbolPartsActionBase::GroupSymbolPartsActionBase(Symbol& symbol)
+	: symbol(symbol)
+{}
+void GroupSymbolPartsActionBase::perform(bool to_undo) {
+	swap(symbol.parts, old_part_list);
+}
+
+GroupSymbolPartsAction::GroupSymbolPartsAction(Symbol& symbol, const set<SymbolPartP>& parts)
+	: GroupSymbolPartsActionBase(symbol)
+{
+	// group parts in the old parts list
+	bool done = false;
+	SymbolGroupP group(new SymbolGroup);
+	group->name = _("Group");
+	FOR_EACH(p, symbol.parts) {
+		if (parts.find(p) != parts.end()) {
+			group->parts.push_back(p);
+			if (!done) {
+				done = true;
+				old_part_list.push_back(group);
+			}
+		} else {
+			// not affected
+			old_part_list.push_back(p);
+		}
+	}
+}
+String GroupSymbolPartsAction::getName(bool to_undo) const {
+	return _ACTION_("group parts");
+}
+
+UngroupSymbolPartsAction::UngroupSymbolPartsAction(Symbol& symbol, const set<SymbolPartP>& parts)
+	: GroupSymbolPartsActionBase(symbol)
+{
+	// break up the parts in the old parts list
+	FOR_EACH(p, symbol.parts) {
+		if (parts.find(p) != parts.end() && p->isSymbolGroup()) {
+			// break up the group
+			SymbolGroup* g = p->isSymbolGroup();
+			FOR_EACH(p, g->parts) {
+				old_part_list.push_back(p);
+			}
+		} else {
+			// not affected
+			old_part_list.push_back(p);
+		}
+	}
+}
+String UngroupSymbolPartsAction::getName(bool to_undo) const {
+	return _ACTION_("ungroup parts");
+}

src/data/action/symbol.hpp

@@ -31,7 +31,7 @@ class SymbolPartListAction : public SymbolPartAction {};
 /// Move some symbol parts
 class SymbolPartMoveAction : public SymbolPartAction {
   public:
-	SymbolPartMoveAction(const set<SymbolPartP>& parts);
+	SymbolPartMoveAction(const set<SymbolPartP>& parts, const Vector2D& delta = Vector2D());
 	
 	virtual String getName(bool to_undo) const;
 	virtual void   perform(bool to_undo);
@@ -235,7 +235,38 @@ class ReorderSymbolPartsAction : public SymbolPartListAction {
   private:
 	Symbol& symbol;				///< Symbol to swap the parts in
   public:
-	size_t part_id1, part_id2;	///< Indeces of parts to swap
+	size_t part_id1, part_id2;	///< Indices of parts to swap
+};
+
+
+// ----------------------------------------------------------------------------- : Group symbol parts
+
+/// Group multiple symbol parts together
+class GroupSymbolPartsActionBase : public SymbolPartListAction {
+  public:
+	GroupSymbolPartsActionBase(Symbol& symbol);
+	
+	virtual void perform(bool to_undo);
+	
+  protected:
+	Symbol&             symbol;			///< Symbol to group stuff in
+	vector<SymbolPartP> old_part_list;	///< Old part list of the symbol
+};
+
+/// Group multiple symbol parts together
+class GroupSymbolPartsAction : public GroupSymbolPartsActionBase {
+  public:
+	GroupSymbolPartsAction(Symbol& symbol, const set<SymbolPartP>& parts);
+	
+	virtual String getName(bool to_undo) const;
+};
+
+/// Break up one or more SymbolGroups
+class UngroupSymbolPartsAction : public GroupSymbolPartsActionBase {
+  public:
+	UngroupSymbolPartsAction(Symbol& symbol, const set<SymbolPartP>& groups);
+	
+	virtual String getName(bool to_undo) const;
 };