rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

Added missing tooltip to 'find place' combobox on OPMap plug-in.

Browse Source 
'Add waypoint' on the right-click menu now inserts a waypoint at the mouse cursor on the map.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@952 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
pip 2010-06-30 17:36:28 +00:00 committed by pip
parent 8f9c372f85
commit 143ea6c3bb
2 changed files with 46 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ground/src/plugins/opmap/opmap_widget.ui
View File

@ -240,6 +240,9 @@ border-radius: 2px;
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>Enter a place here that you want to find, then press either return or the find button to the right.</string>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
@ -497,11 +500,7 @@ border-radius: 2px;
<item>
<widget class="QToolButton" name="toolButtonZoomP">
<property name="toolTip">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; color:#ffffff;&quot;&gt;Zoom in&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>Zoom in</string>
</property>
<property name="styleSheet">
<string notr="true"/>

66
ground/src/plugins/opmap/opmapgadgetwidget.cpp
View File

@ -104,7 +104,6 @@ OPMapGadgetWidget::OPMapGadgetWidget(QWidget *parent) : QWidget(parent)
pm = ExtensionSystem::PluginManager::instance();
objManager = pm->getObject<UAVObjectManager>();
m_positionActual = PositionActual::GetInstance(objManager);
// **************
@ -221,7 +220,7 @@ OPMapGadgetWidget::OPMapGadgetWidget(QWidget *parent) : QWidget(parent)
// create a waypoint group
QStandardItem *item = new QStandardItem(tr("Camera shoot at the town hall"));
for (int i = 1; i < 5; i++)
{ // add some way points
{ // add some waypoints
QStandardItem *child = new QStandardItem(QIcon(QString::fromUtf8(":/opmap/images/waypoint.png")), QString("Waypoint %0").arg(i));
child->setEditable(true);
item->appendRow(child);
@ -233,7 +232,7 @@ OPMapGadgetWidget::OPMapGadgetWidget(QWidget *parent) : QWidget(parent)
// create another waypoint group
item = new QStandardItem(tr("Flight path 62"));
for (int i = 1; i < 8; i++)
{ // add some way points
{ // add some waypoints
QStandardItem *child = new QStandardItem(QIcon(QString::fromUtf8(":/opmap/images/waypoint.png")), QString("Waypoint %0").arg(i));
child->setEditable(true);
item->appendRow(child);
@ -322,16 +321,20 @@ void OPMapGadgetWidget::mouseMoveEvent(QMouseEvent *event)
void OPMapGadgetWidget::contextMenuEvent(QContextMenuEvent *event)
{
if (!m_map)
return; // we don't appear to have a map to work with!
if (event->reason() != QContextMenuEvent::Mouse)
return; // not a mouse click event
if (!m_map)
return; // we don't appear to have a map to work with!
// current mouse position
QPoint p = m_map->mapFromGlobal(QCursor::pos());
// save the current lat/lon mouse position
mouse_lat_lon = m_map->currentMousePosition();
if (!m_map->contentsRect().contains(p))
return; // the mouse click was not on the map
return; // the mouse click was not on the map
// find out if we have a waypoint under the mouse cursor
QGraphicsItem *item = m_map->itemAt(p);
@ -724,7 +727,20 @@ void OPMapGadgetWidget::on_toolButtonGo_clicked()
void OPMapGadgetWidget::on_toolButtonAddWaypoint_clicked()
{
addWayPointAct->trigger();
if (!m_map) return;
m_waypoint_list_mutex.lock();
// create a waypoint at the center of the map
t_waypoint waypoint;
waypoint.item = m_map->WPCreate(m_map->CurrentPosition(), 0);
waypoint.time_seconds = 0;
waypoint.hold_time_seconds = 0;
// and remember it in our own local waypoint list
m_waypoint_list.append(waypoint);
m_waypoint_list_mutex.unlock();
}
void OPMapGadgetWidget::on_toolButtonWaypointEditor_clicked()
@ -898,9 +914,9 @@ void OPMapGadgetWidget::createActions()
followUAVheadingAct->setChecked(true);
connect(followUAVheadingAct, SIGNAL(toggled(bool)), this, SLOT(on_followUAVheadingAct_toggled(bool)));
wayPointEditorAct = new QAction(tr("&Way point editor"), this);
wayPointEditorAct = new QAction(tr("&Waypoint editor"), this);
wayPointEditorAct->setShortcut(tr("Ctrl+W"));
wayPointEditorAct->setStatusTip(tr("Open the way-point editor"));
wayPointEditorAct->setStatusTip(tr("Open the waypoint editor"));
connect(wayPointEditorAct, SIGNAL(triggered()), this, SLOT(on_openWayPointEditorAct_triggered()));
addWayPointAct = new QAction(tr("&Add waypoint"), this);
@ -1049,23 +1065,20 @@ void OPMapGadgetWidget::on_openWayPointEditorAct_triggered()
void OPMapGadgetWidget::on_addWayPointAct_triggered()
{
if (m_map)
{
m_waypoint_list_mutex.lock();
if (!m_map) return;
// create a waypoint
t_waypoint waypoint;
waypoint.item = m_map->WPCreate();
waypoint.time_seconds = 0;
waypoint.hold_time_seconds = 0;
m_waypoint_list_mutex.lock();
// and remember it
m_waypoint_list.append(waypoint);
// create a waypoint on the map at the last known mouse position
t_waypoint waypoint;
waypoint.item = m_map->WPCreate(mouse_lat_lon, 0);
waypoint.time_seconds = 0;
waypoint.hold_time_seconds = 0;
m_waypoint_list_mutex.unlock();
}
// and remember it in our own local waypoint list
m_waypoint_list.append(waypoint);
// to do
m_waypoint_list_mutex.unlock();
}
void OPMapGadgetWidget::on_editWayPointAct_triggered()
@ -1143,6 +1156,7 @@ void OPMapGadgetWidget::loadComboBoxLines(QComboBox *comboBox, QString filename)
while (!in.atEnd())
{
QString line = in.readLine().simplified();
if (line.isNull() || line.isEmpty()) continue;
comboBox->addItem(line);
}
@ -1162,7 +1176,11 @@ void OPMapGadgetWidget::saveComboBoxLines(QComboBox *comboBox, QString filename)
QTextStream out(&file);
for (int i = 0; i < comboBox->count(); i++)
out << comboBox->itemText(i).simplified() << "\n";
{
QString line = comboBox->itemText(i).simplified();
if (line.isNull() || line.isEmpty()) continue;
out << line << "\n";
}
file.close();
}