image unique filename bug correction

diff --git a/vv/vvSlicerManager.cxx b/vv/vvSlicerManager.cxx
index 2ed8c2e25c20c7b9332d36d661a902d54ca008a8..7f68a72741c0d2eb9a396d9c00585a6dce7b1b7f 100644 (file)
--- 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;
 }
 //----------------------------------------------------------------------------

diff --git a/vv/vvSlicerManager.h b/vv/vvSlicerManager.h
index afefa807c26873532bbb93f403168b64cdc220b7..5bbc3c7343f239c5eef45e7e7fdd1a99f204a7dc 100644 (file)
--- a/vv/vvSlicerManager.h
+++ b/vv/vvSlicerManager.h
@@ -99,7 +99,7 @@ class vvSlicerManager : public QObject {
     else return -1;
   }
 
-  void SetFilename(std::string f);
+  void SetFilename(std::string f, int number=0);
 
   void SetTSlice(int slice);
   void SetNextTSlice(int originating_slicer);