minor ui change, enable saving mesh

TopModLab · Sep 2, 2016 · f829768 · f829768
1 parent 12e1769
commit f829768
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 10 deletions.
diff --git a/forms/mainwindow.ui b/forms/mainwindow.ui
@@ -730,10 +730,13 @@
      <normaloff>:/icons/open.svg</normaloff>:/icons/open.svg</iconset>
    </property>
    <property name="text">
-    <string>Import</string>
+    <string>Import Model</string>
    </property>
    <property name="toolTip">
-    <string>Import a new obj file</string>
+    <string>Import an external model from an obj file</string>
+   </property>
+   <property name="statusTip">
+    <string>Import an external model from an obj file</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+N</string>
@@ -748,7 +751,10 @@
     <string>Export</string>
    </property>
    <property name="toolTip">
-    <string>Export data as</string>
+    <string>Export Unfolded Model as Graph</string>
+   </property>
+   <property name="statusTip">
+    <string>Export Unfolded Model as Graph</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+E</string>
@@ -883,10 +889,13 @@
      <normaloff>:/icons/save.svg</normaloff>:/icons/save.svg</iconset>
    </property>
    <property name="text">
-    <string>Save</string>
+    <string>Save Model</string>
    </property>
    <property name="toolTip">
-    <string>Save a file</string>
+    <string>Save current model to disk</string>
+   </property>
+   <property name="statusTip">
+    <string>Save current model to disk</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+S</string>

diff --git a/src/hds_mesh.cpp b/src/hds_mesh.cpp
@@ -1358,7 +1358,10 @@ void HDS_Mesh::save(const string &filename)
 
 	// save the faces
 	for (int i = 0; i < faceMap.size(); ++i) {
-		auto corners = faceMap[i]->corners();
+		auto& curFace = faceMap[i];
+		if (curFace->isCutFace) continue;
+
+		auto corners = curFace->corners();
 		ss << "f ";
 		for (auto v : corners) {
 			ss << v->index + 1 << ' ';

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -519,8 +519,10 @@ void MainWindow::closeFile()          //later add this function
 void MainWindow::saveFile()
 {
 	QString filename = QFileDialog::getSaveFileName(this, "Input a file name","",tr("OBJ files(*.obj)"));
+#if _DEBUG
 	cout << "saving file " << filename.toStdString() << endl;
-	MeshManager::getInstance()->saveMeshes();
+#endif
+	MeshManager::getInstance()->saveMeshes(filename.toStdString());
 }
 
 void MainWindow::triggerExportSVG()

diff --git a/src/meshmanager.cpp b/src/meshmanager.cpp
@@ -643,9 +643,9 @@ bool MeshManager::smoothMesh()
 }
 
 
-bool MeshManager::saveMeshes()
+bool MeshManager::saveMeshes(const string &filename)
 {
-	// save only the cutted and unfolded
+	operationStack->getCurrentMesh()->save(filename);
 	return true;
 }
 

diff --git a/src/meshmanager.h b/src/meshmanager.h
@@ -95,7 +95,7 @@ class MeshManager
 	bool createDFormMesh();
 	// Export as SVG files
 	bool exportSVGFile(const QString &filename, const confMap &conf);
-	bool saveMeshes();
+	bool saveMeshes(const string &filename);
 
 	void setCurrentOpFlag(OperationStack::Flag curFlag) { operationStack->setCurrentFlag(curFlag); }
 public slots: