+#include <creaImageIOPACSConnection.h>
+#include <creaImageIOWxPACSConnectionPanel.h>
#include <creaImageIOWxGimmickView.h>
#include <creaImageIOWxTreeView.h>
#include <creaImageIOSystem.h>
#include <creaImageIOWxListenerPanel.h>
#include <creaImageIOWxEditFieldsPanel.h>
#include <creaImageIOWxAttributeSelectionPanel.h>
-#include <creaImageIOWxPACSConnectionPanel.h>
#include <creaImageIOWxDescriptorPanel.h>
using namespace crea;
#if defined(BUILD_BRUKER)
#include "bruker2dicom.h"
#endif
-
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
namespace creaImageIO
{
TOOL_SETTINGS_ID = 7,
TOOL_TOOLS_ID = 8,
TOOL_CREATEDB_ID = 9,
+ TOOL_PACS_ID = 10
};
//======================================================================
//======================================================================
// CTor
- WxGimmickView::WxGimmickView(Gimmick* gimmick,
+ WxGimmickView::WxGimmickView(boost::shared_ptr<Gimmick> gimmick,
wxWindow *parent,
const wxWindowID id,
const wxPoint& pos,
// 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);
mViewer->StopPlayer();
GimmickDebugMessage(1,"WxGimmickView::~WxGimmickView"
<<std::endl);
+ delete mIcon;
if(mListener->IsAlive())
{
mListener->Delete();
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();
"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);
"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--;
"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--;
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);
}
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();
std::string inputDir = crea::wx2std(gimmickTools->getInputDir());
std::string outputDir = crea::wx2std(gimmickTools->getOutputDir());
- bool addToDB = gimmickTools->getCheckBoxValue();
+ bool addToDB = gimmickTools->getAddToDBCheckBoxValue();
if (inputDir.compare("")!=0 && outputDir.compare("")!=0)
{
//////////////////////////////////////////////////
void WxGimmickView::OnCreateDB(wxCommandEvent& event)
{
+ // PACSConnection("");
WxDescriptorPanel * DescriptorPan = new WxDescriptorPanel(this, mGimmick->GetHomeDirectory());
DescriptorPan->Layout();
if ( DescriptorPan->ShowModal() == ID_DSCP_APPLY)