Rotation and reflection should now work correctly;

Finished the symmetry editor

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

src/data/action/symbol.cpp

@@ -519,6 +519,7 @@ void GroupSymbolPartsActionBase::perform(bool to_undo) {
 
 GroupSymbolPartsAction::GroupSymbolPartsAction(SymbolGroup& root, const set<SymbolPartP>& parts, const SymbolGroupP& group)
 	: GroupSymbolPartsActionBase(root)
+	, group(group)
 {
 	// group parts in the old parts list
 	bool done = false;
@@ -539,7 +540,7 @@ GroupSymbolPartsAction::GroupSymbolPartsAction(SymbolGroup& root, const set<Symb
 	group->calculateBounds();
 }
 String GroupSymbolPartsAction::getName(bool to_undo) const {
-	return _ACTION_("group parts");
+	return group->isSymbolSymmetry() ? _ACTION_("add symmetry") : _ACTION_("group parts");
 }
 
 UngroupSymbolPartsAction::UngroupSymbolPartsAction(SymbolGroup& root, const set<SymbolPartP>& parts)

src/data/action/symbol.hpp

@@ -301,6 +301,8 @@ class GroupSymbolPartsAction : public GroupSymbolPartsActionBase {
 	GroupSymbolPartsAction(SymbolGroup& root, const set<SymbolPartP>& parts, const SymbolGroupP& group);
 	
 	virtual String getName(bool to_undo) const;
+  private:
+	SymbolGroupP group;
 };
 
 /// Break up one or more SymbolGroups

src/data/action/symbol_part.cpp

@@ -427,3 +427,90 @@ Action* control_point_remove_action(const SymbolShapeP& shape, const set<Control
 		return new ControlPointRemoveAction(shape, to_delete);
 	}
 }
+
+
+
+// ----------------------------------------------------------------------------- : Move symmetry center/handle
+
+SymmetryMoveAction::SymmetryMoveAction(SymbolSymmetry& symmetry, bool is_handle)
+	: symmetry(symmetry)
+	, is_handle(is_handle)
+	, original(is_handle ? symmetry.handle : symmetry.center)
+	, constrain(false)
+	, snap(0)
+{}
+
+String SymmetryMoveAction::getName(bool to_undo) const {
+	return is_handle ? _ACTION_("move symmetry handle") : _ACTION_("move symmetry center");
+}
+
+void SymmetryMoveAction::perform(bool to_undo) {
+	if (is_handle) {
+		swap(symmetry.handle, original);
+	} else {
+		swap(symmetry.center, original);
+	}
+}
+
+void SymmetryMoveAction::move(const Vector2D& deltaDelta) {
+	delta += deltaDelta;
+	if (is_handle) {
+		symmetry.handle = snap_vector(symmetry.center + original + delta, snap) - symmetry.center;
+		if (constrain) {
+			// constrain to multiples of 2pi/24 i.e. 24 stops
+			double angle = atan2(symmetry.handle.y, symmetry.handle.x);
+			double mult = (2 * M_PI) / 24;
+			angle = floor(angle / mult + 0.5) * mult;
+			symmetry.handle = Vector2D(cos(angle), sin(angle)) * symmetry.handle.length();
+		}
+	} else {
+		// Determine actual delta, possibly constrained and snapped
+		symmetry.center = constrain_snap_vector(original, delta, constrain, snap);
+	}
+}
+
+// ----------------------------------------------------------------------------- : Change symmetry kind
+
+SymmetryTypeAction::SymmetryTypeAction(SymbolSymmetry& symmetry, SymbolSymmetryType type)
+	: symmetry(symmetry), type(type)
+	, old_name(symmetry.name)
+{
+	// update name?
+	if (old_name == symmetry.expectedName()) {
+		swap(symmetry.kind, type);
+		old_name = symmetry.expectedName();
+		swap(symmetry.kind, type);
+	}
+}
+
+String SymmetryTypeAction::getName(bool to_undo) const {
+	return _ACTION_("change symmetry type");
+}
+
+void SymmetryTypeAction::perform(bool to_undo) {
+	swap(symmetry.kind, type);
+	swap(symmetry.name, old_name);
+}
+
+// ----------------------------------------------------------------------------- : Change symmetry copies
+
+SymmetryCopiesAction::SymmetryCopiesAction(SymbolSymmetry& symmetry, int copies)
+	: symmetry(symmetry), copies(copies)
+	, old_name(symmetry.name)
+{
+	// update name?
+	if (old_name == symmetry.expectedName()) {
+		swap(symmetry.copies, copies);
+		old_name = symmetry.expectedName();
+		swap(symmetry.copies, copies);
+	}
+}
+
+String SymmetryCopiesAction::getName(bool to_undo) const {
+	return _ACTION_("change symmetry copies");
+}
+
+void SymmetryCopiesAction::perform(bool to_undo) {
+	swap(symmetry.copies, copies);
+	swap(symmetry.name, old_name);
+}

src/data/action/symbol_part.hpp

@@ -172,5 +172,60 @@ class ControlPointAddAction : public Action {
 Action* control_point_remove_action(const SymbolShapeP& shape, const set<ControlPointP>& to_delete);
 
 
+
+
+// ----------------------------------------------------------------------------- : Move symmetry center/handle
+
+/// Moving the handle or the center of a symbol symmetry
+class SymmetryMoveAction : public Action {
+  public:
+	SymmetryMoveAction(SymbolSymmetry& symmetry, bool is_handle);
+	
+	virtual String getName(bool to_undo) const;
+	virtual void   perform(bool to_undo);
+	
+	/// Update this action to move some more
+	void move(const Vector2D& delta);
+	
+  private:
+	SymbolSymmetry& symmetry; ///< Affected part
+	bool is_handle;			///< Move the handle or the center?
+	Vector2D delta;			///< Amount we moved
+	Vector2D original;		///< Original value
+  public:
+	bool constrain;			///< Constrain movement?
+	int snap;				///< Snap to grid?
+};
+
+// ----------------------------------------------------------------------------- : Change symmetry kind
+
+/// Change the type of symmetry
+class SymmetryTypeAction : public Action {
+  public:
+	SymmetryTypeAction(SymbolSymmetry& symmetry, SymbolSymmetryType type);
+	
+	virtual String getName(bool to_undo) const;
+	virtual void   perform(bool to_undo);
+  private:
+	SymbolSymmetry&    symmetry;
+	SymbolSymmetryType type;
+	String             old_name;
+};
+
+// ----------------------------------------------------------------------------- : Change symmetry copies
+
+/// Change the number of copies of a symmetry
+class SymmetryCopiesAction : public Action {
+  public:
+	SymmetryCopiesAction(SymbolSymmetry& symmetry, int copies);
+	
+	virtual String getName(bool to_undo) const;
+	virtual void   perform(bool to_undo);
+  private:
+	SymbolSymmetry& symmetry;
+	int             copies;
+	String          old_name;
+};
+
 // ----------------------------------------------------------------------------- : EOF
 #endif

src/data/symbol.cpp

@@ -212,6 +212,11 @@ SymbolPartP SymbolSymmetry::clone() const {
 	return part;
 }
 
+String SymbolSymmetry::expectedName() const {
+	return capitalize(kind == SYMMETRY_ROTATION ? _TYPE_("rotation") : _TYPE_("reflection"))
+	     + String::Format(_(" (%d)"), copies);
+}
+
 IMPLEMENT_REFLECTION(SymbolSymmetry) {
 	REFLECT_BASE(SymbolPart);
 	REFLECT(kind);

src/data/symbol.hpp

@@ -222,7 +222,7 @@ class SymbolGroup : public SymbolPart {
 // ----------------------------------------------------------------------------- : SymbolSymmetry
 
 enum SymbolSymmetryType
-{	SYMMETRY_ROTATION   = SYMBOL_COMBINE_BORDER + 1 // for icons
+{	SYMMETRY_ROTATION
 ,	SYMMETRY_REFLECTION
 };
 
@@ -240,10 +240,12 @@ class SymbolSymmetry : public SymbolGroup {
 	
 	virtual String typeName() const;
 	virtual SymbolPartP clone() const;
-	virtual int icon() const { return kind; }
+	virtual int icon() const { return kind + SYMBOL_COMBINE_BORDER + 1; }
 	virtual       SymbolSymmetry* isSymbolSymmetry()       { return this; }
 	virtual const SymbolSymmetry* isSymbolSymmetry() const { return this; }
 	
+	String expectedName() const;
+	
 	DECLARE_REFLECTION();
 };