X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxGimmickView.cpp;h=bc12bf4694b22acd6110a7723746ee31b7ee5d90;hb=7ca5b25a73bb296c395c810af83332d8af1eed1c;hp=63e393af5a903cf56e9957139222386dbab610c7;hpb=93692028fda538964e7ce2216e08b04d600b7a5e;p=creaImageIO.git

diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp
index 63e393a..bc12bf4 100644
--- a/src2/creaImageIOWxGimmickView.cpp
+++ b/src2/creaImageIOWxGimmickView.cpp
@@ -1,3 +1,5 @@
+#include <creaImageIOPACSConnection.h>
+#include <creaImageIOWxPACSConnectionPanel.h>
 #include <creaImageIOWxGimmickView.h>
 #include <creaImageIOWxTreeView.h>
 #include <creaImageIOSystem.h>
@@ -5,7 +7,6 @@
 #include <creaImageIOWxListenerPanel.h>
 #include <creaImageIOWxEditFieldsPanel.h>
 #include <creaImageIOWxAttributeSelectionPanel.h>
-#include <creaImageIOWxPACSConnectionPanel.h>
 #include <creaImageIOWxDescriptorPanel.h>
 
 using namespace crea;
@@ -29,7 +30,9 @@ using namespace crea;
 #if defined(BUILD_BRUKER)
 	#include "bruker2dicom.h"
 #endif
-
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
 namespace creaImageIO
 {
    
@@ -46,6 +49,7 @@ namespace creaImageIO
         TOOL_SETTINGS_ID    = 7,
         TOOL_TOOLS_ID       = 8,
         TOOL_CREATEDB_ID    = 9,
+		TOOL_PACS_ID			= 10
     };
   //======================================================================
 
@@ -142,9 +146,11 @@ namespace creaImageIO
     
     // Previewer
     mViewer = new WxViewer(mBottomPanel, wxID_ANY, wxT("Gimmick! Viewer"),wxDefaultPosition, wxDefaultSize );
-    pointers.push_back(new ImagePointerHolder(GetDefaultImage()));
-    mViewer->SetImageVector(pointers);
-    mViewer->StartPlayer();
+	//pointers.push_back(new ImagePointerHolder(GetDefaultImage())
+	pointers.push_back(boost::shared_ptr<creaImageIO::ImagePointerHolder>(new ImagePointerHolder(GetDefaultImage())));
+
+	mViewer->SetImageVector(pointers);
+	mViewer->StartPlayer();
 
 
     bottom_sizer->Add(mViewer,1,wxGROW,1);
@@ -251,7 +257,13 @@ namespace creaImageIO
 				      mIcon->GetBitmap(Icon_create_database),
 				      _T("Create DB from an Attributes Descriptor file")
 				      );
-
+#if defined(BUILD_PACS)
+	mToolAddFile = mToolBar->AddTool( TOOL_PACS_ID, 
+				      _T("PACS Connection,"),
+				      mIcon->GetBitmap(Icon_create_database),
+				      _T("Echo, Find and Get to a PACS")
+				      );
+#endif
     //const wxBitmap& bitmap1, const wxString& shortHelpString = "", wxItemKind kind = wxITEM_NORMAL)
 
     mToolBar->Realize();
@@ -573,7 +585,8 @@ namespace creaImageIO
 			   "Requesting image from selected "
 			   <<(*selected)->GetAttribute("FullFileName")
 			   <<std::endl);
-	   ImagePointerHolder* ph=new ImagePointerHolder(GetDefaultImage());
+	   //ImagePointerHolder* ph=new ImagePointerHolder(GetDefaultImage());
+	   boost::shared_ptr<ImagePointerHolder> ph(new ImagePointerHolder(GetDefaultImage()));
 	   pointers.push_back(ph);
        RequestReading(*selected,prio,index,ph);
        //       AddEntryToMap(*selected);
@@ -592,7 +605,8 @@ namespace creaImageIO
 				"Requesting image from neighbors up "
 				<<(*iterUp)->GetAttribute("FullFileName")
 				<<std::endl);
-		ImagePointerHolder* ph=new ImagePointerHolder(GetDefaultImage());
+//		ImagePointerHolder* ph=new ImagePointerHolder(GetDefaultImage());
+		boost::shared_ptr<ImagePointerHolder> ph(new ImagePointerHolder(GetDefaultImage()));
 		RequestReading(*iterUp,prio,-1,ph);
 		//		AddEntryToMap(*iterUp);
 		prio--;
@@ -610,7 +624,8 @@ namespace creaImageIO
 				"Requesting image from neighbors down "
 				<<(*iterDown)->GetAttribute("FullFileName")
 				<<std::endl);
-		ImagePointerHolder* ph=new ImagePointerHolder(GetDefaultImage());
+		//ImagePointerHolder* ph=new ImagePointerHolder(GetDefaultImage());
+		boost::shared_ptr<ImagePointerHolder> ph(new ImagePointerHolder(GetDefaultImage()));
 		RequestReading(*iterDown,prio,-1,ph);
 		//		AddEntryToMap(*iterDown);
 		prio--;
@@ -620,7 +635,8 @@ namespace creaImageIO
    else
    {
 	   pointers.clear();
-	   ImagePointerHolder* ph=new ImagePointerHolder(GetDefaultImage());
+	   //ImagePointerHolder* ph=new ImagePointerHolder(GetDefaultImage());
+	   boost::shared_ptr<ImagePointerHolder> ph(new ImagePointerHolder(GetDefaultImage()));
 	   pointers.push_back(ph);
 	   mViewer->SetImageVector(pointers);
    }
@@ -653,7 +669,8 @@ namespace creaImageIO
    void  WxGimmickView::ClearSelection()
    {
 	pointers.clear();
-	pointers.push_back(new ImagePointerHolder(GetDefaultImage()));
+	pointers.push_back(boost::shared_ptr<creaImageIO::ImagePointerHolder>(new ImagePointerHolder(GetDefaultImage())));
+	//pointers.push_back(new ImagePointerHolder(GetDefaultImage()));
 	mViewer->SetImageVector(pointers);
 	mViewer->RefreshIfNecessary();
 	ResetExtent();
@@ -1077,6 +1094,7 @@ namespace creaImageIO
   //////////////////////////////////////////////////
   void WxGimmickView::OnCreateDB(wxCommandEvent& event)
   {
+	//  PACSConnection("");
     	WxDescriptorPanel * DescriptorPan = new WxDescriptorPanel(this, mGimmick->GetHomeDirectory());
 	DescriptorPan->Layout();
 	if ( DescriptorPan->ShowModal() == ID_DSCP_APPLY)