diff --git a/src/meshlab/mainwindow.h b/src/meshlab/mainwindow.h index e7e5fb690..436b5355e 100644 --- a/src/meshlab/mainwindow.h +++ b/src/meshlab/mainwindow.h @@ -23,6 +23,9 @@ /**************************************************************************** History $Log$ +Revision 1.44 2005/12/09 10:43:04 fmazzant +added tools -> set mask obj file + Revision 1.43 2005/12/09 00:26:25 buzzelli io importing mechanism adapted in order to be fully transparent towards the user @@ -117,6 +120,7 @@ private slots: void updateMenus(); ///////////Slot Menu Preferences ///////////////// void setCustomize(); + void setSaveMaskObj(); ///////////Slot Menu Help //////////////////////// void about(); void aboutPlugins(); @@ -208,6 +212,7 @@ private: QAction *closeAllAct; ///////////Action Menu Preferences ///////////////// QAction *setCustomizeAct; + QAction *setSaveMaskObjAct; ///////////Action Menu Help //////////////////////// QAction *aboutAct; QAction *aboutPluginsAct; diff --git a/src/meshlab/mainwindow_Init.cpp b/src/meshlab/mainwindow_Init.cpp index beaedca6a..01b183a9d 100644 --- a/src/meshlab/mainwindow_Init.cpp +++ b/src/meshlab/mainwindow_Init.cpp @@ -24,6 +24,9 @@ History $Log$ +Revision 1.24 2005/12/09 10:43:04 fmazzant +added tools -> set mask obj file + Revision 1.23 2005/12/09 03:50:40 davide_portelli A little change @@ -446,6 +449,9 @@ void MainWindow::createActions() setCustomizeAct = new QAction(tr("&Options..."),this); connect(setCustomizeAct, SIGNAL(triggered()), this, SLOT(setCustomize())); + setSaveMaskObjAct = new QAction(tr("&Options Save Obj"),this); + connect(setSaveMaskObjAct, SIGNAL(triggered()), this, SLOT(setSaveMaskObj())); + //////////////Action Menu About //////////////////////////////////////////////////////////// aboutAct = new QAction(tr("&About"), this); connect(aboutAct, SIGNAL(triggered()), this, SLOT(about())); @@ -533,6 +539,7 @@ void MainWindow::createMenus() //////////////////// Menu Preferences ///////////////////////////////////////////////////////////// preferencesMenu=menuBar()->addMenu(tr("&Tools")); preferencesMenu->addAction(setCustomizeAct); + preferencesMenu->addAction(setSaveMaskObjAct); //////////////////// Menu Help //////////////////////////////////////////////////////////////// helpMenu = menuBar()->addMenu(tr("&Help")); diff --git a/src/meshlab/mainwindow_RunTime.cpp b/src/meshlab/mainwindow_RunTime.cpp index 7701ce51e..4f6fb7927 100644 --- a/src/meshlab/mainwindow_RunTime.cpp +++ b/src/meshlab/mainwindow_RunTime.cpp @@ -24,6 +24,9 @@ History $Log$ +Revision 1.31 2005/12/09 10:43:04 fmazzant +added tools -> set mask obj file + Revision 1.30 2005/12/09 03:50:40 davide_portelli A little change @@ -682,14 +685,14 @@ void MainWindow::openRecentFile() bool MainWindow::saveAs() { - //QString initialPath = QDir::currentPath() + "/untitled.png"; - - QString fileName = QFileDialog::getSaveFileName(new QWidget(),tr("Save file"),".","Save files (*.obj *.ply)");//QFileDialog::getSaveFileName(this, tr("Save As"), initialPath); + QString fileName = QFileDialog::getSaveFileName(new QWidget(),tr("Save file"),".","Save files (*.obj *.ply)"); - if (fileName.isEmpty()) { + if (fileName.isEmpty()) + { return false; - } else { - // return paintArea->saveImage(fileName, "png"); + } + else + { qb->show(); bool ret = false; ret = this->GLA()->mm->Save(fileName.toStdString().c_str(),QCallBack); @@ -758,8 +761,12 @@ void MainWindow::setCustomize() cs.lColor=dialog.getLogAreaColor(); GLA()->setCustomSetting(cs); - } - + } +} + +void MainWindow::setSaveMaskObj() +{ + QMessageBox::warning(new QWidget(),"",""); } void MainWindow::renderBbox() { GLA()->setDrawMode(GLW::DMBox ); }