cleanup / better handling of errors

[clitk.git] / vv / vvMainWindow.cxx

diff --git a/vv/vvMainWindow.cxx b/vv/vvMainWindow.cxx
index 30005ac931e0d7927e0fda5e39022155c0c1b453..c252b6ffcb7a8b6a011126959434d4c77bf35b07 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/01/29 13:53:49 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2010/02/09 10:28:07 $
+  Version:   $Revision: 1.10 $
   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"
@@ -115,10 +115,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")),
@@ -302,7 +302,7 @@ vvMainWindow::vvMainWindow() {
 
   //Recently opened files
   std::list<std::string> recent_files = GetRecentlyOpenedImages();
-  if ( not recent_files.empty() )
+  if ( !recent_files.empty() )
     {
       QMenu * rmenu = new QMenu("Recently opened files...");
       rmenu->setIcon(QIcon(QString::fromUtf8(":/new/prefix1/icons/open.png")));
@@ -1262,7 +1262,7 @@ int vvMainWindow::GetSlicerIndexFromItem(QTreeWidgetItem* item) {
 //------------------------------------------------------------------------------
 void vvMainWindow::DisplayChanged(QTreeWidgetItem *clicked_item, int column) {
   int index = GetSlicerIndexFromItem(clicked_item);
-  if ( column >= COLUMN_CLOSE_IMAGE or column <= 0)
+  if ( column >= COLUMN_CLOSE_IMAGE || column <= 0)
     return;
   for (unsigned int i = 0; i < mSlicerManagers.size(); i++)
     {
@@ -2328,6 +2328,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;
         }
     }
@@ -2603,7 +2604,7 @@ void vvMainWindow::PlayNext() {
       ///Only play one slicer per SM, and only if the SM is being displayed
       for (int i=0;i<image_number;i++)
         for (int j=0;j<4;j++)
-          if (mSlicerManagers[i]->GetImage()->GetVTKImages().size() > 1 and
+          if (mSlicerManagers[i]->GetImage()->GetVTKImages().size() > 1 &&
               DataTree->topLevelItem(i)->data(j+1,Qt::CheckStateRole).toInt() > 0)
             {
               mSlicerManagers[i]->SetNextTSlice(j);