fixed an error in band line rendering

David Mayerich
1 parent 4d9fea5b
Showing 3 changed files with 14 additions and 9 deletions Show diff stats
main.cpp
spectrumwindow.cpp
win32/hsiview.exe
@@ -13,8 +13,5 @@ int main(int argc, char *argv[])
 	w.loadImage(fileName);
     w.show();
-	//SpectrumWindow s(&w);
-	//s.show();
-
     return a.exec();
 }
@@ -15,9 +15,6 @@ SpectrumWindow::SpectrumWindow(QWidget *parent) :
 	//create a line for the current band
 	bandline = new QCPItemStraightLine(ui->spectrumPlot);
 	ui->spectrumPlot->addItem(bandline);
-
-	
-
 }
 SpectrumWindow::~SpectrumWindow()
@@ -39,11 +36,13 @@ void SpectrumWindow::plotSpectrum(QVector&lt;double&gt; x, QVector&lt;double&gt; y){
 	ui->spectrumPlot->yAxis->setRange(y_min, y_max);
 	//add the graph to the plot
-	ui->spectrumPlot->addGraph();
 	ui->spectrumPlot->graph(0)->setData(x, y);
 	//redraw the plot
 	ui->spectrumPlot->replot();
+
+	std::cout<<"Items in the plot: "<<ui->spectrumPlot->itemCount()<<std::endl;
+	std::cout<<bandline->point1->coords().x()<<", "<<bandline->point1->coords().y()<<std::endl;
 }
 void SpectrumWindow::initPlot(double x_min, double x_max, double y_min, double y_max, QString x_title, QString y_title){
@@ -54,6 +53,9 @@ void SpectrumWindow::initPlot(double x_min, double x_max, double y_min, double y
 	ui->spectrumPlot->xAxis->setRange(x_min, x_max);
 	ui->spectrumPlot->yAxis->setRange(y_min, y_max);
+	//add a graph to the plot
+	ui->spectrumPlot->addGraph();
+
 	//set the initial position of the band line
 	double xmid = (x_max + x_min) / 2;
 	std::cout<<"xmid: "<<xmid<<std::endl;
@@ -78,7 +80,7 @@ void SpectrumWindow::resizeEvent(QResizeEvent* event){
 bool SpectrumWindow::eventFilter(QObject *target, QEvent *event)
 {
-    if(target == ui->spectrumPlot && event->type() == QEvent::MouseMove)
+    /*if(target == ui->spectrumPlot && event->type() == QEvent::MouseMove)
     {
         QMouseEvent *_mouseEvent = static_cast<QMouseEvent*>(event);
@@ -93,8 +95,10 @@ bool SpectrumWindow::eventFilter(QObject *target, QEvent *event)
 		//set the position of the band line
 		bandline->point1->setCoords(x, 0);
 		bandline->point2->setCoords(x, 1);
+		std::cout<<"coords set to: "<<x<<std::endl;
     }
-	else if(target == ui->spectrumPlot && event->type() == QEvent::MouseButtonPress)
+	else */
+	if(target == ui->spectrumPlot && event->type() == QEvent::MouseButtonPress)
     {
         QMouseEvent *_mouseEvent = static_cast<QMouseEvent*>(event);
@@ -112,6 +116,10 @@ bool SpectrumWindow::eventFilter(QObject *target, QEvent *event)
 		//set the position of the band line
 		bandline->point1->setCoords(x, 0);
 		bandline->point2->setCoords(x, 1);
+		std::cout<<"coords set to: "<<x<<std::endl;
+
+		//replot the spectrum with the new band line position
+		ui->spectrumPlot->replot();
     }