Commit edffc381 authored by Marcus D. Hanwell's avatar Marcus D. Hanwell
Browse files

The Qt string rendering is not really needed

If we want to retain it then the object factory could be used.

Change-Id: Ic305dd5b3beb3ca46baf9dfdeb952fc461a8c760
parent d8f98c51
......@@ -15,10 +15,6 @@
#include "vtkOpenGL2ContextDevice2D.h"
#ifdef VTK_USE_QT
# include <QApplication>
# include "vtkQtStringToImage.h"
#endif
#include "vtkFreeTypeStringToImage.h"
#include "vtkVector.h"
......
......@@ -15,10 +15,6 @@
#include "vtkOpenGLContextDevice2D.h"
#ifdef VTK_USE_QT
# include <QApplication>
# include "vtkQtStringToImage.h"
#endif
#include "vtkFreeTypeStringToImage.h"
#include "vtkVector.h"
......@@ -1110,14 +1106,6 @@ void vtkOpenGLContextDevice2D::EnableClipping(bool enable)
//-----------------------------------------------------------------------------
bool vtkOpenGLContextDevice2D::SetStringRendererToFreeType()
{
#ifdef VTK_USE_QT
// We will likely be using the Qt rendering strategy
if (this->TextRenderer->IsA("vtkQtStringToImage"))
{
this->TextRenderer->Delete();
this->TextRenderer = vtkFreeTypeStringToImage::New();
}
#endif
// FreeType is the only choice - nothing to do here
return true;
}
......@@ -1125,18 +1113,6 @@ bool vtkOpenGLContextDevice2D::SetStringRendererToFreeType()
//-----------------------------------------------------------------------------
bool vtkOpenGLContextDevice2D::SetStringRendererToQt()
{
#ifdef VTK_USE_QT
// We will likely be using the Qt rendering strategy
if (this->TextRenderer->IsA("vtkQtStringToImage"))
{
return true;
}
else
{
this->TextRenderer->Delete();
this->TextRenderer = vtkQtStringToImage::New();
}
#endif
// The Qt based strategy is not available
return false;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment