Skip to content
Snippets Groups Projects
Commit f8853e93 authored by Julien Michel's avatar Julien Michel
Browse files

Mise à jour visu.

parent 3745fa35
No related branches found
No related tags found
No related merge requests found
......@@ -76,6 +76,8 @@ class FixedSizeFullImageWidget
void operator=(const Self&);// purposely not implemented
SizeType m_WindowSize;
bool m_ImageLoaded;
bool m_ImageOverlayLoaded;
};
} // end namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
......
......@@ -38,6 +38,8 @@ FixedSizeFullImageWidget<TPixel>
region.SetIndex(index);
region.SetSize(m_WindowSize);
this->SetViewedRegion(region);
m_ImageLoaded=false;
m_ImageOverlayLoaded=false;
}
/**
......@@ -98,16 +100,25 @@ bool
FixedSizeFullImageWidget<TPixel>
::UpdateOpenGlBufferedRegionRequested(void)
{
RegionType viewed = this->GetViewedRegion();
RegionType buffered = this->GetBufferedRegion();
IndexType viewedULCorner = viewed.GetIndex();
IndexType bufferedULCorner = buffered.GetIndex();
IndexType viewedRDCorner = viewed.GetIndex()+viewed.GetSize();
IndexType bufferedRDCorner = buffered.GetIndex()+buffered.GetSize();
return ( viewedULCorner[0]<bufferedULCorner[0]
||viewedULCorner[1]<bufferedULCorner[1]
||viewedRDCorner[0]>bufferedRDCorner[0]
||viewedRDCorner[1]>bufferedRDCorner[1]);
// RegionType viewed = this->GetViewedRegion();
// RegionType buffered = this->GetBufferedRegion();
// IndexType viewedULCorner = viewed.GetIndex();
// IndexType bufferedULCorner = buffered.GetIndex();
// IndexType viewedRDCorner = viewed.GetIndex()+viewed.GetSize();
// IndexType bufferedRDCorner = buffered.GetIndex()+buffered.GetSize();
// return ( viewedULCorner[0]<bufferedULCorner[0]
// ||viewedULCorner[1]<bufferedULCorner[1]
// ||viewedRDCorner[0]>bufferedRDCorner[0]
// ||viewedRDCorner[1]>bufferedRDCorner[1]);
if(m_ImageLoaded)
{
return false;
}
else
{
m_ImageLoaded=true;
return true;
}
}
/**
* Update OpenGlBuffer.
......@@ -128,16 +139,16 @@ bool
FixedSizeFullImageWidget<TPixel>
::UpdateOpenGlImageOverlayBufferedRegionRequested(void)
{
RegionType viewed = this->GetViewedRegion();
RegionType buffered = this->GetImageOverlayBufferedRegion();
IndexType viewedULCorner = viewed.GetIndex();
IndexType bufferedULCorner = buffered.GetIndex();
IndexType viewedRDCorner = viewed.GetIndex()+viewed.GetSize();
IndexType bufferedRDCorner = buffered.GetIndex()+buffered.GetSize();
return ( viewedULCorner[0]<bufferedULCorner[0]
||viewedULCorner[1]<bufferedULCorner[1]
||viewedRDCorner[0]>bufferedRDCorner[0]
||viewedRDCorner[1]>bufferedRDCorner[1]);
if(m_ImageOverlayLoaded)
{
return false;
}
else
{
m_ImageOverlayLoaded=true;
return true;
}
}
/**
* Update OpenGlBuffer.
......
......@@ -250,8 +250,8 @@ ImageWidgetBase<TPixel>
else
{
//otbMsgDebugMacro(<<"Show");
m_Image->SetRequestedRegion(m_BufferedRegion);
m_Image->Update();
// m_Image->SetRequestedRegion(m_BufferedRegion);
// m_Image->Update();
this->show();
this->redraw();
}
......@@ -268,8 +268,8 @@ ImageWidgetBase<TPixel>
if(this->UpdateOpenGlBufferedRegionRequested())
{
UpdateOpenGlBufferedRegion();
m_Image->SetRequestedRegion(m_BufferedRegion);
m_Image->Update();
// m_Image->SetRequestedRegion(m_BufferedRegion);
// m_Image->Update();
RebuildOpenGlBuffer();
}
if(m_ImageOverlayVisible && this->UpdateOpenGlImageOverlayBufferedRegionRequested())
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment