Ostatnie poprawki - do przetestowania z starymi programami

3electrons · Dec 30, 2014 · 0f23e1f · 0f23e1f
1 parent 3ae2de1
commit 0f23e1f
Show file tree

Hide file tree

Showing 6 changed files with 696 additions and 679 deletions.
diff --git a/Flags.pri b/Flags.pri
@@ -6,8 +6,8 @@ linux-g++ {
 
  #QMAKE_CXX = distcc  
  #QMAKE_CXXFLAGS_RELEASE  = -g3 -Wall -pg 
- QMAKE_CXXFLAGS_RELEASE = -march=core2 -O3 -pipe -mfpmath=sse -Wall
- QMAKE_LFLAGS_RELEASE    =
+ #QMAKE_CXXFLAGS_RELEASE = -march=core2 -O3 -pipe -mfpmath=sse -Wall
+ #QMAKE_LFLAGS_RELEASE    =
 
  INSTALL_INCLUDEDIR = /usr/include
  INSTALL_LIBDIR     = /usr/lib 

diff --git a/analogwidgets/analogwidgets/chart.h b/analogwidgets/analogwidgets/chart.h
@@ -103,7 +103,7 @@ class Chart :  public WidgetWithBackground
     void paintEvent(QPaintEvent *event); 	 // inherited from QMyWidgetWithBackgroun
     void contextMenuEvent ( QContextMenuEvent * e );
     void mouseMoveEvent ( QMouseEvent * e );
-
+    void wheelEvent(QWheelEvent *e);
     //////////////// H E L P E R S ////////////////
 
     /** This method build decorators chain if you like you may substitute it and 
@@ -124,7 +124,7 @@ class Chart :  public WidgetWithBackground
     double channelMaximum() const;   
     QColor channelColor()   const; 
     QString channelName()   const; 
-    
+
 
     double zoom()		const; 
 
@@ -152,14 +152,15 @@ class Chart :  public WidgetWithBackground
 
     bool showVerticalCursor() const;
     bool showHorizontalCursor() const;
+
 
   public slots:
 
     void setPosition      (double i);
     void setPosition      (int i); 
     void setSize          (double i);
     void setSize 	      (int i); 
-    
+
     void setChannelMinimum(double i); 
     void setChannelMaximum(double i); 
     void setChannelColor  (QColor i);
@@ -213,6 +214,7 @@ class Chart :  public WidgetWithBackground
     void contextMenuActionTriggered(QAction * a);
 
   protected:
+
 
     /** ScaleGrid structure */
     ScaleGrid m_scalegrid;