X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FGUI%2FQt%2FSurfaceRenderer%2Fqtsurfacerendererpanel.cxx;h=fb9a024b089dc733ac1ae92d680ed8f96faf148d;hb=28f6dd9a39b382710b0b9cc3c2164d27983dbce4;hp=b675aa60a52ecda699b47c195e6f0cbc8faf6437;hpb=8aa8568d0fa7b4e2c8f92372de3859a03c4072d0;p=creaMaracasVisu.git

diff --git a/lib/GUI/Qt/SurfaceRenderer/qtsurfacerendererpanel.cxx b/lib/GUI/Qt/SurfaceRenderer/qtsurfacerendererpanel.cxx
index b675aa6..fb9a024 100644
--- a/lib/GUI/Qt/SurfaceRenderer/qtsurfacerendererpanel.cxx
+++ b/lib/GUI/Qt/SurfaceRenderer/qtsurfacerendererpanel.cxx
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 #include "qtsurfacerendererpanel.h"
 #include "ui_qtsurfacerendererpanel.h"
 
@@ -18,8 +43,13 @@ QtSurfaceRendererPanel::QtSurfaceRendererPanel(QWidget *parent) :
 
 
     this->ui->pushButtonColorChooser->setIcon(QIcon(Color_xpm));
-    this->ui->pushButtonSave->setIcon(QIcon(Save_xpm));
+    //this->ui->pushButtonSave->setIcon(QIcon(Save_xpm));
     this->ui->pushButtonOpen->setIcon(QIcon(OpenImage_xpm));
+
+    this->ui->comboBoxSave->addItem(QIcon(Save_xpm), QString(""));
+    this->ui->comboBoxSave->addItem(QString("Save surface"));
+    this->ui->comboBoxSave->addItem(QString("Export image stencil"));
+    _ImageSet = false;
 }
 
 QtSurfaceRendererPanel::~QtSurfaceRendererPanel()
@@ -34,6 +64,7 @@ void QtSurfaceRendererPanel::setImageData(vtkImageData* img){
     this->ui->horizontalSliderMaxIso->setRange(range[0], range[1]);
 
     wxMaracasSurfaceRenderingManager::setImageData(img);
+    _ImageSet = true;
 }
 
 void QtSurfaceRendererPanel::on_OpacitySlider_valueChanged(int value)
@@ -77,8 +108,9 @@ void QtSurfaceRendererPanel::on_pushButtonColorChooser_clicked()
 
 void QtSurfaceRendererPanel::on_checkBox_clicked(bool checked)
 {
-    this->addRemoveActor(0, checked);
-    if(!checked){
+    if(!this->addRemoveActor(0, checked)){
+        this->ui->checkBox->setChecked(false);
+    }else if(!checked){
         this->ui->checkBoxBoundingBox->setCheckState(Qt::Unchecked);
         this->on_checkBoxBoundingBox_clicked(false);
     }
@@ -106,22 +138,23 @@ void QtSurfaceRendererPanel::on_horizontalSliderMinIso_sliderReleased()
 }
 
 void QtSurfaceRendererPanel::onIsoValueChanged(){
-    this->changeIsoValue(0, this->ui->horizontalSliderMinIso->value(), this->ui->horizontalSliderMaxIso->value());
+    if(_ImageSet)
+        this->changeIsoValue(0, this->ui->horizontalSliderMinIso->value(), this->ui->horizontalSliderMaxIso->value());
 }
 
-void QtSurfaceRendererPanel::on_pushButtonSave_clicked()
+/*void QtSurfaceRendererPanel::on_pushButtonSave_clicked()
 {
     QString filename = QFileDialog::getSaveFileName(this,
                                                     tr("Save Mesh File"),
                                                     QDir::currentPath(),
-                                                    tr("Mesh files (*.stl *.ply)") );
+                                                    tr("Mesh files (*.stl *.ply *.vtk)") );
 
     if( !filename.isNull() ){
         //filename.append(".stl");
         this->saveProp3DSTL(0, filename.toStdString().c_str());
     }
 
-}
+}*/
 
 void QtSurfaceRendererPanel::on_checkBoxBoundingBox_clicked(bool checked)
 {
@@ -136,9 +169,37 @@ void QtSurfaceRendererPanel::on_pushButtonOpen_clicked(bool checked)
 
 void QtSurfaceRendererPanel::on_pushButtonOpen_clicked()
 {
-    QString filename = QFileDialog::getOpenFileName(this, tr("Load Mesh File"), QDir::currentPath(),  tr("Mesh files (*.stl *.ply)"));
+    QString filename = QFileDialog::getOpenFileName(this, tr("Load Mesh File"), QDir::currentPath(),  tr("Mesh files (*.stl *.ply *.vtk)"));
 
     if(!filename.isNull()){
         this->loadProp3DSTL(filename.toStdString().c_str());
+        this->ui->checkBox->setCheckState(Qt::Checked);
+    }
+}
+
+void QtSurfaceRendererPanel::on_comboBoxSave_activated(int index)
+{
+    if(index == 1){
+        QString filename = QFileDialog::getSaveFileName(this,
+                                                        tr("Save Mesh File"),
+                                                        QDir::currentPath(),
+                                                        tr("Mesh files (*.stl *.ply *.vtk)") );
+
+        if( !filename.isNull() ){
+            //filename.append(".stl");
+            this->saveProp3DSTL(0, filename.toStdString().c_str());
+        }
+    }else if(index == 2){
+
+        QString filename = QFileDialog::getSaveFileName(this,
+                                                        tr("Save Image File"),
+                                                        QDir::currentPath(),
+                                                        tr("Meta Image file (*.mhd)") );
+
+        if( !filename.isNull() ){
+
+            this->exportImageStencil(0, filename.toStdString().c_str());
+        }
     }
+    this->ui->comboBoxSave->setCurrentIndex(0);
 }