XVI IO

[clitk.git] / vv / vvMainWindow.cxx

diff --git a/vv/vvMainWindow.cxx b/vv/vvMainWindow.cxx
index dab9aaf39ed7cdb442e81457b37c5864e2a3977a..f55ebea2d2ff05b344270572e4bc3575dc7b1e13 100644 (file)
--- a/vv/vvMainWindow.cxx
+++ b/vv/vvMainWindow.cxx
@@ -3,8 +3,8 @@
   Program:   vv
   Module:    $RCSfile: vvMainWindow.cxx,v $
   Language:  C++
-  Date:      $Date: 2010/02/05 09:06:46 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2010/02/17 20:52:39 $
+  Version:   $Revision: 1.11 $
   Author :   Pierre Seroul (pierre.seroul@gmail.com)
 
   Copyright (C) 200COLUMN_IMAGE_NAME
@@ -39,7 +39,7 @@
 #include "vvProgressDialog.h"
 #include "vvQDicomSeriesSelector.h"
 #include "vvSlicerManager.h"
-#include "clitkIOCommon.h"
+#include "clitkImageCommon.h"
 #include "vvSlicer.h"
 #include "vvInteractorStyleNavigator.h"
 #include "vvImageWriter.h"
@@ -94,6 +94,8 @@
 #define COLUMN_RELOAD_IMAGE 6
 #define COLUMN_IMAGE_NAME 7
 
+#define EXTENSIONS "Images ( *.bmp *.png *.jpeg *.jpg *.tif *.mhd *.hdr *.vox *.his *.xdr)"
+
 /*Data Tree values
   0,Qt::UserRole full filename
   1,Qt::CheckStateRole checkbutton UL View
@@ -115,10 +117,10 @@ vvMainWindow::vvMainWindow() {
   this->setContextMenuPolicy(Qt::CustomContextMenu);
   contextActions.resize(0);
   QAction* actionOpen_new_image = contextMenu.addAction(QIcon(QString::fromUtf8(":/new/prefix1/icons/fileopen.png")),
-                                                        tr("Open new Image"));
+                                                        tr("O&pen new Image"));
+  actionOpen_new_image->setShortcut(QKeySequence(tr("Ctrl+O")));
   connect(actionOpen_new_image,SIGNAL(triggered()),this,SLOT(OpenImages()));
   contextActions.push_back(actionOpen_new_image);
-
   contextMenu.addSeparator();
 
   QAction* actionClose_Image = contextMenu.addAction(QIcon(QString::fromUtf8(":/new/prefix1/icons/exit.png")),
@@ -532,7 +534,7 @@ vvMainWindow::~vvMainWindow() {
 
 //------------------------------------------------------------------------------
 void vvMainWindow::MergeImages() {
-  QString Extensions = "Images ( *.bmp *.png *.jpeg *.jpg *.tif *.mhd *.hdr *.vox)";
+  QString Extensions = EXTENSIONS;
   Extensions += ";;All Files (*)";
   QStringList files = QFileDialog::getOpenFileNames(this,tr("Merge Images"),mInputPathName,Extensions);
   if (files.isEmpty())
@@ -596,7 +598,7 @@ void vvMainWindow::MergeImages() {
 
 //------------------------------------------------------------------------------
 void vvMainWindow::MergeImagesWithTime() {
-  QString Extensions = "Images ( *.bmp *.png *.jpeg *.jpg *.tif *.mhd *.hdr *.vox)";
+  QString Extensions = EXTENSIONS;
   Extensions += ";;All Files (*)";
   QStringList files = QFileDialog::getOpenFileNames(this,tr("Merge Images With Time"),mInputPathName,Extensions);
   if (files.isEmpty())
@@ -702,7 +704,7 @@ void vvMainWindow::OpenDicom() {
 
 //------------------------------------------------------------------------------
 void vvMainWindow::OpenImages() {
-  QString Extensions = "Images ( *.bmp *.png *.jpeg *.jpg *.tif *.mhd *.hdr *.vox)";
+  QString Extensions = EXTENSIONS;
   Extensions += ";;All Files (*)";
 
   QStringList files = QFileDialog::getOpenFileNames(this,tr("Load Images"),mInputPathName,Extensions);
@@ -726,7 +728,7 @@ void vvMainWindow::OpenRecentImage()
 
 //------------------------------------------------------------------------------
 void vvMainWindow::OpenImageWithTime() {
-  QString Extensions = "Images ( *.bmp *.png *.jpeg *.jpg *.tif *.mhd *.hdr *.vox)";
+  QString Extensions = EXTENSIONS;
   Extensions += ";;All Files (*)";
 
   QStringList files = QFileDialog::getOpenFileNames(this,tr("Load Images With Time"),mInputPathName,Extensions);
@@ -1819,7 +1821,7 @@ void vvMainWindow::SelectOverlayImage() {
         return;
       }
 
-  QString Extensions = "Images ( *.bmp *.png *.jpeg *.jpg *.tif *.mhd *.hdr *.vox)";
+  QString Extensions = EXTENSIONS;
   Extensions += ";;All Files (*)";
   QString file = QFileDialog::getOpenFileName(this,tr("Load Overlay image"),mInputPathName,Extensions);
   if (!file.isEmpty())
@@ -1912,7 +1914,7 @@ void vvMainWindow::AddFusionImage()
         return;
       }
 
-  QString Extensions = "Images ( *.bmp *.png *.jpeg *.jpg *.tif *.mhd *.hdr *.vox)";
+  QString Extensions = EXTENSIONS;
   Extensions += ";;All Files (*)";
   QString file = QFileDialog::getOpenFileName(this,tr("Load Fusion image"),mInputPathName,Extensions);
   if (!file.isEmpty())
@@ -2328,6 +2330,7 @@ void vvMainWindow::NOVerticalSliderChanged() {
       if (DataTree->topLevelItem(i)->data(COLUMN_UL_VIEW,Qt::CheckStateRole).toInt() > 1)
         {
           mSlicerManagers[i]->GetSlicer(0)->SetSlice(value);
+          // mSlicerManagers[i]->UpdateSlice(0); // <-- too much update...
           break;
         }
     }