Correct Remove actions.

diff --git a/src2/creaImageIODicomImageReader.cpp b/src2/creaImageIODicomImageReader.cpp
index 66c1b008b68410b895b757e515baae66fcf6b200..0dde6ca0638979dab31be9f925054098d1a3a0f1 100644 (file)
--- a/src2/creaImageIODicomImageReader.cpp
+++ b/src2/creaImageIODicomImageReader.cpp
@@ -76,18 +76,22 @@ namespace creaImageIO
   //========================================================================
   std::string irclean(const std::string& str)
   {
-    if (str == "GDCM::Unfound") 
-      {
-       return "";
-      }
-    if (str[str.size()-1]==' ')
-      {
-       return str.substr(0,str.size()-1);
-      }
-    if (str[str.size()-1]==0)
-      {
-       return str.substr(0,str.size()-1);
-      }
+         if(str.size() > 0)
+         {
+               if (str == "GDCM::Unfound") 
+                 {
+               return "";
+                 }
+               if (str[str.size()-1]==' ')
+                 {
+               return str.substr(0,str.size()-1);
+                 }
+               if (str[str.size()-1]==0)
+                 {
+               return str.substr(0,str.size()-1);
+                 }
+         }
+    
     return str;
   }
   //========================================================================

diff --git a/src2/creaImageIOSQLiteTreeHandler.cpp b/src2/creaImageIOSQLiteTreeHandler.cpp
index 7f63e39bc80f579ecec330ed000e7dbf1766f977..f3d5cbb8526bc0ab0d2554042bd90a38ef1759b5 100644 (file)
--- a/src2/creaImageIOSQLiteTreeHandler.cpp
+++ b/src2/creaImageIOSQLiteTreeHandler.cpp
@@ -801,7 +801,9 @@ namespace creaImageIO
        
     std::string query = "DELETE FROM ";
    
-    query += GetTree().GetLevelDescriptor(node->GetLevel()).GetName();
+
+       query += GetTree().GetLevelDescriptor(node->GetLevel()).GetName();
+       
     query += " WHERE ID='"+ node->GetAttribute("ID") + "';";
  
     UPDATEDB(query);

diff --git a/src2/creaImageIOTreeNode.cpp b/src2/creaImageIOTreeNode.cpp
index e14bc8450b8fe6dd5514f5283e921e4f679c6a5b..c78973b55b10fa50610a1d5de598bf7d5a817d2b 100644 (file)
--- a/src2/creaImageIOTreeNode.cpp
+++ b/src2/creaImageIOTreeNode.cpp
@@ -17,6 +17,7 @@ namespace creaImageIO
       : mParent(parent),//mData(0),
        mChildrenLoaded(false)
     {
+       mData.reset();
       if (parent) 
        {
          GimmickDebugMessage(6,"Default Node constructor (level "<<GetLevel()<<")"
@@ -39,6 +40,7 @@ namespace creaImageIO
      : mParent(parent),//mData(0),
        mChildrenLoaded(false)
     {
+       mData.reset();
       GimmickDebugMessage(6,"Node constructor (level "<<GetLevel()<<")"
                     << std::endl);
 
@@ -78,7 +80,7 @@ namespace creaImageIO
        {
          delete *i;
        }
-
+       mData.reset();
     }
     //=============================================================
 

diff --git a/src2/creaImageIOTreeNode.h b/src2/creaImageIOTreeNode.h
index 5b221de611009e0ef07009df3e944730d1fde3d1..2905c1a8a0e2784d201da383fe54c2697919afd7 100644 (file)
--- a/src2/creaImageIOTreeNode.h
+++ b/src2/creaImageIOTreeNode.h
@@ -60,6 +60,7 @@ namespace creaImageIO
       /// Returns the level of the node in the tree
       virtual int GetLevel() const { return mParent->GetLevel()+1; }
 
+        
       /// Returns the parent of the node
       Node* GetParent() const { return mParent; }
 
@@ -117,7 +118,7 @@ namespace creaImageIO
       { if (mData!=0) return dynamic_cast<T>(mData); return 0; }
 
       /// Sets the node data. Deletes existing data if any.
-         void SetData(boost::shared_ptr<NodeData> d) { mData = d; }//{ if (mData) delete mData; mData = d; }
+         void SetData(boost::shared_ptr<NodeData> d) {mData.reset(); mData = d; }//{ if (mData) delete mData; mData = d; }
 
       /// Sorts the children of the node 
       void SortChildren(const LexicographicalComparator&);

diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp
index ddf43617e16dad7484f5f54dfbba364caf1d3cbb..d961fcaed852ca5047dda541f7ac29a40fc66735 100644 (file)
--- a/src2/creaImageIOWxGimmickView.cpp
+++ b/src2/creaImageIOWxGimmickView.cpp
@@ -30,9 +30,11 @@ using namespace crea;
 #if defined(BUILD_BRUKER)
        #include "bruker2dicom.h"
 #endif
+
 #ifdef _DEBUG
 #define new DEBUG_NEW
 #endif
+
 namespace creaImageIO
 {
    
@@ -694,7 +696,7 @@ namespace creaImageIO
   void WxGimmickView::AddIgnoreFile(tree::Node* toRemove)
   {
      mGimmick->RemoveFile(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),toRemove);
-     GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->UpdateLevel(1);
+   //  GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->UpdateLevel(1);
   }
 
   //=================================================

diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp
index 8e350cc73eda33ec0154c647b39fb2fff2417579..b583a7c0775f48d08515030467e4b3efb97ea8ce 100644 (file)
--- a/src2/creaImageIOWxTreeView.cpp
+++ b/src2/creaImageIOWxTreeView.cpp
@@ -380,9 +380,9 @@ namespace creaImageIO
                          {
                            needRefresh=true;
                          }
-                         tree::Node* n= (tree::Node*)(*i);
+                         //tree::Node* n = new (tree::Node*)(*i);
                          GetTreeHandler()->LoadChildren((*i),4);
-                         GetGimmickView()->AddIgnoreFile(n);
+                         GetGimmickView()->AddIgnoreFile(*i);
                          GetTreeHandler()->Remove(*i);
                      }