X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOGimmickView.h;h=6fca80290652d87ee96c74b3a55f86aeb6702254;hb=refs%2Ftags%2FEED.02Oct2009;hp=9230ba38f10fece6a08cb9b70207fc00c46ce5bd;hpb=96ca5a0d7b7ccd6b4291160c19afd48e3207db2a;p=creaImageIO.git diff --git a/src2/creaImageIOGimmickView.h b/src2/creaImageIOGimmickView.h index 9230ba3..6fca802 100644 --- a/src2/creaImageIOGimmickView.h +++ b/src2/creaImageIOGimmickView.h @@ -103,7 +103,8 @@ namespace creaImageIO void ReadImagesNotThreaded(std::vector& s,std::vector files, int dim); ///Requests the reading of an image with priority and index in the /// current selection (-1 if not in selection) - void RequestReading(tree::Node* n, int prio, int selection_index , ImagePointerHolder *p); + //void RequestReading(tree::Node* n, int prio, int selection_index , ImagePointerHolder *p); + void RequestReading(tree::Node* n, int prio, int selection_index , boost::shared_ptr p); ///Obtains the message of the state @@ -157,7 +158,7 @@ namespace creaImageIO private: /// Controller which manages the interaction with the model - Gimmick* mGimmick; + boost::shared_ptr< Gimmick> mGimmick; /// The views TreeViewMapType mTreeViewMap; /// The message that results from the validation @@ -171,15 +172,15 @@ namespace creaImageIO struct ImageEventType { ImageEventType( tree::Node* no = 0, - int sel_index = -1, - ImagePointerHolder* ph= 0) - : node(no), index(sel_index), pointerHolder(ph){} + int sel_index = -1) +// ImagePointerHolder* ph= 0) +: node(no), index(sel_index){}//, pointerHolder(ph){} ImageEventType(vtkImageData* im ) : image(im) {} tree::Node* node; vtkImageData* image; int index; - ImagePointerHolder* pointerHolder; + boost::shared_ptr pointerHolder; }; typedef std::map ImageEventTypeMap; /// Map of images' names to ImageEventType