comparison widgets/Plotter.cpp @ 240:e006f4a57f86

add labels in plotter widget
fix some bugs in the graphical equalizer

 {
 	//m_curveMask = new int[m_signalWidth];
 	for(int i = 0 ; i < m_signalWidth ; i++){
 		m_curveMask.push_back(0);
 	}
-
-	setMinimumSize(QSize(m_signalWidth + 10, m_signalHeight + 10));
+	m_oldCurveMask = m_curveMask;
+
+	setMinimumSize(QSize(m_signalWidth + 2*m_margin, m_signalHeight + 2*m_margin + 10));
 
 	refreshPixmap();
 
 }
 

 			}
 			m_curveMask[x] = y;
 			m_lastPoint.setX(x);
 			m_lastPoint.setY(y);
 			refreshPixmap();
+			emit filterChanged(m_curveMask);
 		}
 	}
 }
 
 void Plotter::mouseReleaseEvent(QMouseEvent *event){
 	if (m_enableDrawCurve)
 	{
 		if ((event->button() == Qt::LeftButton) && m_curveMaskActive) {
 			m_curveMaskActive = false;
 			unsetCursor();
-			emit filterChanged(m_curveMask);
+			//emit filterChanged(m_curveMask);
 		}
 	}
 }
 
 void Plotter::drawGrid(QPainter *painter){
 	QPixmap pm(":icons/grid.png");
+	painter->setPen(Qt::white);
 	painter->drawPixmap(0,0,pm);
+	
+
+	/**VLines **************/ 
+
+	// middle line
+	painter->drawLine(m_signalWidth/2+m_margin, m_margin, m_signalWidth/2+m_margin , m_signalHeight + m_margin);
+	//quater lines
+	painter->drawLine(m_signalWidth/4+m_margin, m_margin, m_signalWidth/4+m_margin , m_signalHeight + m_margin);
+	painter->drawLine(3*m_signalWidth/4+m_margin, m_margin, 3*m_signalWidth/4+m_margin , m_signalHeight + m_margin);
+	
+	// border lines
+	painter->drawLine(m_margin, m_margin, m_margin , m_signalHeight + m_margin);
+	painter->drawLine(m_signalWidth+m_margin, m_margin, m_signalWidth+m_margin , m_signalHeight + m_margin);
+
+	/** HLines *************/
+
+
+	/** Labels *************/
+	painter->setPen(Qt::darkGray);
+	painter->drawText(0, m_signalHeight+2*m_margin+10, "10Hz");
+	painter->drawText(m_signalWidth/4 -10, m_signalHeight+2*m_margin+10, "100Hz");
+	painter->drawText(m_signalWidth/2 -10, m_signalHeight+2*m_margin+10, "1000Hz");
+	painter->drawText(3*m_signalWidth/4 -10, m_signalHeight+2*m_margin+10, "10000Hz");
+	painter->drawText(m_signalWidth -22, m_signalHeight+2*m_margin+10, "22KHz");
+
+
 }
 
 void Plotter::drawCurve(QPainter *painter){
 	//painter->setRenderHint (QPainter::Antialiasing, true );
 	QPolygonF polyline(m_signalWidth);

 	m_margin = margin;
 }
 
 void Plotter::setFilter(float* filter)
 {
+
 	m_curveMask.clear();
 	for (int i=0; i<m_signalWidth; i++)
 	{
 		m_curveMask.push_back((int) (m_signalHeight - filter[i]*(m_signalHeight/2-1)));
 	}
 	refreshPixmap();
 }
 
 void Plotter::enableDrawCurve(bool enable)
 {
+	if(enable!=m_enableDrawCurve){
+		QVector<float> aux = m_curveMask;
+		m_curveMask = m_oldCurveMask;
+		m_oldCurveMask = aux;
+		refreshPixmap();
+		if(enable){
+			emit filterChanged(m_curveMask);
+		}
+	}
 	m_enableDrawCurve = enable;
 }