From: Romulo Pinho <pinho@lyon.fnclcc.fr>
Date: Thu, 26 May 2011 13:28:19 +0000 (+0200)
Subject: Merge branch 'master' of /home/dsarrut/clitk3.server
X-Git-Tag: v1.3.0~340
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;ds=inline;h=ec961a7ab6c69087e6059d5ef6e8c02806a8f93f;hp=-c;p=clitk.git

Merge branch 'master' of /home/dsarrut/clitk3.server
---

ec961a7ab6c69087e6059d5ef6e8c02806a8f93f
diff --combined vv/vvMainWindow.cxx
index 44b74fe,164f7d7..43dcff1
--- a/vv/vvMainWindow.cxx
+++ b/vv/vvMainWindow.cxx
@@@ -1103,7 -1103,9 +1103,7 @@@ void vvMainWindow::ImageInfoChanged(
      infoPanel->setOrigin(GetVectorDoubleAsString(origin));
      infoPanel->setSpacing(GetVectorDoubleAsString(inputSpacing));
      infoPanel->setNPixel(QString::number(NPixel)+" ("+inputSizeInBytes+")");
 -    std::cout << "Will get transform " << std::endl;
      transformation = imageSelected->GetTransform()->GetMatrix();
 -    std::cout << "Got transform " << std::endl;
      infoPanel->setTransformation(Get4x4MatrixDoubleAsString(transformation));
  
      landmarksPanel->SetCurrentLandmarks(mSlicerManagers[index]->GetLandmarks(),
@@@ -1579,15 -1581,18 +1579,18 @@@ void vvMainWindow::ReloadImage(QTreeWid
    int index = GetSlicerIndexFromItem(item);
    QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
    QString role=item->data(1,Qt::UserRole).toString();
-   if ( role == "vector")
+   if ( role == "vector"){
      mSlicerManagers[index]->ReloadVF();
-   else if (role == "overlay")
+   }
+   else if (role == "overlay"){
      mSlicerManagers[index]->ReloadOverlay();
-   else if (role == "fusion")
+   }
+   else if (role == "fusion"){
      mSlicerManagers[index]->ReloadFusion();
-   else
+   }
+   else{
      mSlicerManagers[index]->Reload();
- 
+   }
    // Update view and info
    ImageInfoChanged();
    mSlicerManagers[index]->Render();