diff --git a/measurementDataService_config.ini b/measurementDataService_config.ini index 028bd65..c54de1b 100644 --- a/measurementDataService_config.ini +++ b/measurementDataService_config.ini @@ -5,4 +5,7 @@ httpPath=monitors/data/subscriptions websocketPath=monitors/data/realtime/stream [HistoricalData] -baseUrl=http://192.168.46.30:8888/api/points \ No newline at end of file +baseUrl=http://192.168.46.30:8888/api/points +timeout=3000 +maxRetries=3 +retryInterval=2000 \ No newline at end of file diff --git a/util/TimeLine/timeLineItem.cpp b/util/TimeLine/timeLineItem.cpp index 376e812..7523b22 100644 --- a/util/TimeLine/timeLineItem.cpp +++ b/util/TimeLine/timeLineItem.cpp @@ -601,8 +601,8 @@ QDateTime TimeLineItem::time() void TimeLineItem::zoomIn() { d_ptr->m_scaleFactor++; - if(d_ptr->m_scaleFactor > (int)TU_MSecond_10) - d_ptr->m_scaleFactor = (int)TU_MSecond_10; + if(d_ptr->m_scaleFactor > (int)TU_MSecond_50) + d_ptr->m_scaleFactor = (int)TU_MSecond_50; d_ptr->m_curTimeUnit = (TimeUnit)d_ptr->m_scaleFactor; prepareGeometryChange();