From e88bcb692a9d4bcc2ce1618a27d4fcb275a32a70 Mon Sep 17 00:00:00 2001 From: caballero Date: Tue, 19 May 2009 13:41:38 +0000 Subject: [PATCH] Fixed a problem with the Listener --- src2/creaImageIOListener.cpp | 2 +- src2/creaImageIOWxGimmickView.cpp | 1 + src2/creaImageIOWxTreeView.cpp | 12 ++++++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src2/creaImageIOListener.cpp b/src2/creaImageIOListener.cpp index d515b31..9a63c87 100644 --- a/src2/creaImageIOListener.cpp +++ b/src2/creaImageIOListener.cpp @@ -70,7 +70,7 @@ namespace creaImageIO } clock_t endwait; - endwait = clock () + 0.00000001 * CLOCKS_PER_SEC ; + endwait = clock () + 0.001 * CLOCKS_PER_SEC ; while (clock() < endwait ) {} } diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp index fb46be6..a97e99a 100644 --- a/src2/creaImageIOWxGimmickView.cpp +++ b/src2/creaImageIOWxGimmickView.cpp @@ -168,6 +168,7 @@ namespace creaImageIO mListener->ConnectObserver(boost::bind( &WxGimmickView::OnDriveMount , this, _1 ) ); mListener->Create(); mListener->Run(); + mListener->Pause(); mConstructed = true; } diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp index cf6f1eb..58ddc63 100644 --- a/src2/creaImageIOWxTreeView.cpp +++ b/src2/creaImageIOWxTreeView.cpp @@ -226,7 +226,7 @@ namespace creaImageIO menuItem =new wxMenu; wxMenuItem* m1Item=menuItem->Append(wxID_ANY, _T("&Anonymize")); wxMenuItem* m2Item=menuItem->Append(wxID_ANY, _T("&Local Copy")); - wxMenuItem* m3Item=menuItem->Append(wxID_ANY, _T("&Edit field")); + wxMenuItem* m3Item=menuItem->Append(wxID_ANY, _T("&Edit Fields")); mAnonymizingID=m1Item->GetId(); mLocalCopyID=m2Item->GetId(); @@ -679,6 +679,9 @@ namespace creaImageIO } + //================================================================ + //================================================================ + void WxTreeView::OnItemMenu(wxListEvent &event) { wxPoint clientpt; @@ -691,9 +694,10 @@ namespace creaImageIO if ( GetCtrl(level) == senderCtrl ) break; } long* ptr=0; - int flag=wxLIST_HITTEST_ONITEM; - long itemId=GetCtrl(level)->HitTest(clientpt,flag,ptr); - std::cout<HitTest(wxPoint(clientpt.x,clientpt.y-8),flag,ptr); + tree::Node* node=((ItemData*)GetCtrl(level)->GetItemData(itemId))->node; + std::cout<GetLabel()<