#include <vtkCamera.h>
#include <vtkRenderer.h>
-#include<wx/filefn.h>
+#include <wx/filefn.h>
+//#include <wx/tipwin.h>
using namespace crea;
PopUp_Settings = 501,
PopUp_About = 502,
PopUp_User = WxGimmick::UserMenuFirstId,
+ PopUp_SaveAs = 701,
+ PopUp_AddToFavorites = 702
};
//================================================================
- //================================================================
- class WxGimmickSettingsDialog : public wxDialog
- {
- public:
- WxGimmickSettingsDialog(wxWindow *parent);
- ~WxGimmickSettingsDialog();
-
-
- };
- //================================================================
-
-
//================================================================
//================================================================
WxGimmick::WxGimmick(wxWindow *parent,
- wxWindowID id,
- const wxPoint& pos,
- const wxSize& size,
- int threads)
+ wxWindowID id,
+ const wxPoint& pos,
+ const wxSize& size,
+ int image_type,
+ int threads)
: wxPanel(parent,id,pos,size),
+ mSelectionType(image_type),
mSaveConfigurationOnClose(true),
mReader(threads)
{
+ // Initialize image size corresponding to current selection
+ switch (mSelectionType)
+ {
+ case GIMMICK_2D_IMAGE_SELECTION : mSelectionMaxImageDimension = 2; break;
+ case GIMMICK_3D_IMAGE_SELECTION : mSelectionMaxImageDimension = 3; break;
+ case GIMMICK_4D_IMAGE_SELECTION : mSelectionMaxImageDimension = 4; break;
+ default : mSelectionMaxImageDimension = 0;
+ }
+
+
// Start the threads ...
mReader.Start();
// Image sizer
wxBoxSizer *isizer = new wxBoxSizer(wxHORIZONTAL );
mPanelImage->SetSizer( isizer );
-
+
+ // Notebook
+ mwxNotebook = new wxNotebook(mSplitter2,
+ -1,wxDefaultPosition, wxDefaultSize, 0);
+
+
+
// Fields view (bottom)
- mFieldsView = new WxGimmickFieldsView(mSplitter2,-1,
+ mFieldsView = new WxGimmickFieldsView(mwxNotebook,-1,
wxDefaultPosition,
wxDefaultSize,0);
GetSettings().BgColour(DicomNode::Series),
GetSettings().Colour(DicomNode::Image),
GetSettings().BgColour(DicomNode::Image));
+ mwxNotebook->AddPage( mFieldsView, _T("Dicom fields"));
-
-
+ // Help
+ mHelp = new WxGimmickHelp(mwxNotebook);
+ mwxNotebook->AddPage( mHelp, _T("Help"));
+
+ // Splitting
int wsize = size.GetWidth();
int hsize = size.GetHeight();
int previewhsize = 150;
int previewwsize = 400;
mSplitter2->SetMinimumPaneSize( previewhsize );
- mSplitter2->SplitHorizontally( mPanelImage, mFieldsView,
+ mSplitter2->SplitHorizontally( mPanelImage, mwxNotebook, //mFieldsView,
hsize - previewhsize);
rsizer->Add( mSplitter2,1,wxGROW ,0);
rpanel->Layout();
// previewer
- mInteractor = new wxVTKRenderWindowInteractor(mPanelImage,-1);
+ mInteractor = new crea::creawxVTKRenderWindowInteractor(mPanelImage,-1);
mInteractor->UseCaptureMouseOn();
mViewer = vtkImageViewer2::New();
ShowImage(mReader.GetImage(""));
+ // Show help if no collection
+ if (GetDicomDatabaseList().size()==0)
+ {
+ mwxNotebook->SetSelection(1);
+ }
+ else
+ {
+ mwxNotebook->SetSelection(0);
+ }
+ // mJustStarted = true;
}
//================================================================
boost::filesystem::change_extension(filepath,GetDatabaseExtension());
if ( boost::filesystem::exists(filepath) )
{
+ boost::filesystem::remove(filepath);
+ /*
+ LG : works on Linux but not Windows :
if ( ! boost::filesystem::remove(filepath) )
{
wxMessageBox(_T("Could not overwrite ")
_T("Error"),
wxOK,this);
return;
+
}
+ */
}
}
}
}
+ if (GetDicomDatabaseList().size()==0) mFieldsView->UpdateFields(db);
GetDicomDatabaseList().push_back(db);
UpdateDicomDatabaseView(db);
+
}
//================================================================
{
wxBusyCursor busy;
// std::cout << "WxGimmick : Reading config"<<std::endl;
+ LoadOrCreateFavoritesDatabase();
- // std::cout << "==> Loading collections from '"<<mDatabaseListFile
+ // std::cout <<
+ creaMessage("Gimmick!",1,"Gimmick! : ==> Loading collections from '"<<mDatabaseListFile<<"'"<<std::endl);
// <<"'"<<std::endl;
+
std::ifstream s;
s.open(mDatabaseListFile.c_str());
if (s.good())
}
else
{
- // std::cout << " ... ERROR !"<<std::endl;
+ creaMessage("Gimmick!",1," ==> ERROR opening collection '"<<tokens[0]<<"'"<<std::endl);
delete db;
}
}
}
else
{
- std::cout << "ERROR opening "<<mDatabaseListFile<<std::endl;
+ creaMessage("Gimmick!",1," ==> File does not exist. It will be created on exit (if you already ran Gimmick! and exited normally, this is not normal. Send a bug report).");
}
}
//================================================================
+ //================================================================
+ void WxGimmick::LoadOrCreateFavoritesDatabase()
+ {
+ // TODO
+ }
+ //================================================================
+
/*
//================================================================
void WxGimmick::OnClose(wxCloseEvent& event)
}
//================================================================
+ //================================================================
+ void WxGimmick::LoadChildren(wxTreeItemId& id)
+ {
+ TreeItemData *item = (TreeItemData *)mTreeListCtrl->GetItemData(id);
+ if (item)
+ {
+ if ( ( item->IsDicomNode() || item->IsDatabase() ) &&
+ ( ! item->GetDicomNode()->ChildrenLoaded() ) )
+ {
+
+ // If children not already loaded : do it
+ if (
+ item->GetDicomNode()->GetDicomDatabase()->DBLoadChildren
+ (item->GetDicomNode(),item->GetDicomNode()->GetType()+1)
+ > 0 )
+ {
+ // Some new children loaded
+ // Sort them
+ if (mSettings.HasActiveComparator
+ (item->GetDicomNode()->GetType()+1))
+ {
+ /* std::cout << "Sorting using '"
+ << mSettings.GetActiveComparator
+ (item->GetDicomNode()->GetType()+1).GetName()
+ << "' ... ";
+ */
+ item->GetDicomNode()->SortChildren
+ ( mSettings.GetActiveComparator
+ (item->GetDicomNode()->GetType()+1)
+ );
+ // std::cout << "ok"<<std::endl;
+ }
+ // Update tree
+ DicomNode::ChildrenListType::iterator i;
+ for (i=item->GetDicomNode()->GetChildrenList().begin();
+ i!=item->GetDicomNode()->GetChildrenList().end();
+ i++)
+ {
+ UpdateDicomNodeView(*i,id);
+ }
+ }
+ // EO If children not already loaded
+ }
+ }
+ }
+ //================================================================
+
+
//================================================================
void WxGimmick::OnItemExpanded(wxTreeEvent& event)
{
wxBusyCursor busy;
wxTreeItemId itemId = event.GetItem();
-
+ LoadChildren(itemId);
+
+ return;
+
// expand if collapsed and collapse if expanded ...
TreeItemData *item =
(TreeItemData *)mTreeListCtrl->GetItemData(itemId);
}
if (data->IsDicomNode())
{
- /*
+
// LG : BUGGY
+ /*
std::string str("&Remove ");
str += data->GetDicomNode()->GetTypeName();
menu.Append(PopUp_Remove, std2wx(str));
// Pop up menu callbacks
void WxGimmick::OnPopUpAbout(wxCommandEvent& event)
{
- wxMessageBox( _T("Give me my medical images quick ! \n\n (c) CREATIS-LRMN 2008\n"),
+ wxMessageBox( _T("Give me my medical images quick ! \n\n (c) CREATIS-LRMN 2008\n laurent.guigues@creatis.insa-lyon.fr"),
_T("Gimmick!"),
wxOK | wxICON_INFORMATION, this);
}
void WxGimmick::OnPopUpSettings(wxCommandEvent& event)
{
WxGimmickSettingsDialog* s =
- new WxGimmickSettingsDialog(this);
+ new WxGimmickSettingsDialog(this,&mSettings);
s->ShowModal();
delete s;
}
}
//=================================================
+
+
+
+
+
+
+
+ //================================================================
+ bool WxGimmick::IsImageSelectable(DicomNode* node)
+ {
+ int rows = node->ImageGetRows();
+ int cols = node->ImageGetColumns();
+ int frms = node->ImageGetFrames();
+
+ // std::cout << "R/C/F = " << rows << "/"<< cols <<"/"<<frms<<std::endl;
+
+ int dim = 0;
+ if (frms>0) dim=3;
+ else if (cols>0) dim=2;
+ else if (rows>0) dim=1;
+
+ if (dim == 0)
+ {
+ std::cout << "Unknown image dimension : cannot select !"
+ << std::endl;
+ return false;
+ }
+ else if (dim>mSelectionMaxImageDimension)
+ {
+ std::cout << "Selecting "<<dim<<"D images is not allowed !"
+ << std::endl;
+ return false;
+ }
+
+ if ( mTreeListCtrl->GetSelectionSize() == 0 )
+ {
+ mCurrentSelectionImageSize[0] = cols;
+ mCurrentSelectionImageSize[1] = rows;
+ mCurrentSelectionImageSize[2] = frms;
+ return true;
+ }
+ else
+ {
+ if ( dim == mSelectionMaxImageDimension )
+ {
+ std::cout << "Cannot add this image to selection : would result in a "<<dim+1<<"D image !" << std::endl;
+ return false;
+ }
+ if ( ( cols != mCurrentSelectionImageSize[0] ) ||
+ ( rows != mCurrentSelectionImageSize[1] ) ||
+ ( frms != mCurrentSelectionImageSize[2] ) )
+ {
+ std::cout << "Cannot add this image to selection : image size is incomptatible with currently selected images" << std::endl;
+ return false;
+ }
+ }
+ // std::cout << "Selecting : "<<node->ImageGetFullFileName() << std::endl;
+ return true;
+ }
+ //================================================================
+
//================================================================
void WxGimmick::OnSelChanging(wxTreeEvent& event)
{
+ event.Veto();
wxTreeItemId id = event.GetItem();
if (!id.IsOk())
{
- std::cout << "ERROR : ID NOT OK"<<std::endl;
+ std::cout << "INTERNAL ERROR : ID NOT OK"<<std::endl;
return;
}
- TreeItemData *data = (TreeItemData *)mTreeListCtrl->GetItemData(id);
- event.Veto();
+ TreeItemData *data = (TreeItemData *)mTreeListCtrl->GetItemData(id);
if (data->IsDicomNode())
{
- if ((data->GetDicomNode()>0)&&
- ( data->GetDicomNode()->GetType()==DicomNode::Image))
+ if (data->GetDicomNode()>0)
{
- event.Allow();
+ // An image was selected
+ if (data->GetDicomNode()->GetType()==DicomNode::Image)
+ {
+ if (IsImageSelectable(data->GetDicomNode())) event.Allow();
+ }
+ // A series was selected
+ else if (data->GetDicomNode()->GetType()==DicomNode::Series)
+ {
+ // If images not loaded do it
+ LoadChildren(id);
+ // can be selected if all its images can
+ wxTreeItemId child;
+ wxTreeItemIdValue cookie;
+ for (child = mTreeListCtrl->GetFirstChild(id,cookie);
+ child.IsOk();
+ child = mTreeListCtrl->GetNextChild(id,cookie))
+ {
+ TreeItemData *cdata =
+ (TreeItemData *)mTreeListCtrl->GetItemData(child);
+ if ((cdata->IsDicomNode())&&
+ (cdata->GetDicomNode()>0)&&
+ (cdata->GetDicomNode()->GetType()==DicomNode::Image)&&
+ (!IsImageSelectable(cdata->GetDicomNode())))
+ return;
+ }
+ event.Allow();
+ }
}
}
}
// << nsib->GetFieldValue("FullFileName")
// << "' prio="<<prio<<std::endl;
mReader.Request(this,
- nsib->GetFieldValue("FullFileName"),
+ nsib->ImageGetFullFileName(),
prio);
- mImageFileNameToNode[nsib->GetFieldValue("FullFileName")] =
+ mImageFileNameToNode[nsib->ImageGetFullFileName()] =
nsib;
prio--;
}
sib = GetTreeListCtrl()->GetNextSibling(sib);
}
- prio = maxprio + 1000;
+ prio = maxprio + 999;
sib = GetTreeListCtrl()->GetPrevSibling(item);
while (sib.IsOk())
{
// << nsib->GetFieldValue("FullFileName")
// << "' prio="<<prio<<std::endl;
mReader.Request(this,
- nsib->GetFieldValue("FullFileName"),
+ nsib->ImageGetFullFileName(),
prio);
- mImageFileNameToNode[nsib->GetFieldValue("FullFileName")] =
+ mImageFileNameToNode[nsib->ImageGetFullFileName()] =
nsib;
prio--;
}
void WxGimmick::ShowImage(vtkImageData* im)
{
// wxBusyCursor busy;
+ mViewer->SetInput( im );
+ mViewer->SetSlice( 0 );
+
int x1,x2,y1,y2,z1,z2;
double spx,spy,spz;
+ im->Update();
im->GetSpacing(spx,spy,spz);
im->GetExtent (x1,x2,y1,y2,z1,z2);
-
/*
+ std::cout << "-----------------------------"<<std::endl;
std::cout << x1 << "-"<<x2<<std::endl;
std::cout << y1 << "-"<<y2<<std::endl;
std::cout << z1 << "-"<<z2<<std::endl;
mspy = spy;
mspz = spz;
+ double *range = im->GetScalarRange();
+ mViewer->SetColorWindow(range[1] - range[0]);
+ mViewer->SetColorLevel(0.5 * (range[1] + range[0]));
+
+ mViewer->GetRenderer()->ResetCamera();
+ double bounds[6];
+
+
+ mViewer->GetRenderer()->ComputeVisiblePropBounds(bounds);
+
+ /*
+ std::cout <<"bounds : "<<bounds[0]<<","
+<<bounds[1]<<","
+<<bounds[2]<<","
+<<bounds[3]<<","
+<<bounds[4]<<","
+ <<bounds[5]<<std::endl;
+ */
+ mViewer->GetRenderer()->ResetCameraClippingRange(bounds);
+ /*
vtkCamera *camera = mViewer->GetRenderer()->GetActiveCamera();
camera->SetViewUp ( spx*0, -spy*1, spz*0);
- camera->SetPosition( spx*(x1+x2)/2, spy*(y1+y2)/2, -spz*10000000);
+ camera->SetPosition( spx*(x1+x2)/2, spy*(y1+y2)/2, spz*10000000);
camera->SetFocalPoint ( spx*(x1+x2)/2 , spy*(y1+y2)/2 , spz*0);
camera->ComputeViewPlaneNormal();
camera->SetParallelScale( spx*(x2-x1)/2.0 );
+ camera->Roll ( 180 );
+ */
}
- mViewer->SetInput( im );
- mViewer->SetSlice( 0 );
mInteractor->Render();
}
//================================================================
void WxGimmick::OnInternalIdle()
{
ProcessImageEvents();
+ /*
+ if (mJustStarted)
+ {
+
+ mJustStarted = false;
+ }
+ */
+ //
}
//================================================================
+ //================================================================
+ // LG : For the moment any selection is valid but in the future
+ // incomplete selections can be invalid...
+ bool WxGimmick::IsSelectionValid()
+ {
+ return (mTreeListCtrl->GetSelectionSize()>0);
+ }
+ //================================================================
+
+ //================================================================
+ void WxGimmick::GetSelectedFiles(std::vector<std::string>& f)
+ {
+ wxArrayTreeItemIds id;
+ // TO DO : TEST THAT STYLE IS MULTIPLE
+ unsigned int nb = mTreeListCtrl->GetSelections(id);
+ f.clear();
+ for (unsigned int i=0; i<nb; ++i)
+ {
+ TreeItemData *data =
+ (TreeItemData *)mTreeListCtrl->GetItemData(id[i]);
+ if ((data) && (data->IsDicomNode()))
+ {
+ if (data->GetDicomNode()->GetType()==DicomNode::Image)
+ {
+ f.push_back ( data->GetDicomNode()->ImageGetFullFileName() );
+ }
+ else if (data->GetDicomNode()->GetType()==DicomNode::Series)
+ {
+ DicomNode::ChildrenListType::iterator j;
+ for (j =data->GetDicomNode()->GetChildrenList().begin();
+ j!=data->GetDicomNode()->GetChildrenList().end();
+ j++)
+ {
+ f.push_back((*j)->ImageGetFullFileName());
+ }
+ }
+ }
+ }
+ }
+ //================================================================
//================================================================
- void WxGimmick::GetSelectedImages(std::vector<std::string>& f)
+ void WxGimmick::GetSelectedImages(std::vector<vtkImageData*>& f)
{
wxArrayTreeItemIds id;
// TO DO : TEST THAT STYLE IS MULTIPLE
unsigned int nb = mTreeListCtrl->GetSelections(id);
f.clear();
+
+ // Collect the brute vector of Image nodes
+ std::vector<DicomNode*> im;
for (unsigned int i=0; i<nb; ++i)
{
TreeItemData *data =
{
if (data->GetDicomNode()->GetType()==DicomNode::Image)
{
- f.push_back ( data->GetDicomNode()->GetFieldValue("FullFileName") );
+ im.push_back ( data->GetDicomNode() );
+
}
else if (data->GetDicomNode()->GetType()==DicomNode::Series)
{
j!=data->GetDicomNode()->GetChildrenList().end();
j++)
{
- f.push_back((*j)->GetFieldValue("FullFileName"));
+ im.push_back ( *j );
}
}
}
}
+ // Create the output data
+ if (im.size()==1)
+ {
+ // Only one image : give it
+ vtkImageData* out = vtkImageData::New();
+ out->ShallowCopy(mReader.GetImage(im.front()->ImageGetFullFileName()));
+ f.push_back( out );
+ }
+ else if (im.size()>1)
+ {
+ vtkImageData* first = mReader.GetImage( im.front()->ImageGetFullFileName() );
+ if (first->GetDataDimension()==2)
+ {
+ // n2D to 3D
+ vtkImageData* out = vtkImageData::New();
+ out->CopyStructure(first);
+ out->SetScalarType(first->GetScalarType());
+ int ext[6];
+ first->GetExtent(ext);
+ ext[5] = im.size();
+ out->SetExtent(ext);
+ // LG : TODO : Z Spacing ?
+ //
+ // ==> to get an accurate ZSpacing from a Dicom set of files
+ // ==> you need a gdcm::SerieHelper
+ // JPR
+
+ out->AllocateScalars();
+
+ //first->Print(std::cout);
+ // out->Print(std::cout);
+
+ int dim[3];
+ first->GetDimensions(dim);
+ unsigned long imsize =
+ ( (unsigned long)first->GetScalarPointer(0,1,0)
+ - (unsigned long)first->GetScalarPointer(0,0,0))
+ *dim[1];
+
+ int slice = 0;
+ std::vector<DicomNode*>::iterator it;
+ for (it=im.begin(); it!=im.end(); ++it)
+ {
+ //std::cout << "copying slice "<<slice <<std::endl;
+ vtkImageData* cur = mReader.GetImage( (*it)->ImageGetFullFileName() );
+
+ void* src = cur->GetScalarPointer(0,0,0);
+ void* dst = out->GetScalarPointer(0,0,slice);
+ // std::cout << "src="<<src<<std::endl;
+ // std::cout << "dst="<<dst<<std::endl;
+ // std::cout << "siz="<<imsize<<std::endl;
+ memcpy(dst,src,imsize);
+
+ /*
+ // verif
+ int ii,jj;
+ for (ii=1;ii<4;ii++) {
+ for (jj=1;jj<4;jj++) {
+ int x = (int)(ii*dim[0] / 4);
+ int y = (int)(jj*dim[1] / 4);
+ std::cout << cur->GetScalarComponentAsFloat(x,y,0,0)
+ << " vs "
+ << out->GetScalarComponentAsFloat(x,y,slice,0)
+ << std::endl;
+ }
+ }
+ */
+
+ slice++;
+ }
+ f.push_back(out);
+ }
+ else
+ {
+ // n3D
+ std::vector<DicomNode*>::iterator it;
+ for (it=im.begin(); it!=im.end(); ++it)
+ {
+ vtkImageData* out = vtkImageData::New();
+ out->ShallowCopy(mReader.GetImage((*it)->ImageGetFullFileName()));
+ f.push_back(out);
+ }
+ }
+ }
}
//================================================================
if (data->GetDicomNode()->GetType()==DicomNode::Image)
{
- f.push_back ( data->GetDicomNode() ); //->GetFieldValue("FullFileName") );
+ f.push_back ( data->GetDicomNode() ); //->ImageGetFullFileName() );
}
else if (data->GetDicomNode()->GetType()==DicomNode::Series)
{
j!=data->GetDicomNode()->GetChildrenList().end();
j++)
{
- f.push_back((*j)); //->GetFieldValue("FullFileName"));
- }
+ f.push_back((*j)); //->ImageGetFullFileName() ); }
}
}
*/
}
-
-
-
-
+ //====================================================================
+ void WxGimmick::ShowHelp()
+ {
+ /*
+ if (mHelpWindow==0)
+ {
+ mHelpWindow = new WxGimmickHelpWindow(this);
+ }
+ mHelpWindow->CenterOnParent();
+ mHelpWindow->ShowModal();
+ */
+ }
+ //====================================================================
//================================================================
//================================================================
WxGimmickFrame::WxGimmickFrame( wxWindow *parent,
- wxString title,
- wxSize size)
+ wxString title,
+ wxSize size)
: wxFrame((wxFrame *)parent, -1, title, wxDefaultPosition, size)
{
wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
- long style = wxTR_DEFAULT_STYLE |
-#ifndef NO_VARIABLE_HEIGHT
- wxTR_HAS_VARIABLE_ROW_HEIGHT |
-#endif
- wxTR_EDIT_LABELS | wxSUNKEN_BORDER;
- mWxGimmick = new WxGimmick(this,-1,wxDefaultPosition,wxDefaultSize,style);
+ mWxGimmick = new WxGimmick(this,-1,
+ wxDefaultPosition,
+ wxDefaultSize);
sizer->Add(mWxGimmick,1,wxGROW);
SetSizer(sizer);
SetAutoLayout(true);
- //================================================================
- //================================================================
- //================================================================
- //================================================================
-
- //================================================================
- WxGimmickSettingsDialog::WxGimmickSettingsDialog(wxWindow *parent)
- :
- wxDialog( parent,
- -1,
- _T("Settings"),
- wxDefaultPosition,
- wxSize(400,400),
- wxRESIZE_BORDER |
- wxSYSTEM_MENU |
- wxCLOSE_BOX |
- wxMAXIMIZE_BOX |
- wxMINIMIZE_BOX |
- wxCAPTION
- )
- {
- }
- //================================================================
-
- //================================================================
- WxGimmickSettingsDialog::~WxGimmickSettingsDialog()
- {
- }
- //================================================================
-
-
-
+
git://git.creatis.insa-lyon.fr / creaImageIO.git / blobdiff