From 8afbc5ff9401a7221f3ad620c605e83b55199393 Mon Sep 17 00:00:00 2001 From: goldenhawking Date: Mon, 15 Aug 2016 18:49:28 +0800 Subject: [PATCH] 1. Initial OK message "MAP_INITED" should be only emitted when all plugins is loades correctly. 2. DIsplay mouse action positions in grid view --- qtviewer_planetosm/osm_frame_widget.cpp | 13 ++++++------- qtvplugin_grid/qtvplugin_grid.cpp | 12 ++++++++++++ 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/qtviewer_planetosm/osm_frame_widget.cpp b/qtviewer_planetosm/osm_frame_widget.cpp index b505095..252820f 100644 --- a/qtviewer_planetosm/osm_frame_widget.cpp +++ b/qtviewer_planetosm/osm_frame_widget.cpp @@ -78,8 +78,11 @@ osm_frame_widget::osm_frame_widget(QWidget *parent) : ui->tab_map->installEventFilter(this); //adjust layers, make exclusive layrs being de-activated. ui->widget_QTV_mainMap->adjust_layers(pOSMTile); - - + EnumPlugins(); + UpdateLayerTable(); + //Dock is closable + ui->dockWidget_QTV_side->installEventFilter(this); + m_mutex_proteced.unlock(); //! 2. source=MAIN_MAP, destin = ALL, msg = MAP_INITED if ( this->isEnabled()) { @@ -91,11 +94,7 @@ osm_frame_widget::osm_frame_widget(QWidget *parent) : ui->widget_QTV_mainMap->post_event(map_evt); } QTVOSM_DEBUG("The osm_frame_widget class constructed."); - EnumPlugins(); - UpdateLayerTable(); - //Dock is closable - ui->dockWidget_QTV_side->installEventFilter(this); - m_mutex_proteced.unlock(); + } void osm_frame_widget::UpdateLayerTable() { diff --git a/qtvplugin_grid/qtvplugin_grid.cpp b/qtvplugin_grid/qtvplugin_grid.cpp index 18523e2..3ad9da6 100644 --- a/qtvplugin_grid/qtvplugin_grid.cpp +++ b/qtvplugin_grid/qtvplugin_grid.cpp @@ -233,6 +233,17 @@ void qtvplugin_grid::cb_paintEvent( QPainter * pImage ) } + //draw + { + double clat,clon; + char buftmp[256]; + + m_pVi->CV_DP2LLA(m_mousePos.x(),m_mousePos.y(),&clat,&clon); + sprintf (buftmp,"Mouse LAT=%14.9lf, LON=%14.9lf\n",clat,clon); + QString strMsg = buftmp; + pImage->drawText(0,16,strMsg); + + } int x1,y1,x2,y2; @@ -264,6 +275,7 @@ void qtvplugin_grid::cb_paintEvent( QPainter * pImage ) QPointF pos = QLineF(x1,y1,x2,y2).pointAt(1*0.8 / sz+0.1); pImage->drawText(pos,str); } + pImage->setPen(oldpen); } -- GitLab