From da80530068246081505e9649523d10e8da8e6acd Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Mon, 9 Nov 2009 18:39:57 +0000 Subject: [PATCH] _T --- src2/creaImageIOGimmickView.cpp | 34 +++++++++++++--------- src2/creaImageIOWxGimmickPanel.h | 2 +- src2/creaImageIOWxViewer.cpp | 49 ++++++++++++++++++-------------- 3 files changed, 48 insertions(+), 37 deletions(-) diff --git a/src2/creaImageIOGimmickView.cpp b/src2/creaImageIOGimmickView.cpp index 68dfb92..c7e0cf1 100644 --- a/src2/creaImageIOGimmickView.cpp +++ b/src2/creaImageIOGimmickView.cpp @@ -114,7 +114,7 @@ namespace creaImageIO /// Create a tree view with a given name void GimmickView::CreateSingleTreeView(std::string &i_name) { - this->CreateTreeView(mGimmick->GetTreeHandlerMap()[i_name]); + this->CreateTreeView(mGimmick->GetTreeHandlerMap()[i_name]); } @@ -135,6 +135,7 @@ namespace creaImageIO } i->second->UpdateLevel(l); } + //====================================================================== /// Clears the status and begins a new selection process void GimmickView::ResetExtent() @@ -146,7 +147,6 @@ namespace creaImageIO valid=true; } - //====================================================================== //====================================================================== @@ -204,9 +204,9 @@ namespace creaImageIO else { boost::shared_ptr ie=boost::shared_ptr(new ImageExtent((*sel).GetAttribute("D0028_0010"), - (*sel).GetAttribute("D0028_0011"), - (*sel).GetAttribute("D0028_0012"), - "")); + (*sel).GetAttribute("D0028_0011"), + (*sel).GetAttribute("D0028_0012"), + "")); if(mImageExtent==0) { mImageExtent=ie; @@ -218,7 +218,7 @@ namespace creaImageIO { std::stringstream out; out << mImageExtent->GetDimension() << "D image " << mImageExtent->Get(0) << "x"<< mImageExtent->Get(1) << "x"<< mImageExtent->Get(2) <<" selected"; - mMessage = out.str(); + mMessage = out.str(); mImageExtent->SetDimension(2); valid=true; } @@ -254,10 +254,10 @@ namespace creaImageIO } else { - mImageExtent->Add(*ie); - std::stringstream out; - out << mImageExtent->GetDimension() << "D image " << mImageExtent->Get(0) << "x"<< mImageExtent->Get(1) << "x"<< mImageExtent->Get(2) <<" selected"; - mMessage = out.str(); + mImageExtent->Add(*ie); + std::stringstream out; + out << mImageExtent->GetDimension() << "D image " << mImageExtent->Get(0) << "x"<< mImageExtent->Get(1) << "x"<< mImageExtent->Get(2) <<" selected"; + mMessage = out.str(); } } else @@ -289,15 +289,15 @@ void GimmickView::ReadImagesNotThreaded(std::vector& s, std::vect // Only one image : give it vtkImageData* out = vtkImageData::New(); GimmickDebugMessage(3, "State Check: Full Filename: " - <ShallowCopy(mReader.GetImage(im.front())); s.push_back( out ); } else if (im.size()>1) // Test inutile ? JPR { vtkImageData* first = mReader.GetImage( im.front()); - if (dimension == 2) + if (dimension == 2) { // n3D std::vector::iterator it; @@ -315,7 +315,13 @@ void GimmickView::ReadImagesNotThreaded(std::vector& s, std::vect out->CopyStructure(first); out->SetScalarType(first->GetScalarType()); int ext[6]; - first->GetExtent(ext); + //first->GetExtent(ext); // JPR + first->GetWholeExtent(ext); +std::cout <<"in GimmickView::ReadImagesNotThreaded GetWholeExtent ext ="; +for (int jjj=0;jjj<6;jjj++) + std:cout << " [" << jjj << "]=" << ext[jjj]; +std::cout << endl; + if(ext[5] == 0) { ext[5] = im.size()-1; diff --git a/src2/creaImageIOWxGimmickPanel.h b/src2/creaImageIOWxGimmickPanel.h index f1100c6..0a2bccf 100644 --- a/src2/creaImageIOWxGimmickPanel.h +++ b/src2/creaImageIOWxGimmickPanel.h @@ -26,7 +26,7 @@ namespace creaImageIO const wxPoint& pos, const wxSize& size, const std::string i_namedescp , - const std::string i_namedb = _T("Local Database"), + const std::string i_namedb = "Local Database", int threads = 0); ~WxGimmickPanel(); diff --git a/src2/creaImageIOWxViewer.cpp b/src2/creaImageIOWxViewer.cpp index 523e780..4a0f283 100644 --- a/src2/creaImageIOWxViewer.cpp +++ b/src2/creaImageIOWxViewer.cpp @@ -145,22 +145,34 @@ namespace creaImageIO //===================================================================== void WxViewer::ShowImage(vtkImageData* im) { - GimmickDebugMessage(6,"WxViewer::ShowImage" <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) || @@ -181,30 +193,23 @@ namespace creaImageIO 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()->SetBackground(0.1,0.1,0.2); - - - - } - + mViewer->GetRenderer()->ResetCameraClippingRange(bounds); + mViewer->GetRenderer()->SetBackground(0.1,0.1,0.2); + } } //================================================================ - //================================================================ + //================================================================ bool WxViewer::RefreshIfNecessary() { if (mNeedRefresh) -- 2.45.0