Fixed compilation with VC++ 9

diff --git a/vv/QVTKWidget.h b/vv/QVTKWidget.h
index ef91121e2eceefe4efd13f7a2c21b7dd758f7fa4..13f5e6642fb1b3916b5dece9ff4017fadcd980e0 100644 (file)
--- a/vv/QVTKWidget.h
+++ b/vv/QVTKWidget.h
@@ -46,18 +46,19 @@ class vtkUnsignedCharArray;
 #endif\r
 \r
 #if defined(WIN32) && defined(VTK_BUILD_SHARED_LIBS)\r
-#if defined(QVTK_EXPORTS) || defined(QVTKWidgetPlugin_EXPORTS)\r
-#define QVTK_EXPORT __declspec( dllexport )\r
-#else\r
-#define QVTK_EXPORT __declspec( dllimport )\r
+#  if defined(QVTK_EXPORTS) || defined(QVTKWidgetPlugin_EXPORTS)\r
+#    define QVTK_EXPORT __declspec( dllexport )\r
+#  else\r
+#    define QVTK_EXPORT __declspec( dllimport )\r
+#  endif\r
 #endif\r
-#define QVTK_EXPORT\r
-#else\r
-#define QVTK_EXPORT\r
+\r
+#ifndef QVTK_EXPORT\r
+#  define QVTK_EXPORT\r
 #endif\r
 \r
 //! QVTKWidget displays a VTK window in a Qt window.\r
