mirror of
				https://github.com/saitohirga/WSJT-X.git
				synced 2025-10-30 20:40:28 -04:00 
			
		
		
		
	Merge branch 'release-2.4.0' of bitbucket.org:k1jt/wsjtx into release-2.4.0
This commit is contained in:
		
						commit
						cf538aa475
					
				| @ -21,7 +21,6 @@ set (SAMPLE_FILES | ||||
|   JT9/130418_1742.wav | ||||
|   MSK144/181211_120500.wav | ||||
|   MSK144/181211_120800.wav | ||||
|   QRA64/QRA64C/161113_0111.wav | ||||
|   WSPR/150426_0918.wav | ||||
|   Q65/30A_Ionoscatter_6m/201203_022700.wav | ||||
|   Q65/30A_Ionoscatter_6m/201203_022800.wav | ||||
|  | ||||
| @ -283,20 +283,22 @@ void CPlotter::draw(float swide[], bool bScroll, bool bRed) | ||||
|       int x,y; | ||||
|       float freq,xdt,sync,sync2; | ||||
|       f >> xdt; | ||||
|       for(int i=0; i<99999; i++) { | ||||
|         f >> freq >> sync >> sync2; | ||||
|         if(f.eof()) break; | ||||
|         x=XfromFreq(freq); | ||||
|         if(sync > -99.0 and sync != 0.0) { | ||||
|           y=m_h2*(0.9 - 0.09*gain2d*sync) - m_plot2dZero - 10; | ||||
|           LineBuf2[k2].setX(x);                          //Red sync curve
 | ||||
|           LineBuf2[k2].setY(y); | ||||
|           k2++; | ||||
|       if(f) { | ||||
|         for(int i=0; i<99999; i++) { | ||||
|           f >> freq >> sync >> sync2; | ||||
|           if(!f or f.eof()) break; | ||||
|           x=XfromFreq(freq); | ||||
|           if(sync > -99.0 and sync != 0.0) { | ||||
|             y=m_h2*(0.9 - 0.09*gain2d*sync) - m_plot2dZero - 10; | ||||
|             LineBuf2[k2].setX(x);                          //Red sync curve
 | ||||
|             LineBuf2[k2].setY(y); | ||||
|             k2++; | ||||
|           } | ||||
|           y=m_h2*(0.9 - 0.09*gain2d*sync2) - m_plot2dZero; | ||||
|           LineBuf3[k].setX(x);                            //Orange sync curve
 | ||||
|           LineBuf3[k].setY(y); | ||||
|           k++; | ||||
|         } | ||||
|         y=m_h2*(0.9 - 0.09*gain2d*sync2) - m_plot2dZero; | ||||
|         LineBuf3[k].setX(x);                            //Orange sync curve
 | ||||
|         LineBuf3[k].setY(y); | ||||
|         k++; | ||||
|       } | ||||
|       f.close(); | ||||
|      QPen pen0(Qt::red,2); | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user