mirror of
				https://github.com/ciphervance/supercell-wx.git
				synced 2025-10-31 15:20:05 +00:00 
			
		
		
		
	Adding plot time to radar view
This commit is contained in:
		
							parent
							
								
									28b4f31488
								
							
						
					
					
						commit
						c22db501b3
					
				
					 3 changed files with 29 additions and 1 deletions
				
			
		|  | @ -8,7 +8,7 @@ set(CMAKE_AUTOUIC ON) | ||||||
| set(CMAKE_AUTOMOC ON) | set(CMAKE_AUTOMOC ON) | ||||||
| set(CMAKE_AUTORCC ON) | set(CMAKE_AUTORCC ON) | ||||||
| 
 | 
 | ||||||
| set(CMAKE_CXX_STANDARD 17) | set(CMAKE_CXX_STANDARD 20) | ||||||
| set(CMAKE_CXX_STANDARD_REQUIRED ON) | set(CMAKE_CXX_STANDARD_REQUIRED ON) | ||||||
| 
 | 
 | ||||||
| find_package(Boost) | find_package(Boost) | ||||||
|  |  | ||||||
|  | @ -17,6 +17,9 @@ static const std::string logPrefix_ = "[scwx::qt::view::radar_view] "; | ||||||
| static constexpr uint32_t VERTICES_PER_BIN  = 6; | static constexpr uint32_t VERTICES_PER_BIN  = 6; | ||||||
| static constexpr uint32_t VALUES_PER_VERTEX = 2; | static constexpr uint32_t VALUES_PER_VERTEX = 2; | ||||||
| 
 | 
 | ||||||
|  | static std::chrono::system_clock::time_point | ||||||
|  | TimePoint(uint16_t modifiedJulianDate, uint32_t milliseconds); | ||||||
|  | 
 | ||||||
| class RadarViewImpl | class RadarViewImpl | ||||||
| { | { | ||||||
| public: | public: | ||||||
|  | @ -24,6 +27,7 @@ public: | ||||||
|                           std::shared_ptr<QMapboxGL>             map) : |                           std::shared_ptr<QMapboxGL>             map) : | ||||||
|        radarManager_(radarManager), |        radarManager_(radarManager), | ||||||
|        map_(map), |        map_(map), | ||||||
|  |        plotTime_(), | ||||||
|        colorTable_ {boost::gil::rgba8_pixel_t(0, 128, 0, 255), |        colorTable_ {boost::gil::rgba8_pixel_t(0, 128, 0, 255), | ||||||
|                     boost::gil::rgba8_pixel_t(255, 192, 0, 255), |                     boost::gil::rgba8_pixel_t(255, 192, 0, 255), | ||||||
|                     boost::gil::rgba8_pixel_t(255, 0, 0, 255)} |                     boost::gil::rgba8_pixel_t(255, 0, 0, 255)} | ||||||
|  | @ -38,6 +42,8 @@ public: | ||||||
|    std::vector<uint8_t>  dataMoments8_; |    std::vector<uint8_t>  dataMoments8_; | ||||||
|    std::vector<uint16_t> dataMoments16_; |    std::vector<uint16_t> dataMoments16_; | ||||||
| 
 | 
 | ||||||
|  |    std::chrono::system_clock::time_point plotTime_; | ||||||
|  | 
 | ||||||
|    std::vector<boost::gil::rgba8_pixel_t> colorTable_; |    std::vector<boost::gil::rgba8_pixel_t> colorTable_; | ||||||
| }; | }; | ||||||
| 
 | 
 | ||||||
|  | @ -109,6 +115,11 @@ void RadarView::LoadColorTable(std::shared_ptr<common::ColorTable> colorTable) | ||||||
|    emit ColorTableLoaded(); |    emit ColorTableLoaded(); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | std::chrono::system_clock::time_point RadarView::PlotTime() | ||||||
|  | { | ||||||
|  |    return p->plotTime_; | ||||||
|  | } | ||||||
|  | 
 | ||||||
| void RadarView::UpdatePlot() | void RadarView::UpdatePlot() | ||||||
| { | { | ||||||
|    BOOST_LOG_TRIVIAL(debug) << logPrefix_ << "UpdatePlot()"; |    BOOST_LOG_TRIVIAL(debug) << logPrefix_ << "UpdatePlot()"; | ||||||
|  | @ -130,6 +141,9 @@ void RadarView::UpdatePlot() | ||||||
|    auto                       radarData = level2Data->radar_data()[0]; |    auto                       radarData = level2Data->radar_data()[0]; | ||||||
|    wsr88d::rda::DataBlockType blockType = wsr88d::rda::DataBlockType::MomentRef; |    wsr88d::rda::DataBlockType blockType = wsr88d::rda::DataBlockType::MomentRef; | ||||||
| 
 | 
 | ||||||
|  |    p->plotTime_ = TimePoint(radarData[0]->modified_julian_date(), | ||||||
|  |                             radarData[0]->collection_time()); | ||||||
|  | 
 | ||||||
|    // Calculate vertices
 |    // Calculate vertices
 | ||||||
|    timer.start(); |    timer.start(); | ||||||
| 
 | 
 | ||||||
|  | @ -339,6 +353,17 @@ void RadarView::UpdatePlot() | ||||||
|    emit PlotUpdated(); |    emit PlotUpdated(); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | static std::chrono::system_clock::time_point | ||||||
|  | TimePoint(uint16_t modifiedJulianDate, uint32_t milliseconds) | ||||||
|  | { | ||||||
|  |    using namespace std::chrono; | ||||||
|  |    using sys_days       = time_point<system_clock, days>; | ||||||
|  |    constexpr auto epoch = sys_days {1969y / December / 31d}; | ||||||
|  | 
 | ||||||
|  |    return epoch + (modifiedJulianDate * 24h) + | ||||||
|  |           std::chrono::milliseconds {milliseconds}; | ||||||
|  | } | ||||||
|  | 
 | ||||||
| } // namespace view
 | } // namespace view
 | ||||||
| } // namespace qt
 | } // namespace qt
 | ||||||
| } // namespace scwx
 | } // namespace scwx
 | ||||||
|  |  | ||||||
|  | @ -3,6 +3,7 @@ | ||||||
| #include <scwx/common/color_table.hpp> | #include <scwx/common/color_table.hpp> | ||||||
| #include <scwx/qt/manager/radar_manager.hpp> | #include <scwx/qt/manager/radar_manager.hpp> | ||||||
| 
 | 
 | ||||||
|  | #include <chrono> | ||||||
| #include <memory> | #include <memory> | ||||||
| #include <vector> | #include <vector> | ||||||
| 
 | 
 | ||||||
|  | @ -37,6 +38,8 @@ public: | ||||||
|    void Initialize(); |    void Initialize(); | ||||||
|    void LoadColorTable(std::shared_ptr<common::ColorTable> colorTable); |    void LoadColorTable(std::shared_ptr<common::ColorTable> colorTable); | ||||||
| 
 | 
 | ||||||
|  |    std::chrono::system_clock::time_point PlotTime(); | ||||||
|  | 
 | ||||||
| public slots: | public slots: | ||||||
|    void UpdatePlot(); |    void UpdatePlot(); | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Dan Paulat
						Dan Paulat