]> Creatis software - creaImageIO.git/commitdiff
Fixed a problem with the Listener
authorcaballero <caballero>
Tue, 19 May 2009 13:41:38 +0000 (13:41 +0000)
committercaballero <caballero>
Tue, 19 May 2009 13:41:38 +0000 (13:41 +0000)
src2/creaImageIOListener.cpp
src2/creaImageIOWxGimmickView.cpp
src2/creaImageIOWxTreeView.cpp

index d515b31ba402bcb66f2ed4cdc0b3b37c91ffc4ea..9a63c87592dccf809a54fbb3ff92d7c622d1cb94 100644 (file)
@@ -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 ) {}
                        
       }
index fb46be65b1bfefc812697d47c05401272635b375..a97e99abc8c1e51d065fc876025aa650174edd05 100644 (file)
@@ -168,6 +168,7 @@ namespace creaImageIO
        mListener->ConnectObserver(boost::bind( &WxGimmickView::OnDriveMount , this, _1 ) );
        mListener->Create();
        mListener->Run();
+       mListener->Pause();
     
     mConstructed = true;
   }
index cf6f1eb70e93fedc1883c960ae68214183af1215..58ddc631421d889b5a5c0a89466056af3a4007a9 100644 (file)
@@ -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<<itemId<<std::endl;
+         int flag;
+         long itemId=GetCtrl(level)->HitTest(wxPoint(clientpt.x,clientpt.y-8),flag,ptr);
+         tree::Node* node=((ItemData*)GetCtrl(level)->GetItemData(itemId))->node;
+         std::cout<<node->GetLabel()<<std::endl;
     PopupMenu(menuItem, clientpt);
     
   }