cmake makefile and code changes to support qwt

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@5667 383ad7c9-94d9-4d36-a494-682f7c89f535

CMakeLists.txt

+include(plugin)
+
+find_package(Qwt5)
+
+if(Qwt5_Qt4_FOUND)
+  add_definitions(-DWITH_QWT)
+  MESSAGE(STATUS, "include path: ${Qwt5_INCLUDE_DIR}")
+  openflipper_plugin(INCDIRS ${Qwt5_INCLUDE_DIR} LIBRARIES ${Qwt5_Qt4_LIBRARY})
+else()
+  openflipper_plugin()
+endif()

textureProperties.cc

@@ -34,7 +34,8 @@
 
 #include "textureProperties.hh"
 
-#ifdef QWT
+#ifdef WITH_QWT
+#warning qwt defined in texturecontrol
   #include <qwt_plot_grid.h>
   #include <qwt_text.h>
   #include <qwt_plot.h>
@@ -67,7 +68,7 @@ texturePropertiesWidget::texturePropertiesWidget(QWidget *parent)
 
     texData_ = 0;
 
-    #ifdef QWT
+    #ifdef WITH_QWT
       QGridLayout* layout = new QGridLayout( originalData);
 
       originalDataHistogram_ = new QwtPlot(0);
@@ -206,7 +207,7 @@ void texturePropertiesWidget::textureChanged(QListWidgetItem* _item){
 
 
 void texturePropertiesWidget::setOriginalData(std::vector< double > _x, std::vector< double > _y  ) {
-  #ifdef QWT
+  #ifdef WITH_QWT
     double minx = FLT_MIN;
     double maxx = FLT_MIN;
     double miny = FLT_MAX;

textureProperties.hh

@@ -36,7 +36,7 @@
 #include "TextureData.hh"
 #include <QtGui>
 
-#ifdef QWT
+#ifdef WITH_QWT
   #include <qwt_plot_curve.h>
 #endif
 
@@ -73,7 +73,7 @@ class texturePropertiesWidget : public QDialog, public Ui::Dialog
     QString      textureName_;
     int          id_;
 
-#ifdef QWT
+#ifdef WITH_QWT
     QwtPlot* originalDataHistogram_;
     QwtPlotCurve histogramCurve_;
 #endif