Merge branch 'master' of https://github.com/urianawu/Unfolding

# Conflicts:
#	src/meshhollower.cpp

Author: ShenyaoKe

src/MeshConnector.cpp

@@ -40,7 +40,7 @@ MeshConnector::MeshConnector()
 {
 }
 
-void MeshConnector::exportHollowPiece(FILE* fp,
+void MeshConnector::exportQuadEdgePiece(FILE* fp,
 	const mesh_t* unfolded_mesh, const confMap &conf)
 {
 	/************************************************************************/
@@ -305,7 +305,7 @@ void MeshConnector::exportHollowPiece(FILE* fp,
 	fprintf(fp, "</svg>");
 }
 
-void MeshConnector::exportHollowMFPiece(FILE* fp,
+void MeshConnector::exportWingedEdgePiece(FILE* fp,
 	const mesh_t* unfolded_mesh, const confMap &conf)
 {
 
@@ -1251,11 +1251,11 @@ bool MeshConnector::genConnector(
 		exportRegularPiece(fp, unfolded_mesh, conf);
 		break;
 	case HDS_Mesh::QUAD_PROC:
-		exportHollowPiece(fp, unfolded_mesh, conf);
+		exportQuadEdgePiece(fp, unfolded_mesh, conf);
 		break;
 	case HDS_Mesh::WINGED_PROC:
 		// new proc
-		exportHollowMFPiece(fp, unfolded_mesh, conf);
+		exportWingedEdgePiece(fp, unfolded_mesh, conf);
 		break;
 	case HDS_Mesh::GES_PROC:
 		exportGESPiece(fp, unfolded_mesh, conf);

src/MeshConnector.h

@@ -139,9 +139,9 @@ class MeshConnector
 	static bool genConnector(const mesh_t* unfolded_mesh,
 		const QString &filename, const confMap &conf);
 private:
-	static void exportHollowPiece(FILE* fp,
+	static void exportQuadEdgePiece(FILE* fp,
 		const mesh_t* unfolded_mesh, const confMap &conf);
-	static void exportHollowMFPiece(FILE* fp,
+	static void exportWingedEdgePiece(FILE* fp,
 		const mesh_t* unfolded_mesh, const confMap &conf);
 	static void exportGESPiece(FILE* fp,
 		const mesh_t* unfolded_mesh, const confMap &conf);

src/OperationStack.cpp

@@ -17,6 +17,8 @@ void OperationStack::undo()
 	if (opStack.size() > 1){
 		redoStack.push(opStack.top());
 		opStack.pop();
+		setCurrentFlag(getCurrentFlag());
+
 		cout<<"undo to flag "<<getCurrentFlag()<<endl;
 
 	}else {
@@ -29,6 +31,7 @@ void OperationStack::redo()
 {
 	if (!redoStack.empty()){
 		opStack.push(redoStack.top());
+		setCurrentFlag(getCurrentFlag());
 		redoStack.pop();
 
 	}else {
@@ -41,7 +44,7 @@ void OperationStack::redo()
 void OperationStack::push(HDS_Mesh* curMesh)
 {
 	opStack.push(QSharedPointer<Operation>(new Operation(curMesh, curFlag)));
-
+	setCurrentFlag(curFlag);
 	if (curFlag == Original)
 		ori_mesh = opStack.top()->mesh;
 	if (curFlag == Unfolded)
@@ -63,13 +66,7 @@ void OperationStack::reset()
 	while (opStack.size() > 1)
 		opStack.pop();
 	unfolded_mesh.reset();
-
-	canUnfold = false;
-	canGRS = true;
-	canCut = true;
-	canGES = true;
-	canRim = true;
-	canQuad = true;
+	setCurrentFlag(OperationStack::Original);
 }
 
 void OperationStack::clear()
@@ -80,14 +77,8 @@ void OperationStack::clear()
 		opStack.pop();
 	ori_mesh.reset();
 	unfolded_mesh.reset();
-
 	setCurrentFlag(OperationStack::Original);
-	canUnfold = false;
-	canGRS = true;
-	canCut = true;
-	canGES = true;
-	canRim = true;
-	canQuad = true;
+
 }
 
 /*call setCurrentFlag in mainWindow before mesh operation*/
@@ -98,6 +89,14 @@ void OperationStack::setCurrentFlag(Flag flag)
 
 	//check operation availability
 	switch(flag) {
+	case Original:
+		canUnfold = false;
+		canGRS = true;
+		canCut = true;
+		canGES = true;
+		canRim = true;
+		canQuad = true;
+		break;
 	case Cutted:
 		canUnfold = true;
 		canCut = false;