From 7ade8fddcb65067108aaa7b101b5029c30737f12 Mon Sep 17 00:00:00 2001
From: Otmane Lahlou <otmane.lahlou@c-s.fr>
Date: Fri, 15 Feb 2013 17:09:13 +0100
Subject: [PATCH] ENH: make ImageModelRenderer inherits
AbstractModelManipulator and remove duplicated methods
---
Code/Common/mvdImageModelRenderer.cxx | 3 ++-
Code/Common/mvdImageModelRenderer.h | 32 ++-------------------------
2 files changed, 4 insertions(+), 31 deletions(-)
diff --git a/Code/Common/mvdImageModelRenderer.cxx b/Code/Common/mvdImageModelRenderer.cxx
index e78f3a525a..918773e006 100644
--- a/Code/Common/mvdImageModelRenderer.cxx
+++ b/Code/Common/mvdImageModelRenderer.cxx
@@ -50,7 +50,8 @@ namespace mvd
/*****************************************************************************/
ImageModelRenderer
::ImageModelRenderer( QObject* parent ) :
- QObject( parent ),m_IsMoving(false)
+ AbstractModelRenderer( parent ),
+ m_IsMoving(false)
{
m_PreviousOrigin.Fill(0);
}
diff --git a/Code/Common/mvdImageModelRenderer.h b/Code/Common/mvdImageModelRenderer.h
index 45524fb0c6..bd808143c7 100644
--- a/Code/Common/mvdImageModelRenderer.h
+++ b/Code/Common/mvdImageModelRenderer.h
@@ -42,6 +42,7 @@
//
// Monteverdi includes (sorted by alphabetic order)
#include "mvdTypes.h"
+#include "mvdAbstractModelRenderer.h"
//
// External classes pre-declaration.
@@ -59,41 +60,13 @@ class Monteverdi2_EXPORT AbstractImageModel;
*
*/
class ImageModelRenderer :
- public QObject
+ public AbstractModelRenderer
{
Q_OBJECT;
//
// Public types.
public:
- struct RenderingContext
- {
- inline
- RenderingContext( const AbstractImageModel* model =NULL,
- const ImageRegionType& region =ImageRegionType(),
- double zoom = 1.,
- unsigned int width = 0,
- unsigned int height = 0,
- int dx = 0,
- int dy = 0,
- bool refresh = true) :
- m_AbstractImageModel( model ),
- m_ImageRegion( region ),
- m_IsotropicZoom( zoom ),
- m_WidgetWidth(width),
- m_WidgetHeight(height),
- m_ForceRefresh(refresh)
- {
- }
-
- const AbstractImageModel* m_AbstractImageModel;
- ImageRegionType m_ImageRegion;
- double m_IsotropicZoom;
- unsigned int m_WidgetWidth;
- unsigned int m_WidgetHeight;
- bool m_ForceRefresh;
- };
-
//
// Public methods.
public:
@@ -137,7 +110,6 @@ private:
//
// Private attributes.
private:
-
unsigned char * m_Buffer;
bool m_IsMoving;
--
GitLab