#include <creaImageIOWxEditFieldsPanel.h>
#include <creaImageIOWxAttributeSelectionPanel.h>
#include <creaImageIOWxDescriptorPanel.h>
+#include <creaImageIOWxDumpPanel.h>
using namespace crea;
// Icons
#include "bruker2dicom.h"
#endif
+
+#include <creaImageIOGimmick.h>
#ifdef _DEBUG
#define new DEBUG_NEW
#endif
mCurrentDirectory = std2wx(gimmick->GetHomeDirectory());
// Connect the AddProgress callback
- gimmick->ConnectAddProgressObserver
- ( boost::bind( &WxGimmickView::OnAddProgress , this, _1 ) );
+ gimmick->ConnectAddProgressObserver
+ ( boost::bind( &WxGimmickView::OnAddProgress , this, _1 ) );
// Create the list of icons (mIcon)
CreateIconList();
// Global sizer
- wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
+ msizer = new wxBoxSizer(wxVERTICAL);
// Create the tool bar
CreateToolBar();
- sizer->Add( mToolBar, 0, wxGROW, 0);
+ msizer->Add( mToolBar, 0, wxGROW, 0);
// Split part below toolbar into notebook for views and panel
// for preview, messages...
// Bottom panel
mBottomPanel = new wxPanel(mSplitter,-1);
- wxBoxSizer *bottom_sizer = new wxBoxSizer(wxVERTICAL); //HORIZONTAL);
+ mbottom_sizer = new wxBoxSizer(wxVERTICAL); //HORIZONTAL);
// Previewer
mViewer->StartPlayer();
- bottom_sizer->Add(mViewer,1,wxGROW,1);
+ mbottom_sizer->Add(mViewer,1,wxGROW,1);
// mViewer->Show();
mText = new wxStaticText(mBottomPanel, wxID_ANY, wxT("Welcome to Gimmick!"));
- bottom_sizer->Add(mText,0,wxGROW,0);
+ mbottom_sizer->Add(mText,0,wxGROW,0);
- mBottomPanel->SetSizer(bottom_sizer);
+ mBottomPanel->SetSizer(mbottom_sizer);
// Splitting
int hsize = size.GetHeight();
mSplitter->SplitHorizontally( mNotebook, mBottomPanel,
top_minsize);
- sizer->Add( mSplitter, 1, wxGROW, 0);
+ msizer->Add( mSplitter, 1, wxGROW, 0);
mProgressDialog=0;
- SetSizer( sizer );
+ SetSizer( msizer );
SetAutoLayout(true);
Layout();
- mListener=new Listener();
- mListener->ConnectObserver(boost::bind( &WxGimmickView::OnDriveMount, this, _1 ) );
- mListener->Create();
- mListener->Run();
- mListener->Pause();
+ //mListener=new Listener();
+ //mListener->ConnectObserver(boost::bind( &WxGimmickView::OnDriveMount, this, _1 ) );
+ //mListener->Create();
+ // mListener->Run();
+ // mListener->Pause();
mConstructed = true;
}
GimmickDebugMessage(1,"WxGimmickView::~WxGimmickView"
<<std::endl);
delete mIcon;
- if(mListener->IsAlive())
- {
- mListener->Delete();
- }
+ delete mViewer;
+ //if(mListener->IsAlive()) { mListener->Delete(); }
}
//======================================================================
DisplayAddSummary();
}
mViewer->StartPlayer();
+ delete FD;
}
nb->AddPage( pacs, crea::std2wx("Connect to PACS") );
//Third page: CD/DVD Watch
- WxListenerPanel* cdWatch=new WxListenerPanel(nb,dial, this, mListener->IsPaused());
+ WxListenerPanel* cdWatch=new WxListenerPanel(nb,dial, this,true);//, mListener->IsPaused());
nb->AddPage( cdWatch, crea::std2wx("CD/DVD") );
//Fourth page: Selection of attributes to show
dial->ShowModal();
}
+ //========================================================================
+ void WxGimmickView::DumpTags(std::string i_filename)
+ {
+ WxDumpPanel* pan= new WxDumpPanel (this,i_filename);
+ pan->ShowModal();
+ }
+
//========================================================================
void WxGimmickView::OnFieldsEdited(tree::Node* node, const std::string& name, const std::string& key, const std::string& val)
{