allow data anonymization

[creaImageIO.git] / src / creaImageIOWxTreeView.cpp

diff --git a/src/creaImageIOWxTreeView.cpp b/src/creaImageIOWxTreeView.cpp
index 01b8ad41764a4e61d31a77145c9bea44997e91a2..49bba9b711b1bca8139814779bd07010d07f0139 100644 (file)
--- a/src/creaImageIOWxTreeView.cpp
+++ b/src/creaImageIOWxTreeView.cpp
@@ -222,11 +222,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();
@@ -304,17 +304,19 @@ namespace creaImageIO
                                break;
                        long adr = 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();
@@ -819,11 +821,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 +849,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"),
@@ -1254,15 +1256,14 @@ namespace creaImageIO
                          found=true;
                  }
          }
-
          return !found;
   }
  //================================================================
   //================================================================
 
        RemoveAlertDlg::RemoveAlertDlg(wxWindow *parent, 
-                                              wxString title,    
-                                                  const wxSize& size)
+                                       wxString title,    
+                                       const wxSize& size)
  :   wxDialog( parent, 
                  wxID_ANY, 
                  title,
@@ -1276,7 +1277,7 @@ namespace creaImageIO
                //wxTextCtrl *text = new wxTextCtrl(this, wxID_ANY,crea::std2wx(out),wxDefaultPosition, wxSize(500,20));
                wxTextCtrl *text = new wxTextCtrl(this, wxID_ANY,
                                        _T("To reload deleted patient, you should synchronize your database before."),
-                                       wxDefaultPosition, wxSize(500,20));
+                                       wxDefaultPosition, wxSize(650,20));  // 650 vs 500 ? // JPRx
                mcheck = new wxCheckBox(this, 5478, _T("Do not display this warning again!"));
                Connect( mcheck->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED , (wxObjectEventFunction) &RemoveAlertDlg::onCheck ); 
                wxSizer* buttonsSizer = this->CreateSeparatedButtonSizer(wxOK|wxCANCEL);