X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxTreeView.cpp;h=3c1f3081a9fc0c287a6cf284f32c9fb863c423de;hb=52f3d800d1bfa583dbdf0115860cc183ca9319cd;hp=db67f8bcc07f7b2ee1afddffb5366f65a0de0f6d;hpb=9f388912ec5438d32d4da941152eaae550f796ed;p=creaImageIO.git

diff --git a/src/creaImageIOWxTreeView.cpp b/src/creaImageIOWxTreeView.cpp
index db67f8b..3c1f308 100644
--- a/src/creaImageIOWxTreeView.cpp
+++ b/src/creaImageIOWxTreeView.cpp
@@ -1,6 +1,33 @@
+/*
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and 
+#  abiding by the rules of distribution of free software. You can  use, 
+#  modify and/ or redistribute the software under the terms of the CeCILL-B 
+#  license as circulated by CEA, CNRS and INRIA at the following URL 
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability. 
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------
+*/
+
 #include <creaImageIOWxTreeView.h>
 #include <creaImageIOGimmickView.h>
-#include <creaImageIOSystem.h>
+
 #include <wx/splitter.h>
 #include <wx/gdicmn.h>
 #include <boost/date_time/gregorian/gregorian.hpp>
@@ -222,11 +249,11 @@ namespace creaImageIO
 	wxMenuItem* m4Item=menuItem->Append(wxID_ANY, _T("&Display Dicom Tags"));
 	menuItem->AppendSubMenu(subExportMenu, wxT("&Export"));
 
-#if defined(USE_GDCM_ANOM)
+
 	wxMenuItem* m1Item=menuItem->Append(wxID_ANY, _T("&Anonymize"));
 	mAnonymizingID=m1Item->GetId();
-	Connect( mAnonymizingID, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(WxTreeView::OnAnonymize) );
-#endif
+	Connect( mAnonymizingID, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(WxTreeView::OnAnonymizer) );
+
 	mLocalCopyID=m2Item->GetId();
 	mEditFieldID=m3Item->GetId();
 	mDumpID=m4Item->GetId();
@@ -302,19 +329,21 @@ namespace creaImageIO
 										 wxLIST_STATE_SELECTED);
 			if ( item == -1 )
 				break;
-			long adr = GetCtrl(l-1)->GetItemData(item);
+			long adr = (long)GetCtrl(l-1)->GetItemData(item);
 			tree::Node* n = ((ItemData*)adr)->node;
-			if(mLastSelected==item)
+			/* FCY 18-04-2011: don't understand the real purpose of these lines,
+			 if uncomment add last frame in first place 
+				if(mLastSelected==item)
 			{
 				std::vector<tree::Node*>::iterator it;
 				it = sel.begin();
 				it = sel.insert ( it , n );
 			}
 			else
-			{
+			{*/
 				
 				sel.push_back(n);
-			}			
+			//}			
 			
 		}
 		/*int n = GetCtrl(l-1)->GetItemCount();
@@ -760,7 +789,7 @@ namespace creaImageIO
 	if ( it == -1 )
 	  break;
 	
-	long adr = GetCtrl(level)->GetItemData(it);
+	long adr = (long)GetCtrl(level)->GetItemData(it);
 	tree::Node* nod = ((ItemData*)adr)->node;
 	att=(*nod).GetAttribute(mLevelList[level].key[mColumnSelected]);
 	
@@ -819,11 +848,11 @@ namespace creaImageIO
 	   wxBusyCursor busy;
 	   std::vector<std::string> filesname;
 	   std::vector<tree::Node*> nodes;
-//	   nodes.push_back(((ItemData*)GetCtrl(mLastRightLevel)->GetItemData(mLastRightSelected))->node);
+	   nodes.push_back(((ItemData*)GetCtrl(mLastRightLevel)->GetItemData(mLastRightSelected))->node);
   	   if(nodes.size() != 0)
 	   {
 		   GetFilenamesAsString(nodes,filesname);
-		//   GetGimmickView()->Anonymize(filesname,0);
+		   GetGimmickView()->Anonymize(filesname,0);
 	   }
 	
   }
@@ -847,11 +876,11 @@ namespace creaImageIO
 	    if(sel.size()>1&&levelName.at(levelName.size()-1)!='s')
 	      {
 		out<<" "<<levelName;
-		out<<"s to .gimmick?";
+		out<<"s to .creaImageIO?";
 	      }
 	    else
 	      {
-		out<<" "<<GetTreeHandler()->GetTree().GetLevelDescriptor(mLastLevel).GetName()<<" to .gimmick?";
+		out<<" "<<GetTreeHandler()->GetTree().GetLevelDescriptor(mLastLevel).GetName()<<" to .creaImageIO?";
 	      }
 	    if (wxMessageBox(crea::std2wx(out.str()),
 			     _T("Remove Files"),
@@ -1071,7 +1100,7 @@ namespace creaImageIO
     GimmickDebugMessage(7,
 			"WxTreeView::ValidateSelectedImages" 
 			<<std::endl);
-    const std::vector<tree::Node*>& sel(GetSelected(mLevelList.size()+1));
+    const std::vector<tree::Node*>& sel(GetSelected((int)mLevelList.size()+1));
     GetGimmickView()->OnSelectionChange(sel,
 					isSelection,(mLastSelected-1),
 					!mIgnoreSelectedChanged);
@@ -1084,9 +1113,9 @@ namespace creaImageIO
   void WxTreeView::GetNodes(std::vector<tree::Node*>& nodes, bool direction)
   {
 	long item = mLastSelected;
-	int level=mLevelList.size()-1;
+	int level=(int)mLevelList.size()-1;
 	//Gets current item data
-	long adr = GetCtrl(level)->GetItemData(item);
+	long adr = (long)GetCtrl(level)->GetItemData(item);
 	//Extracts the node
 	tree::Node* nod = ((ItemData*)adr)->node;
     for ( ;; )
@@ -1108,7 +1137,7 @@ namespace creaImageIO
 		if(GetCtrl(level)->GetItemState(item, wxLIST_STATE_SELECTED)==0 )
 		{
 
-			adr = GetCtrl(level)->GetItemData(item);
+			adr = (long)GetCtrl(level)->GetItemData(item);
 			nod = ((ItemData*)adr)->node;
 			nodes.push_back(nod);
 		}
@@ -1134,7 +1163,7 @@ namespace creaImageIO
   // Should be in another place : not specific !
   void WxTreeView::GetSelectedAsString(std::vector<std::string>&s)
   {
-    int level=mLevelList.size();
+    int level= (int)mLevelList.size();
     const std::vector<tree::Node*>& sel=GetSelected(level+1);
     std::vector<tree::Node*>::const_iterator i;