-class QVTK_EXPORT QVTKWidget : public QWidget\r
+class QVTKWidget : public QWidget\r
 {\r
     Q_OBJECT\r
 \r
@@ -261,7 +262,7 @@ class QVTKInteractorInternal;
 // .SECTION Description\r
 // QVTKInteractor is an interactor for a QVTKWiget.\r
 \r
-class QVTK_EXPORT QVTKInteractor : public QObject, public vtkRenderWindowInteractor\r
+class QVTKInteractor : public QObject, public vtkRenderWindowInteractor\r
 {\r
     Q_OBJECT\r
 public:\r

diff --git a/vv/vvDeformationDialog.cxx b/vv/vvDeformationDialog.cxx
index 5dda22d62ebc5cfe281820cf1349a46d42c9a087..364db040e5033606eef91d8296a1b62322b06b2a 100644 (file)
--- a/vv/vvDeformationDialog.cxx
+++ b/vv/vvDeformationDialog.cxx
@@ -87,12 +87,12 @@ void vvDeformationDialog::resetSlider(int slicer_index)
 void vvDeformationDialog::computeDeformationField() {
     vvImage::Pointer sequence=mSlicerManagers[inputSequenceBox->currentIndex()]->GetSlicer(0)->GetImage();
     vtkImageData * first_image = sequence->GetVTKImages()[0];
-    if (not sequence->IsTimeSequence())
+    if (!sequence->IsTimeSequence())
     {
         this->setResult(QDialog::Rejected);
         QMessageBox::warning(this,tr("Image type error"), tr("Deformable image registration only makes sense on time sequences."));
     }
-    else if ((first_image->GetSpacing()[0] != first_image->GetSpacing()[1]) or (first_image->GetSpacing()[0] != first_image->GetSpacing()[2]))
+    else if ((first_image->GetSpacing()[0] != first_image->GetSpacing()[1]) || (first_image->GetSpacing()[0] != first_image->GetSpacing()[2]))
     {
         this->setResult(QDialog::Rejected);
         QMessageBox::warning(this,tr("Image type error"), tr("Deformable registration only works well with isotropic voxels. Please resample the image."));
@@ -123,7 +123,7 @@ void vvDeformationDialog::computeDeformationField() {
         registrator.start();
         while (!registrator.isFinished())
         {
-            if (progress.wasCanceled() and not aborted)
+            if (progress.wasCanceled() && !aborted)
             {
                 this->setResult(QDialog::Rejected);
                 registrator.abort();
@@ -136,7 +136,7 @@ void vvDeformationDialog::computeDeformationField() {
             qApp->processEvents();
             registrator.wait(50);
         }
-        if (not aborted)
+        if (!aborted)
         {
             mOutput=registrator.getOutput();
         }

diff --git a/vv/vvIntensityValueSlider.h b/vv/vvIntensityValueSlider.h
index 831d29b37c7c91334cf146563c87561b820fd682..4050de4ded33ef7dadcb06cfbf6a7b2307822376 100644 (file)
--- a/vv/vvIntensityValueSlider.h
+++ b/vv/vvIntensityValueSlider.h
@@ -3,8 +3,8 @@
   Program:   vv
   Module:    $RCSfile: vvIntensityValueSlider.h,v $
   Language:  C++
-  Date:      $Date: 2010/01/29 13:54:37 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2010/02/05 09:06:46 $
+  Version:   $Revision: 1.2 $
   Author :   David Sarrut (david.sarrut@creatis.insa-lyon.fr)
 
   Copyright (C) 2008
@@ -37,7 +37,7 @@
 #include "vtkImageData.h"
 
 //------------------------------------------------------------------------------
-class QDESIGNER_WIDGET_EXPORT vvIntensityValueSlider: 
+class vvIntensityValueSlider:
   public QWidget, private Ui::vvIntensityValueSlider {
   Q_OBJECT
     public:

diff --git a/vv/vvLandmarksPanel.cxx b/vv/vvLandmarksPanel.cxx
index f9e3c8cdc5f29ebc97537b58fe14d2900bf36c64..17c30eabf5190c61c45e2b801ec92d3b9e6421b1 100644 (file)
--- a/vv/vvLandmarksPanel.cxx
+++ b/vv/vvLandmarksPanel.cxx
@@ -94,33 +94,33 @@ void vvLandmarksPanel::AddPoint(int landmarksIndex)
     tableWidget->setRowCount(rowIndex+1);
     tableWidget->setRowHeight(rowIndex,20);
     QTableWidgetItem* iItem = new QTableWidgetItem(QString::number(landmarksIndex));
-    iItem->setFlags(!Qt::ItemIsEditable);
+    iItem->setFlags(Qt::NoItemFlags);
     tableWidget->setItem(rowIndex,0,iItem);
 
     QTableWidgetItem* xItem = new QTableWidgetItem(
         QString::number(mCurrentLandmarks->GetCoordinates(landmarksIndex)[0],'f',1));
-    xItem->setFlags(!Qt::ItemIsEditable);
+    xItem->setFlags(Qt::NoItemFlags);
     tableWidget->setItem(rowIndex,1,xItem);
 
     QTableWidgetItem* yItem = new QTableWidgetItem(
         QString::number(mCurrentLandmarks->GetCoordinates(landmarksIndex)[1],'f',1));
-    yItem->setFlags(!Qt::ItemIsEditable);
+    yItem->setFlags(Qt::NoItemFlags);
     tableWidget->setItem(rowIndex,2,yItem);
 
     QTableWidgetItem* zItem = new QTableWidgetItem(
         QString::number(mCurrentLandmarks->GetCoordinates(landmarksIndex)[2],'f',1));
-    zItem->setFlags(!Qt::ItemIsEditable);
+    zItem->setFlags(Qt::NoItemFlags);
     tableWidget->setItem(rowIndex,3,zItem);
 
     QTableWidgetItem* tItem = new QTableWidgetItem(
         QString::number(mCurrentLandmarks->GetCoordinates(landmarksIndex)[3],'f',1));
-    tItem->setFlags(!Qt::ItemIsEditable);
+    tItem->setFlags(Qt::NoItemFlags);
     tableWidget->setItem(rowIndex,4,tItem);
 
 
     QTableWidgetItem* vItem = new QTableWidgetItem(
         QString::number(mCurrentLandmarks->GetPixelValue(landmarksIndex),'f',1));
-    vItem->setFlags(!Qt::ItemIsEditable);
+    vItem->setFlags(Qt::NoItemFlags);
     tableWidget->setItem(rowIndex,5,vItem);
 
     tableWidget->setItem(rowIndex,6, new QTableWidgetItem(mCurrentLandmarks->GetComments(landmarksIndex).c_str()));

diff --git a/vv/vvMainWindow.cxx b/vv/vvMainWindow.cxx
index 30005ac931e0d7927e0fda5e39022155c0c1b453..dab9aaf39ed7cdb442e81457b37c5864e2a3977a 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/05 09:06:46 $
+  Version:   $Revision: 1.6 $
   Author :   Pierre Seroul (pierre.seroul@gmail.com)
 
   Copyright (C) 200COLUMN_IMAGE_NAME
@@ -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++)
     {
@@ -2603,7 +2603,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);

diff --git a/vv/vvMesh.cxx b/vv/vvMesh.cxx
index 4ca03ccab200f9b816686f73877ce88f8c55cde4..8f6e78cf02740f2e854272ffa56b46b8ed200796 100644 (file)
--- a/vv/vvMesh.cxx
+++ b/vv/vvMesh.cxx
@@ -209,9 +209,9 @@ void vvMesh::propagateContour(vvImage::Pointer vf)
             int iy=(old[1]-Oy)/Sy;
             int iz=(old[2]-Oz)/Sz;
             float* vector=vector_data+(ix+iy*vf->GetSize()[0]+iz*vf->GetSize()[0]*vf->GetSize()[1])*3;
-            if (ix>=0 and ix < dims[0]
-                    and iy>=0 and iy < dims[1]
-                    and iz>=0 and iz < dims[2])
+            if (ix>=0 && ix < dims[0]
+                    && iy>=0 && iy < dims[1]
+                    && iz>=0 && iz < dims[2])
                 new_mesh->GetPoints()->SetPoint(j,old[0]+vector[0],old[1]+vector[1],old[2]+vector[2]);
         }
         this->AddMesh(new_mesh);

diff --git a/vv/vvMeshActor.cxx b/vv/vvMeshActor.cxx
index 80074b6efd795debad6a0a7724e93ef05fbfcd0b..b946f380a03c9d1a97a2600b5831926cea80e8cd 100644 (file)
--- a/vv/vvMeshActor.cxx
+++ b/vv/vvMeshActor.cxx
@@ -119,7 +119,7 @@ void vvMeshActor::ToggleSuperposition()
 {
     DD("Warning: superposition not implemented");
   // std::cout << "vvMeshActor::ToggleSuperposition size = " << mMeshes.size() << std::endl;
-    if (not mSuperpostionMode and mMesh->GetNumberOfMeshes() > 1)
+    if (! mSuperpostionMode && mMesh->GetNumberOfMeshes() > 1)
     {
         mSuperpostionMode=true;
     }

diff --git a/vv/vvMeshReader.cxx b/vv/vvMeshReader.cxx
index 7bae8117ca6b33816139a57e4714f5f54a83a081..ead558a19d018d8b74166288e398aeb2be1ce816 100644 (file)
--- a/vv/vvMeshReader.cxx
+++ b/vv/vvMeshReader.cxx
@@ -49,7 +49,7 @@ vvMeshReader::vvMeshReader() :
 void vvMeshReader::Update()
 {
     //Show a progress bar only when opening a DC-struct (ie. multiple contours)
-    vvProgressDialog progress("Opening " + filename,(not vtk_mode) and (selected_contours.size()>1));
+    vvProgressDialog progress("Opening " + filename,(!vtk_mode) && (selected_contours.size()>1));
     this->start();
     while (this->isRunning())
     {

diff --git a/vv/vvMidPosition.cxx b/vv/vvMidPosition.cxx
index dc15478c3a1b05edc22815341b63e28de51d17de..3e4ca3d30f906046794bc67463eb5ad5a1f6db1d 100644 (file)
--- a/vv/vvMidPosition.cxx
+++ b/vv/vvMidPosition.cxx
@@ -69,7 +69,7 @@ void vvMidPosition::run()
     error=true;
     if(slicer_manager->GetImage()->GetNumberOfDimensions() != 4)
         error_message="Computation of midposition is only supported for 4D image sequences.";
-    else if (not slicer_manager->GetVF())
+    else if (!slicer_manager->GetVF())
         error_message="A VF is required for midposition computation";
     else if (slicer_manager->GetVF()->GetScalarTypeAsString() != "float")
         error_message="Please use a vector field of type float.";

diff --git a/vv/vvResamplerDialog.h b/vv/vvResamplerDialog.h
index e329416fc2880affc2b5fab5c2ddb844c4360ce7..eb6c09fe6ae417007cb02cb0eb43b80173f9e337 100644 (file)
--- a/vv/vvResamplerDialog.h
+++ b/vv/vvResamplerDialog.h
@@ -35,7 +35,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QTreeWidget>
 
 //====================================================================
-class QDESIGNER_WIDGET_EXPORT vvResamplerDialog : public QDialog, private Ui::vvResamplerDialog {
+class vvResamplerDialog :  public QDialog, private Ui::vvResamplerDialog {
 
     Q_OBJECT
 

diff --git a/vv/vvSlicer.cxx b/vv/vvSlicer.cxx
index dfaaccdc97a6485842fe191ddbea43027a17c806..93ce4182d9f92f84534473c59f3280e3b581c264 100644 (file)
--- a/vv/vvSlicer.cxx
+++ b/vv/vvSlicer.cxx
@@ -828,7 +828,7 @@ void vvSlicer::ClipDisplayedExtent(int extent[6], int refExtent[6])
     for (int i = 0; i < maxBound; i = i+2)
     {
         //if we are totally outside the image
-        if ( extent[i] > refExtent[i+1] or extent[i+1] < refExtent[i] )
+        if ( extent[i] > refExtent[i+1] || extent[i+1] < refExtent[i] )
         {
             out = true;
             break;
@@ -975,8 +975,7 @@ void vvSlicer::FlipVerticalView()
 
 void vvSlicer::Render()
 {
-    if (this->GetWindowLevel()->GetLookupTable() and not this->mOverlay and not
-            this->mFusion)
+    if (this->GetWindowLevel()->GetLookupTable() && !this->mOverlay && !this->mFusion)
     {
         legend->SetLookupTable(this->GetWindowLevel()->GetLookupTable());
         legend->SetVisibility(1);

diff --git a/vv/vvSlicerManager.cxx b/vv/vvSlicerManager.cxx
index 3f096644d374fa3ed04612f3fb8aa325e6b51ad9..7618bf2ceb7825ae70be3b560d2af2e76acc586b 100644 (file)
--- a/vv/vvSlicerManager.cxx
+++ b/vv/vvSlicerManager.cxx
@@ -401,7 +401,7 @@ void vvSlicerManager::SetPreviousTSlice(int originating_slicer)
 
 void vvSlicerManager::ToggleInterpolation()
 {
-    bool interpolate=not (mSlicers[0]->GetImageActor()->GetInterpolate());
+    bool interpolate=!(mSlicers[0]->GetImageActor()->GetInterpolate());
     for ( unsigned int i = 0; i < mSlicers.size(); i++)
     {
         mSlicers[i]->GetImageActor()->SetInterpolate(interpolate);

diff --git a/vv/vvSlicerManagerCommand.cxx b/vv/vvSlicerManagerCommand.cxx
index 017c7afb02ef91a4a22e9cbec4d47b575694cffb..f635e383103e5756e48edced8c61cf2f71818f94 100644 (file)
--- a/vv/vvSlicerManagerCommand.cxx
+++ b/vv/vvSlicerManagerCommand.cxx
@@ -201,7 +201,7 @@ void vvSlicerManagerCallback::Execute(vtkObject *caller,
                     this->SM->Render();
                     return;
                 }
-                if (KeyPress == "r" or KeyPress=="R")
+                if (KeyPress == "r" || KeyPress=="R")
                 {
                     this->SM->GetSlicer(VisibleInWindow)->ResetCamera();
                     this->SM->GetSlicer(VisibleInWindow)->Render();

diff --git a/vv/vvToolBinarize.h b/vv/vvToolBinarize.h
index 323514b9b1eed1abc3b5841679bdfc038800410e..af85929842123a042f6b13f3cdcfce20849ceba5 100644 (file)
--- a/vv/vvToolBinarize.h
+++ b/vv/vvToolBinarize.h
@@ -3,8 +3,8 @@
   Program:   vv
   Module:    $RCSfile: vvToolBinarize.h,v $
   Language:  C++
-  Date:      $Date: 2010/01/29 13:54:37 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2010/02/05 09:06:46 $
+  Version:   $Revision: 1.2 $
   Author :   David Sarrut (david.sarrut@creatis.insa-lyon.fr)
 
   Copyright (C) 2010
@@ -45,7 +45,7 @@
 #include "vtkRenderer.h"
 
 //------------------------------------------------------------------------------
-class QDESIGNER_WIDGET_EXPORT vvToolBinarize: 
+class vvToolBinarize:
   public QDialog, public vvToolBase<vvToolBinarize>, private Ui::vvToolBinarize 
 {
   Q_OBJECT

diff --git a/vv/vvToolInputSelectorWidget.h b/vv/vvToolInputSelectorWidget.h
index d84673f2b59e479ac26bbfadecfe21f5e34419b9..4940c44dc696b862f2c37a9b0a936d2fabed76f2 100644 (file)
--- a/vv/vvToolInputSelectorWidget.h
+++ b/vv/vvToolInputSelectorWidget.h
@@ -3,8 +3,8 @@
   Program:   vv
   Module:    $RCSfile: vvToolInputSelectorWidget.h,v $
   Language:  C++
-  Date:      $Date: 2010/01/29 13:54:37 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2010/02/05 09:06:46 $
+  Version:   $Revision: 1.2 $
   Author :   David Sarrut (david.sarrut@creatis.insa-lyon.fr)
 
   Copyright (C) 2010
@@ -36,8 +36,7 @@
 class vvSlicerManager;
 
 //------------------------------------------------------------------------------
-class QDESIGNER_WIDGET_EXPORT vvToolInputSelectorWidget:
-  public QWidget, private Ui::vvToolInputSelectorWidget 
+class vvToolInputSelectorWidget: public QWidget, private Ui::vvToolInputSelectorWidget 
 {
   Q_OBJECT
     public: