继续改进显示刷新问题

modules/sinks/sink_plots/dialogplots.cpp

@@ -118,7 +118,7 @@ void DialogPlots::deal_package(QByteArray package)
 		pv->setChart(chart);
 		chart->setTitle(tr("SUB%1 PATH%2").arg(pheader->subject_id).arg(pheader->path_id));
 
-		pv->setRubberBand(QChartView::VerticalRubberBand);
+		pv->setRubberBand(channels<2?QChartView::VerticalRubberBand:QChartView::RectangleRubberBand);
 
 		chart->addSeries(serials);
 		serials->attachAxis(ax);
@@ -349,7 +349,7 @@ void DialogPlots::timerEvent(QTimerEvent *event)
 			const int pts = m_plot_buffer[hash_subidx].size();
 
 			QList<QVector<double> >  & avgList = m_plot_lastUpdates[hash_subidx];
-			bool clear_lst = false;
+			bool clear_lst = channels>1?true: false;
 			for (QList<QVector<double> >::iterator pit = avgList.begin();pit!=avgList.end();++pit)
 			{
 				if (pit->size()!=pts)
@@ -480,13 +480,20 @@ void DialogPlots::timerEvent(QTimerEvent *event)
 				needup_x = false,needup_y = false;
 
 
-			if (ui->checkBox_auto_reser->isChecked() || needup_x)
+			if (ui->checkBox_auto_reser->isChecked() || needup_x || needup_y)
 			{
 				if (needup_x==true)
-					ax->setRange(new_min_x,new_max_x);
+				{
+					double cumin = ax->min();
+					double cumax = ax->max();
+					ax->setRange(new_min_x<cumin?new_min_x:cumin,new_max_x > cumax?new_max_x:cumax);
+				}
 				if (needup_y==true)
-					ay->setRange(new_min_y,new_max_y);
-
+				{
+					double cumin = ay->min();
+					double cumax = ay->max();
+					ay->setRange(new_min_y<cumin?new_min_y:cumin,new_max_y > cumax?new_max_y:cumax);
+				}
 			}
 		}
 		refid = startTimer(25);

modules/uhd/uhd_usrp_io/uhd_io.cpp

@@ -209,7 +209,7 @@ int do_iio(const cmdlineParser & args)
 								tag_tx_plain * plan = (tag_tx_plain *) (packagedta.data());
 								if (total_points_left<=0)
 									total_points_left = plan->length_left;
-								fprintf(stderr,"plan %d points\n",plan->length_left);
+								//fprintf(stderr,"plan %d points\n",plan->length_left);
 								mtx_plan.lock();
 								tx_plan.push_back(*plan);
 								mtx_plan.unlock();
@@ -221,7 +221,7 @@ int do_iio(const cmdlineParser & args)
 						}
 						else
 						{
-							fprintf(stderr,"recv %d points\n",packagedta.size()/2/sizeof(SPTYPE));
+							//fprintf(stderr,"recv %d points\n",packagedta.size()/2/sizeof(SPTYPE));
 							for (int ch = 0; ch < tx_channel_count;++ch)
 							{
 								if (header.subject_id == i_wav_tx[ch])
@@ -652,7 +652,7 @@ int do_iio(const cmdlineParser & args)
 								&&  tx_pos[ch] + (long long) (total_points_left ) > stdin_pos[ch]
 								)
 						{
-							fprintf(stderr,"total_points LESS! for %d points\n",total_points_left);
+							fprintf(stderr,"total_points LESS! for %lld points\n",total_points_left);
 							can_send = false;
 							continue;
 						}
@@ -764,9 +764,8 @@ int do_iio(const cmdlineParser & args)
 
 		while (!stop_signal_called)
 		{
-			fprintf(stderr,"\nRX:");
+			fprintf(stderr,"RX:");
 			fprintf (stderr,"%lld,%lld;",rx_pos,stdout_pos);
-			fprintf(stderr,"\n");
 			fprintf(stderr,"TX:");
 			for (int ch = 0;ch<tx_channel_count;++ch)
 				fprintf (stderr,"%d:%lld,%lld;",ch,stdin_pos[ch],tx_pos[ch]);