Fixed a bug which was causing incorrect textual UI elements to be dra…

…wn for the coordinates of the datawindow.
GafferHQ · Aug 22, 2013 · e36560b · e36560b
1 parent 34893cc
commit e36560b
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/src/GafferImageUI/ImageView.cpp b/src/GafferImageUI/ImageView.cpp
@@ -444,13 +444,20 @@ class ImageViewGadget : public GafferUI::Gadget
  m_sampleWindow = selectionBox;
  }
 
- void drawWindow( Box2f &rasterWindow, const Style *style ) const
+ void drawWindow( Box2f &rasterWindow, const Style *style ) const
+ {
+ V2f minPt( rasterToDisplaySpace( rasterWindow.min ) );
+ V2f maxPt( rasterToDisplaySpace( rasterWindow.max ) );
+ drawWindow( rasterWindow, minPt, maxPt, style );
+ }
+
+ void drawWindow( Box2f &rasterWindow, const V2f &bottomLeftPoint, const V2f &topRightPoint, const Style *style ) const
  {
  V2f minPt( rasterToDisplaySpace( rasterWindow.min ) );
  V2f maxPt( rasterToDisplaySpace( rasterWindow.max ) );
 
- std::string rasterWindowMinStr = std::string( boost::str( boost::format( "(%d, %d)" ) % fastFloatRound( minPt.x ) % fastFloatRound( minPt.y ) ) );
- std::string rasterWindowMaxStr = std::string( boost::str( boost::format( "(%d, %d)" ) % fastFloatRound( maxPt.x ) % fastFloatRound( maxPt.y ) ) );
+ std::string rasterWindowMinStr = std::string( boost::str( boost::format( "(%d, %d)" ) % fastFloatRound( bottomLeftPoint.x ) % fastFloatRound( bottomLeftPoint.y ) ) );
+ std::string rasterWindowMaxStr = std::string( boost::str( boost::format( "(%d, %d)" ) % fastFloatRound( topRightPoint.x ) % fastFloatRound( topRightPoint.y ) ) );
 
  // Draw the box around the data window.
  style->renderRectangle( rasterWindow );
@@ -590,7 +597,7 @@ class ImageViewGadget : public GafferUI::Gadget
  {
  color = Color4f( .2f, .2f, .2f, 1.f );
  glColor( color );
- drawWindow( dataRasterBox, style );
+ drawWindow( dataRasterBox, m_dataWindow.min, m_dataWindow.max, style );
  }
 
  /// Draw the selection window.