mirror of
				https://github.com/f4exb/sdrangel.git
				synced 2025-11-04 05:30:32 -05:00 
			
		
		
		
	Merge pull request #1940 from srcejon/freq_scanner
Star Tracker: Handle negative flux values in .srd file.
This commit is contained in:
		
						commit
						2747b61402
					
				@ -2279,7 +2279,8 @@ bool StarTrackerGUI::readSolarFlux()
 | 
				
			|||||||
            // HHMMSS 245    410     610    1415   2695   4995   8800  15400   Mhz
 | 
					            // HHMMSS 245    410     610    1415   2695   4995   8800  15400   Mhz
 | 
				
			||||||
            // 000000 000019 000027 000037 000056 000073 000116 000202 000514  sfu
 | 
					            // 000000 000019 000027 000037 000056 000073 000116 000202 000514  sfu
 | 
				
			||||||
            // Occasionally, file will contain ////// in a column, presumably to indicate no data
 | 
					            // Occasionally, file will contain ////// in a column, presumably to indicate no data
 | 
				
			||||||
            QRegExp re("([0-9]{2})([0-9]{2})([0-9]{2}) ([0-9\\/]+) ([0-9\\/]+) ([0-9\\/]+) ([0-9\\/]+) ([0-9\\/]+) ([0-9\\/]+) ([0-9\\/]+) ([0-9\\/]+)");
 | 
					            // Values can be negative
 | 
				
			||||||
 | 
					            QRegExp re("([0-9]{2})([0-9]{2})([0-9]{2}) (-?[0-9\\/]+) (-?[0-9\\/]+) (-?[0-9\\/]+) (-?[0-9\\/]+) (-?[0-9\\/]+) (-?[0-9\\/]+) (-?[0-9\\/]+) (-?[0-9\\/]+)");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            if (re.indexIn(string) != -1)
 | 
					            if (re.indexIn(string) != -1)
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user