Code refactoring.

common/gal/cairo/cairo_compositor.cpp

@@ -34,7 +34,7 @@
 using namespace KiGfx;
 
 CAIRO_COMPOSITOR::CAIRO_COMPOSITOR( cairo_t** aMainContext ) :
-     m_current( 0 ), m_currentContext( aMainContext ), m_mainContext( *aMainContext )
+    m_current( 0 ), m_currentContext( aMainContext ), m_mainContext( *aMainContext )
 {
     // Obtain the transformation matrix used in the main context
     cairo_get_matrix( m_mainContext, &m_matrix );
@@ -69,6 +69,7 @@ unsigned int CAIRO_COMPOSITOR::GetBuffer()
 {
     // Pixel storage
     BitmapPtr bitmap( new unsigned int[m_bufferSize] );
+
     memset( bitmap.get(), 0x00, m_bufferSize * sizeof(int) );
 
     // Create the Cairo surface
@@ -105,6 +106,7 @@ void CAIRO_COMPOSITOR::SetBuffer( unsigned int aBufferHandle )
         m_current = aBufferHandle - 1;
         *m_currentContext = m_buffers[m_current].context;
     }
+
 #ifdef __WXDEBUG__
     else
         wxLogDebug( wxT( "Tried to use a not existing buffer" ) );
@@ -141,6 +143,7 @@ void CAIRO_COMPOSITOR::DrawBuffer( unsigned int aBufferHandle )
         // Restore the transformation matrix
         cairo_set_matrix( m_mainContext, &m_matrix );
     }
+
 #ifdef __WXDEBUG__
     else
         wxLogDebug( wxT( "Tried to use a not existing buffer" ) );

common/gal/graphics_abstraction_layer.cpp

@@ -63,6 +63,33 @@ GAL::~GAL()
 }
 
 
+void GAL::ComputeWorldScreenMatrix()
+{
+    ComputeWorldScale();
+
+    worldScreenMatrix.SetIdentity();
+
+    MATRIX3x3D translation;
+    translation.SetIdentity();
+    translation.SetTranslation( 0.5 * screenSize );
+
+    MATRIX3x3D scale;
+    scale.SetIdentity();
+    scale.SetScale( VECTOR2D( worldScale, worldScale ) );
+
+    MATRIX3x3D flip;
+    flip.SetIdentity();
+    flip.SetScale( VECTOR2D( 1.0, 1.0 ) );
+
+    MATRIX3x3D lookat;
+    lookat.SetIdentity();
+    lookat.SetTranslation( -lookAtPoint );
+
+    worldScreenMatrix = translation * flip * scale * lookat * worldScreenMatrix;
+}
+
+
+
 void GAL::DrawGrid()
 {
     if( !gridVisibility )
@@ -136,7 +163,7 @@ void GAL::DrawGrid()
             if( ( j % gridTick == 0 && gridScreenSizeCoarse > gridDrawThreshold )
                 || gridScreenSizeDense > gridDrawThreshold )
             {
-                DrawGridLine( VECTOR2D( gridStartX * gridSize.x, j * gridSize.y ),
+                drawGridLine( VECTOR2D( gridStartX * gridSize.x, j * gridSize.y ),
                               VECTOR2D( gridEndX * gridSize.x,   j * gridSize.y ) );
             }
         }
@@ -155,7 +182,7 @@ void GAL::DrawGrid()
             if( ( i % gridTick == 0 && gridScreenSizeCoarse > gridDrawThreshold )
                 || gridScreenSizeDense > gridDrawThreshold )
             {
-                DrawGridLine( VECTOR2D( i * gridSize.x, gridStartY * gridSize.y ),
+                drawGridLine( VECTOR2D( i * gridSize.x, gridStartY * gridSize.y ),
                               VECTOR2D( i * gridSize.x, gridEndY * gridSize.y ) );
             }
         }

common/gal/opengl/gpu_manager.cpp

@@ -52,7 +52,7 @@ GPU_MANAGER* GPU_MANAGER::MakeManager( VERTEX_CONTAINER* aContainer )
 
 
 GPU_MANAGER::GPU_MANAGER( VERTEX_CONTAINER* aContainer ) :
-        m_isDrawing( false ), m_container( aContainer ), m_shader( NULL )
+    m_isDrawing( false ), m_container( aContainer ), m_shader( NULL )
 {
 }
 

common/gal/opengl/opengl_compositor.cpp

@@ -104,7 +104,7 @@ unsigned int OPENGL_COMPOSITOR::GetBuffer()
     wxASSERT( m_initialized );
 
     if( m_buffers.size() >= m_maxBuffers )
-        return 0;       // Unfortunately we have no more free buffers left
+        return 0; // Unfortunately we have no more free buffers left
 
     // GL_COLOR_ATTACHMENTn are consecutive integers
     GLuint attachmentPoint = GL_COLOR_ATTACHMENT0 + usedBuffers();
@@ -229,9 +229,11 @@ void OPENGL_COMPOSITOR::clean()
     {
         glDeleteTextures( 1, &it->textureTarget );
     }
+
     m_buffers.clear();
 
     m_initialized = false;
 }
 
