X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvSlicerManager.cxx;h=c23c1207ba891e4848751ebdac85efa26a228c27;hb=66c0b229be48fdbbe2d42bcb5fa461ab87461ae3;hp=2ed8c2e25c20c7b9332d36d661a902d54ca008a8;hpb=2dab98a87246da49fb09c2529415eefaa4f987e6;p=clitk.git

diff --git a/vv/vvSlicerManager.cxx b/vv/vvSlicerManager.cxx
index 2ed8c2e..c23c120 100644
--- a/vv/vvSlicerManager.cxx
+++ b/vv/vvSlicerManager.cxx
@@ -107,11 +107,20 @@ vvSlicerManager::~vvSlicerManager()
 
 
 //------------------------------------------------------------------------------
-void vvSlicerManager::SetFilename(std::string f)
+void vvSlicerManager::SetFilename(std::string filename, int number)
 {
-  mFileName = f;
+  mFileName = filename;
+  mFileName = vtksys::SystemTools::GetFilenameName(mFileName);
+  mBaseFileName = vtksys::SystemTools::GetFilenameName(vtksys::SystemTools::GetFilenameWithoutLastExtension(mFileName));
+  //  DD(mBaseFileName);
+  mBaseFileNameNumber = number;
+
   for(unsigned int i=0; i<mSlicers.size(); i++) {
-    mSlicers[i]->SetFileName(f);
+    mSlicers[i]->SetFileName(vtksys::SystemTools::GetFilenameWithoutLastExtension(filename));
+  }
+  
+  if (number != 0) {
+    mFileName.append("_"+clitk::toString(number));
   }
 }
 //------------------------------------------------------------------------------
@@ -139,7 +148,6 @@ void vvSlicerManager::ToggleContourSuperposition()
 //----------------------------------------------------------------------------
 bool vvSlicerManager::SetImage(std::string filename, LoadedImageType type, int n)
 {
-  mFileName = filename;
   mType = type;
   if (mReader == NULL)
     mReader = new vvImageReader;
@@ -148,10 +156,11 @@ bool vvSlicerManager::SetImage(std::string filename, LoadedImageType type, int n
   mReader->SetInputFilenames(filenames);
   mReader->Update(type);
 
-  mFileName = vtksys::SystemTools::GetFilenameName(mFileName);
-  mBaseFileName = vtksys::SystemTools::GetFilenameName(vtksys::SystemTools::GetFilenameWithoutLastExtension(mFileName));
+  SetFilename(filename, n);
+  //  mFileName = vtksys::SystemTools::GetFilenameName(mFileName);
+  //mBaseFileName = vtksys::SystemTools::GetFilenameName(vtksys::SystemTools::GetFilenameWithoutLastExtension(mFileName));
   //  DD(mBaseFileName);
-  mBaseFileNameNumber = n;
+  //mBaseFileNameNumber = n;
 
   if (mReader->GetLastError().size() == 0) {
     mImage=mReader->GetOutput();
@@ -164,10 +173,10 @@ bool vvSlicerManager::SetImage(std::string filename, LoadedImageType type, int n
     mLastError = mReader->GetLastError();
     return false;
   }
-  if (n!=0) {
-    //    DD(mFileName);
-    mFileName.append("_"+clitk::toString(n));
-  }
+  // if (n!=0) {
+  //   //    DD(mFileName);
+  //   mFileName.append("_"+clitk::toString(n));
+  // }
   return true;
 }
 //----------------------------------------------------------------------------
@@ -1208,6 +1217,8 @@ void vvSlicerManager::SetColorMap(int colormap)
     if (mSlicers[i]->GetFusion() && mSlicers[i]->GetFusionActor()->GetVisibility()) {
       mSlicers[i]->GetFusionActor()->SetOpacity(double(mFusionOpacity)/100);
       mSlicers[i]->GetFusionMapper()->SetLookupTable(fusLUT);
+      mSlicers[i]->GetFusionMapper()->SetWindow(mFusionWindow);
+      mSlicers[i]->GetFusionMapper()->SetLevel(mFusionLevel);
     }
   }
   if (fusLUT)