#include <vtkCamera.h>
#include <vtkRenderer.h>
#include <vtkImageData.h>
-
+#include <creawxVTKRenderWindowInteractor.h>
#include <creaMessageManager.h>
#include <stdio.h>
#include <time.h>
+
using namespace crea;
namespace creaImageIO
{}
void* Entry();
- // void SetImagesToPlay(std::vector<vtkImageData*> im);
- // void ShowImage(vtkImageData* v);
- // void StartIterator();
void OnExit();
private:
- //std::vector<vtkImageData*> mImagesToPlay;
- //vtkImageViewer2* mViewer;
- /// Associated wxvtk interactor
- //crea::creawxVTKRenderWindowInteractor *mInteractor;
- //std::vector<vtkImageData*>::iterator i;
+
WxViewer* mWxViewer;
-
- // int mx1,mx2,my1,my2,mz1,mz2;
- // double mspx,mspy,mspz;
};
//=====================================================================
mNeedRefresh = false;
mLastImageShown = NULL;
-
- wxBoxSizer *topsizer = new wxBoxSizer(wxVERTICAL);
-
-
- // previewer
+ // previewer
mInteractor = new crea::creawxVTKRenderWindowInteractor(this,-1);
mInteractor->UseCaptureMouseOn();
mCurrent = 0;
mPlayer = 0;
-
- topsizer-> Add( mInteractor ,1,wxGROW ,0);
- SetSizer( topsizer );
+
+ // Grid to place checkbox and slider
+ mflexSizer = new wxFlexGridSizer(1,2,1,1);
+ //Slider
+ mslide = new wxSlider(this,-1,0,0,1, wxDefaultPosition, wxSize(400,40), wxSL_HORIZONTAL | wxSL_LABELS);
+ Connect( mslide->GetId(), wxEVT_COMMAND_SLIDER_UPDATED , (wxObjectEventFunction) &WxViewer::OnSlide );
+ //CheckBox
+ mcheck = new wxCheckBox(this,5123,crea::std2wx("Cine Loop"));
+ Connect( mcheck->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED , (wxObjectEventFunction) &WxViewer::OnCineLoop );
+ mcheck->SetValue(false);
+ mflexSizer->Add(mcheck,0, wxFIXED_MINSIZE);
+ mflexSizer-> Add( mslide,1,wxALIGN_CENTER | wxFIXED_MINSIZE );
+
+ // Sizer for Previewer and GridSizer
+ mtopSizer = new wxBoxSizer(wxVERTICAL);
+ mtopSizer->Add(mflexSizer,0);
+ mtopSizer-> Add( mInteractor ,1,wxGROW,0);
+ SetSizer(mtopSizer,true);
+
+ Update();
Layout();
}
//=====================================================================
GimmickDebugMessage(6,"WxViewer::~WxViewer"
<<std::endl);
// TO DO : desallocate cleanly
- // delete mPlayer;
- // delete mInteractor;
+ if(mPlayer)
+ {
+ mPlayer->Pause();
+ mPlayer->Delete();
+ mPlayer = 0;
+ }
+ delete mInteractor;
+ //delete mslide;
+ //delete mflexSizer;
}
//=====================================================================
//================================================================
- void WxViewer::SetImageVector(std::vector<ImagePointerHolder*>& pointers)
+ void WxViewer::SetImageVector(std::vector<boost::shared_ptr<ImagePointerHolder> >& pointers)
{
wxMutexLocker lock(mMutex);
GimmickDebugMessage(6,"WxViewer::SetImageVector"<<std::endl);
imagePointers=pointers;
+
+ mslide->SetMax(pointers.size());
+ // Refresh don't work, TO MODIFY
+ mslide->Refresh();
+ mslide->ClearTicks();
+ mslide->Hide();
+ mslide->Show();
+ StartPlayer();
}
//================================================================
void WxViewer::ShowNextImage()
{
+
+ #if WIN32
wxMutexLocker lock(mMutex);
-
-
- GimmickDebugMessage(10,"WxViewer::ShowNextImage() "
+ #endif
+
+ GimmickMessage(2,"WxViewer::ShowNextImage() "
<<mCurrent+1<<"/"
<<imagePointers.size()<<std::endl);
{
if (mCurrent<imagePointers.size())
{
- ImagePointerHolder* iph=imagePointers[mCurrent];
+ boost::shared_ptr<ImagePointerHolder> iph = imagePointers[mCurrent];
+ //ImagePointerHolder* iph= imagePointers[mCurrent];
vtkImageData* currIm=iph->Get();
ShowImage(currIm);
if ( currIm != mLastImageShown )
else
{
mCurrent = 0;
- ImagePointerHolder* iph=imagePointers[mCurrent];
+ //ImagePointerHolder* iph=imagePointers[mCurrent];
+ boost::shared_ptr<ImagePointerHolder> iph = imagePointers[mCurrent];
vtkImageData* currIm=iph->Get();
ShowImage(currIm);
if ( currIm != mLastImageShown )
//=====================================================================
void WxViewer::ShowImage(vtkImageData* im)
{
-
GimmickDebugMessage(6,"WxViewer::ShowImage"
<<std::endl);
if (im==0) return;
mViewer->SetInput(im);
-
+
mViewer->SetSlice( 0 );
-
+
int x1,x2,y1,y2,z1,z2;
double spx,spy,spz;
im->Update();
-
+
+//std::cout << "in WxViewer::ShowImage PrintSelf() =";
+//im->PrintSelf(std::cout, vtkIndent(2));
+
im->GetSpacing(spx,spy,spz);
- im->GetExtent (x1,x2,y1,y2,z1,z2);
-
+ //im->GetExtent (x1,x2,y1,y2,z1,z2); // JPR
+ im->GetWholeExtent (x1,x2,y1,y2,z1,z2);
+/*
+std::cout << "in WxViewer::ShowImage GetWholeExtent ext =";
+ std::cout << " [x1]=" << x1;
+ std::cout << " [x2]=" << x2;
+ std::cout << " [y1]=" << y1;
+ std::cout << " [y2]=" << y2;
+ std::cout << " [z1]=" << z1;
+ std::cout << " [z2]=" << z2;
+std::cout << std::endl;
+*/
if ((x1!=mx1) ||
(x2!=mx2) ||
(y1!=my1) ||
mspx = spx;
mspy = spy;
mspz = spz;
-
+
double *range = im->GetScalarRange();
- mViewer->SetColorWindow(range[1] - range[0]);
- mViewer->SetColorLevel(0.5 * (range[1] + range[0]));
+ mViewer->SetColorWindow(range[1] - range[0]);
+ mViewer->SetColorLevel(0.5 * (range[1] + range[0]));
- mViewer->GetRenderer()->ResetCamera();
+ mViewer->GetRenderer()->ResetCamera();
double bounds[6];
+ mViewer->GetRenderer()->ComputeVisiblePropBounds(bounds);
- mViewer->GetRenderer()->ComputeVisiblePropBounds(bounds);
-
-
- mViewer->GetRenderer()->ResetCameraClippingRange(bounds);
-
-
- }
-
+ mViewer->GetRenderer()->ResetCameraClippingRange(bounds);
+ mViewer->GetRenderer()->SetBackground(0.1,0.1,0.2);
+ }
}
//================================================================
- //================================================================
+ //================================================================
bool WxViewer::RefreshIfNecessary()
{
if (mNeedRefresh)
//==================================================
void WxViewer::StartPlayer()
{
- // wxMutexLocker lock(mMutex);
- if (mPlayer != 0) return;
- mPlayer = new WxViewerPlayer(this);
- mPlayer->Create();
- mPlayer->Run();
+ if(mcheck->IsChecked())
+ {
+ // wxMutexLocker lock(mMutex);
+ if (mPlayer != 0) return;
+ mPlayer = new WxViewerPlayer(this);
+ mPlayer->Create();
+ mPlayer->Run();
+ }
+ else
+ {
+ ShowNextImage();
+ }
+ }
+
+ //================================================================
+
+ //==================================================
+
+ void WxViewer::OnCineLoop(wxCommandEvent &Event)
+ {
+ if(!mcheck->IsChecked())
+ {
+ mPlayer->Pause();
+ mPlayer->Delete();
+ mPlayer = 0;
+ }
+ StartPlayer();
}
+ //================================================================
+
+ //==================================================
+
+ void WxViewer::OnSlide(wxCommandEvent &Event)
+ {
+ mCurrent = mslide->GetValue();
+ StartPlayer();
+ }
+ //================================================================
+
+ //==================================================
+
+ void WxViewer::SetValue()
+ {
+ mslide->SetValue(mCurrent);
+ }
// BEGIN_EVENT_TABLE(WxGimmickFrame, wxDialog)
// END_EVENT_TABLE()
{
mWxViewer->ShowNextImage();
+ mWxViewer->SetValue();
::wxWakeUpIdle();
clock_t endwait;
endwait = clock () + 0.2 * CLOCKS_PER_SEC ;
- while (clock() < endwait) {}
+ while (clock() < endwait ) {}
}
return 0;
git://git.creatis.insa-lyon.fr / creaImageIO.git / blobdiff