+
 GLuint OPENGL_COMPOSITOR::m_currentFbo = 0;

common/gal/opengl/shader.cpp

@@ -37,12 +37,12 @@
 using namespace KiGfx;
 
 SHADER::SHADER() :
-        isProgramCreated( false ),
-        isShaderLinked( false ),
-        active( false ),
-        maximumVertices( 4 ),
-        geomInputType( GL_LINES ),
-        geomOutputType( GL_LINES )
+    isProgramCreated( false ),
+    isShaderLinked( false ),
+    active( false ),
+    maximumVertices( 4 ),
+    geomInputType( GL_LINES ),
+    geomOutputType( GL_LINES )
 {
 }
 
@@ -97,7 +97,8 @@ bool SHADER::Link()
     programInfo( programNumber );
 
     // Check the Link state
-    glGetObjectParameterivARB( programNumber, GL_OBJECT_LINK_STATUS_ARB, (GLint*) &isShaderLinked );
+    glGetObjectParameterivARB( programNumber, GL_OBJECT_LINK_STATUS_ARB,
+                               (GLint*) &isShaderLinked );
 
 #ifdef __WXDEBUG__
     if( !isShaderLinked )
@@ -253,6 +254,7 @@ bool SHADER::addSource( const std::string& aShaderSource, ShaderType aShaderType
     glCompileShader( shaderNumber );
     GLint status;
     glGetShaderiv( shaderNumber, GL_COMPILE_STATUS, &status );
+
     if( status != GL_TRUE )
     {
         wxLogError( wxT( "Shader compilation error" ) );
@@ -275,4 +277,3 @@ bool SHADER::addSource( const std::string& aShaderSource, ShaderType aShaderType
 
     return true;
 }
-

common/gal/opengl/vertex_manager.cpp

@@ -37,7 +37,7 @@
 using namespace KiGfx;
 
 VERTEX_MANAGER::VERTEX_MANAGER( bool aCached ) :
-        m_noTransform( true ), m_transform( 1.0f )
+    m_noTransform( true ), m_transform( 1.0f )
 {
     m_container.reset( VERTEX_CONTAINER::MakeContainer( aCached ) );
     m_gpu.reset( GPU_MANAGER::MakeManager( m_container.get() ) );
@@ -52,6 +52,7 @@ void VERTEX_MANAGER::Vertex( GLfloat aX, GLfloat aY, GLfloat aZ ) const
 {
     // Obtain the pointer to the vertex in the currently used container
     VERTEX* newVertex = m_container->Allocate( 1 );
+
     if( newVertex == NULL )
     {
         wxLogError( wxT( "Vertex allocation error" ) );
@@ -66,6 +67,7 @@ void VERTEX_MANAGER::Vertices( const VERTEX aVertices[], unsigned int aSize ) co
 {
     // Obtain pointer to the vertex in currently used container
     VERTEX* newVertex = m_container->Allocate( aSize );
+
     if( newVertex == NULL )
     {
         wxLogError( wxT( "Vertex allocation error" ) );
@@ -95,7 +97,7 @@ void VERTEX_MANAGER::FreeItem( VERTEX_ITEM& aItem ) const
 
 void VERTEX_MANAGER::ChangeItemColor( const VERTEX_ITEM& aItem, const COLOR4D& aColor ) const
 {
-    unsigned int size = aItem.GetSize();
+    unsigned int size   = aItem.GetSize();
     unsigned int offset = aItem.GetOffset();
 
     VERTEX* vertex = m_container->GetVertices( offset );
@@ -114,7 +116,7 @@ void VERTEX_MANAGER::ChangeItemColor( const VERTEX_ITEM& aItem, const COLOR4D& a
 
 void VERTEX_MANAGER::ChangeItemDepth( const VERTEX_ITEM& aItem, GLfloat aDepth ) const
 {
-    unsigned int size = aItem.GetSize();
+    unsigned int size   = aItem.GetSize();
     unsigned int offset = aItem.GetOffset();
 
     VERTEX* vertex = m_container->GetVertices( offset );
@@ -131,7 +133,7 @@ void VERTEX_MANAGER::ChangeItemDepth( const VERTEX_ITEM& aItem, GLfloat aDepth )
 VERTEX* VERTEX_MANAGER::GetVertices( const VERTEX_ITEM& aItem ) const
 {
     if( aItem.GetSize() == 0 )
-        return NULL;    // The item is not stored in the container
+        return NULL; // The item is not stored in the container
 
     return m_container->GetVertices( aItem.GetOffset() );
 }
@@ -158,6 +160,7 @@ void VERTEX_MANAGER::BeginDrawing() const
 void VERTEX_MANAGER::DrawItem( const VERTEX_ITEM& aItem ) const
 {
     int size = aItem.GetSize();
+
     if( size > 0 )
     {
         int offset = aItem.GetOffset();

common/view/wx_view_controls.cpp

@@ -85,7 +85,6 @@ void WX_VIEW_CONTROLS::onWheel( wxMouseEvent& event )
         else
             scrollSpeed = scrollVec.y;
 
-        VECTOR2D t = m_view->GetScreenPixelSize();
         VECTOR2D delta( event.ControlDown() ? -scrollSpeed : 0.0,
                         event.ShiftDown() ? -scrollSpeed : 0.0 );
 

include/gal/cairo/cairo_compositor.h

@@ -38,7 +38,6 @@
 
 namespace KiGfx
 {
-
 class CAIRO_COMPOSITOR : public COMPOSITOR
 {
 public:
@@ -67,25 +66,25 @@ protected:
     typedef boost::shared_array<unsigned int> BitmapPtr;
     typedef struct
     {
-        cairo_t* context;                   ///< Main texture handle
-        cairo_surface_t* surface;           ///< Point to which an image from texture is attached
-        BitmapPtr bitmap;                   ///< Pixel storage
+        cairo_t*            context;        ///< Main texture handle
+        cairo_surface_t*    surface;        ///< Point to which an image from texture is attached
+        BitmapPtr           bitmap;         ///< Pixel storage
     } CAIRO_BUFFER;
 
-    unsigned int                m_current;                ///< Currently used buffer handle
+    unsigned int            m_current;                ///< Currently used buffer handle
     typedef std::deque<CAIRO_BUFFER> CAIRO_BUFFERS;
 
     /// Pointer to the current context, so it can be changed
-    cairo_t**                   m_currentContext;
+    cairo_t**               m_currentContext;
 
     /// Rendering target used for compositing (the main display)
-    cairo_t*                    m_mainContext;
+    cairo_t*                m_mainContext;
 
     /// Transformation matrix
-    cairo_matrix_t              m_matrix;
+    cairo_matrix_t          m_matrix;
 
     /// Stores information about initialized buffers
-    CAIRO_BUFFERS               m_buffers;
+    CAIRO_BUFFERS           m_buffers;
 
     unsigned int m_stride;              ///< Stride to use given the desired format and width
     unsigned int m_bufferSize;          ///< Amount of memory needed to store a buffer
@@ -102,7 +101,6 @@ protected:
         return m_buffers.size();
     }
 };
-
 } // namespace KiGfx
 
 #endif /* COMPOSITOR_H_ */

include/gal/cairo/cairo_gal.h

@@ -45,9 +45,6 @@
 #endif
 #endif
 
-#define EXCEPTION_ZERO_CLIENT_RECTANGLE 0
-#define EXCEPTION_ZERO_CONTEXT          1
-
 /**
  * @brief Class CAIRO_GAL is the cairo implementation of the graphics abstraction layer.
  *
@@ -92,7 +89,7 @@ public:
     // ---------------
 
     /// @copydoc GAL::BeginDrawing()
-    virtual void BeginDrawing() throw (int);
+    virtual void BeginDrawing();
 
     /// @copydoc GAL::EndDrawing()
     virtual void EndDrawing();
@@ -103,19 +100,19 @@ public:
     /// @copydoc GAL::DrawSegment()
     virtual void DrawSegment( const VECTOR2D& aStartPoint, const VECTOR2D& aEndPoint, double aWidth );
 
-    /// @copydoc GAL::DrawPolyline()
-    virtual void DrawPolyline( std::deque<VECTOR2D>& aPointList );
-
     /// @copydoc GAL::DrawCircle()
     virtual void DrawCircle( const VECTOR2D& aCenterPoint, double aRadius );
 
     /// @copydoc GAL::DrawArc()
-    virtual void
-    DrawArc( const VECTOR2D& aCenterPoint, double aRadius, double aStartAngle, double aEndAngle );
+    virtual void DrawArc( const VECTOR2D& aCenterPoint, double aRadius,
+                          double aStartAngle, double aEndAngle );
 
     /// @copydoc GAL::DrawRectangle()
     virtual void DrawRectangle( const VECTOR2D& aStartPoint, const VECTOR2D& aEndPoint );
 
+    /// @copydoc GAL::DrawPolyline()
+    virtual void DrawPolyline( std::deque<VECTOR2D>& aPointList );
+
     /// @copydoc GAL::DrawPolygon()
     virtual void DrawPolygon( const std::deque<VECTOR2D>& aPointList );
 
@@ -149,24 +146,15 @@ public:
     /// @copydoc GAL::SetIsStroke()
     virtual void SetIsStroke( bool aIsStrokeEnabled );
 
-    /// @copydoc GAL::SetFillColor()
-    virtual void SetFillColor( const COLOR4D& aColor );
-
     /// @copydoc GAL::SetStrokeColor()
     virtual void SetStrokeColor( const COLOR4D& aColor );
 
-    /// @copydoc GAL::GetStrokeColor()
-    COLOR4D      GetStrokeColor();
-
-    /// @copydoc GAL::SetBackgroundColor()
-    virtual void SetBackgroundColor( const COLOR4D& aColor );
+    /// @copydoc GAL::SetFillColor()
+    virtual void SetFillColor( const COLOR4D& aColor );
 
     /// @copydoc GAL::SetLineWidth()
     virtual void SetLineWidth( double aLineWidth );
 
-    /// @copydoc GAL::GetLineWidth()
-    double       GetLineWidth();
-
     /// @copydoc GAL::SetLayerDepth()
     virtual void SetLayerDepth( double aLayerDepth );
 
@@ -221,33 +209,6 @@ public:
     // Handling the world <-> screen transformation
     // --------------------------------------------------------
 
-    /// @copydoc GAL::ComputeWorldScreenMatrix()
-    virtual void ComputeWorldScreenMatrix();
-
-    /// @copydoc GAL::GetWorldScreenMatrix()
-    MATRIX3x3D GetWorldScreenMatrix();
-
-    /// @copydoc GAL::SetWorldScreenMatrix()
-    void SetWorldScreenMatrix( MATRIX3x3D aMatrix );
-
-    /// @copydoc GAL::SetWorldUnitLength()
-    void SetWorldUnitLength( double aWorldUnitLength );
-
-    /// @copydoc GAL::SetScreenDPI()
-    void SetScreenDPI( double aScreenDPI );
-
-    /// @copydoc GAL::SetLookAtPoint()
-    void SetLookAtPoint( const VECTOR2D& aPoint );
-
-    /// @copydoc GAL::GetLookAtPoint()
-    VECTOR2D GetLookAtPoint();
-
-    /// @copydoc GAL::SetZoomFactor()
-    void SetZoomFactor( double aZoomFactor );
-
-    /// @copydoc GAL::GetZoomFactor()
-    double GetZoomFactor();
-
     /// @copydoc GAL::SaveScreen()
     virtual void SaveScreen();
 
@@ -264,9 +225,6 @@ public:
     /// @copydoc GAL::ComputeCursorToWorld()
     virtual VECTOR2D ComputeCursorToWorld( const VECTOR2D& aCursorPosition );
 
-    /// @copydoc GAL::SetIsCursorEnabled()
-    void SetIsCursorEnabled( bool aIsCursorEnabled );
-
     /// @copydoc GAL::DrawCursor()
     virtual void DrawCursor( VECTOR2D aCursorPosition );
 
@@ -295,7 +253,7 @@ public:
     }
 
 protected:
-    virtual void DrawGridLine( const VECTOR2D& aStartPoint, const VECTOR2D& aEndPoint );
+    virtual void drawGridLine( const VECTOR2D& aStartPoint, const VECTOR2D& aEndPoint );
 
 private:
     /// Super class definition
@@ -303,30 +261,29 @@ private:
 
     // Compositing variables
     boost::shared_ptr<CAIRO_COMPOSITOR> compositor; ///< Object for layers compositing
-    unsigned int mainBuffer;                        ///< Handle to the main buffer
-    unsigned int overlayBuffer;                     ///< Handle to the overlay buffer
+    unsigned int            mainBuffer;             ///< Handle to the main buffer
+    unsigned int            overlayBuffer;          ///< Handle to the overlay buffer
 
     // Variables related to wxWidgets
-    wxWindow*                   parentWindow;       ///< Parent window
-    wxEvtHandler*               mouseListener;      ///< Mouse listener
-    wxEvtHandler*               paintListener;      ///< Paint listener
-    unsigned int                bufferSize;         ///< Size of buffers cairoOutput, bitmapBuffers
-    unsigned char*              wxOutput;           ///< wxImage comaptible buffer
+    wxWindow*               parentWindow;           ///< Parent window
+    wxEvtHandler*           mouseListener;          ///< Mouse listener
+    wxEvtHandler*           paintListener;          ///< Paint listener
+    unsigned int            bufferSize;             ///< Size of buffers cairoOutput, bitmapBuffers
+    unsigned char*          wxOutput;               ///< wxImage comaptible buffer
 
     // Cursor variables
-    std::deque<wxColour>        savedCursorPixels;      ///< Saved pixels of the cursor
-    bool                        isDeleteSavedPixels;    ///< True, if the saved pixels can be discarded
-    wxPoint                     savedCursorPosition;    ///< The last cursor position
-    wxBitmap*                   cursorPixels;           ///< Cursor pixels
-    wxBitmap*                   cursorPixelsSaved;      ///< Saved cursor pixels
-    int                         cursorSize;             ///< Cursor size
+    std::deque<wxColour>    savedCursorPixels;      ///< Saved pixels of the cursor
+    bool                    isDeleteSavedPixels;    ///< True, if the saved pixels can be discarded
+    wxPoint                 savedCursorPosition;    ///< The last cursor position
+    wxBitmap*               cursorPixels;           ///< Cursor pixels
+    wxBitmap*               cursorPixelsSaved;      ///< Saved cursor pixels
+    int cursorSize;                                 ///< Cursor size
 
     /// Maximum number of arguments for one command
     static const int MAX_CAIRO_ARGUMENTS = 6;
 
     /// Definitions for the command recorder
-    enum GraphicsCommand
-    {
+    enum GraphicsCommand {
         CMD_SET_FILL,                               ///< Enable/disable filling
         CMD_SET_STROKE,                             ///< Enable/disable stroking
         CMD_SET_FILLCOLOR,                          ///< Set the fill color
@@ -392,18 +349,18 @@ private:
     /// @copydoc GAL::initCursor()
     virtual void initCursor( int aCursorSize );
 
-    /// Allocate the bitmaps for drawing
-    void allocateBitmaps();
-
-    /// Allocate the bitmaps for drawing
-    void deleteBitmaps();
-
     /// Prepare Cairo surfaces for drawing
     void initSurface();
 
     /// Destroy Cairo surfaces when are not needed anymore
     void deinitSurface();
 
+    /// Allocate the bitmaps for drawing
+    void allocateBitmaps();
+
+    /// Allocate the bitmaps for drawing
+    void deleteBitmaps();
+
     /// Prepare the compositor
     void setCompositor();
 

include/gal/graphics_abstraction_layer.h

@@ -231,7 +231,10 @@ public:
      *
      * @param aColor is the color for background filling.
      */
-    virtual void SetBackgroundColor( const COLOR4D& aColor ) = 0;
+    inline virtual void SetBackgroundColor( const COLOR4D& aColor )
+    {
+        backgroundColor = aColor;
+    }
 
     /**
      * @brief Set the line width.
@@ -417,7 +420,7 @@ public:
     // --------------------------------------------------------
 
     /// @brief Compute the world <-> screen transformation matrix
-    virtual void ComputeWorldScreenMatrix() = 0;
+    virtual void ComputeWorldScreenMatrix();
 
     /**
      * @brief Get the world <-> screen transformation matrix.
@@ -745,7 +748,6 @@ protected:
 
     bool               isFillEnabled;          ///< Is filling of graphic objects enabled ?
     bool               isStrokeEnabled;        ///< Are the outlines stroked ?
-    bool               isSetAttributes;        ///< True, if the attributes have been set
 
     COLOR4D            backgroundColor;        ///< The background color
     COLOR4D            fillColor;              ///< The fill color
@@ -784,7 +786,7 @@ protected:
      * @param aStartPoint is the start point of the line.
      * @param aEndPoint is the end point of the line.
      */
-    virtual void DrawGridLine( const VECTOR2D& aStartPoint, const VECTOR2D& aEndPoint ) = 0;
+    virtual void drawGridLine( const VECTOR2D& aStartPoint, const VECTOR2D& aEndPoint ) = 0;
 
     /**
      * @brief Initialize the cursor.

include/gal/opengl/cached_container.h

@@ -94,12 +94,12 @@ protected:
     unsigned int        m_itemSize;
 
     /**
-    * Function reallocate()
-    * resizes the chunk that stores the current item to the given size.
-    *
-    * @param aSize is the number of vertices to be stored.
-    * @return offset of the new chunk.
-    */
+     * Function reallocate()
+     * resizes the chunk that stores the current item to the given size.
+     *
+     * @param aSize is the number of vertices to be stored.
+     * @return offset of the new chunk.
+     */
     virtual unsigned int reallocate( unsigned int aSize );
 
     /**

include/gal/opengl/opengl_compositor.h

@@ -37,7 +37,6 @@
 
 namespace KiGfx
 {
-
 class OPENGL_COMPOSITOR : public COMPOSITOR
 {
 public:
@@ -94,7 +93,6 @@ protected:
         return m_buffers.size();
     }
 };
-
 } // namespace KiGfx
 
 #endif /* COMPOSITOR_H_ */

include/gal/opengl/vertex_common.h

@@ -35,9 +35,8 @@
 namespace KiGfx
 {
 // Possible types of shaders
-enum SHADER_TYPE
-{
-    SHADER_NONE             = 0,
+enum SHADER_TYPE {
+    SHADER_NONE = 0,
     SHADER_LINE,
     SHADER_FILLED_CIRCLE,
     SHADER_STROKED_CIRCLE,
@@ -60,7 +59,7 @@ const unsigned int CoordStride  = CoordSize / sizeof(GLfloat);
 // Offset of color data from the beginning of each vertex data
 const unsigned int ColorOffset  = offsetof(VERTEX, r);
 const unsigned int ColorSize    = sizeof(VERTEX().r) + sizeof(VERTEX().g) +
-                                    sizeof(VERTEX().b) + sizeof(VERTEX().a);
+                                  sizeof(VERTEX().b) + sizeof(VERTEX().a);
 const unsigned int ColorStride  = ColorSize / sizeof(GLubyte);
 
 // Shader attributes