Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 800 → Rev 801

/QMK-Groundstation/trunk/QMK-Maps/Dialogs/dlg_Main.cpp
61,7 → 61,7
cb_ShowWPs->setChecked(o_Settings->CONFIG.cb_ShowWPs);
cb_Goto->setChecked(o_Settings->CONFIG.cb_Goto);
 
tb_More->addWidget(cb_Maps);
// tb_More->addWidget(cb_Maps);
cb_Maps->setVisible(false);
 
ac_Toolbar->setChecked(o_Settings->GUI.Toolbar);
169,9 → 169,9
o_Map->addLayer(o_RouteFL);
 
o_Map->setZoom(17);
// o_Map->setView(QPointF(o_Settings->NAVI.Longitude,o_Settings->NAVI.Latitude));
o_Map->setView(QPointF(o_Settings->NAVI.Longitude,o_Settings->NAVI.Latitude));
// o_Map->setView(QPointF(13.5,52.5));
o_Map->setView(QPointF(13.419805,52.431787));
// o_Map->setView(QPointF(13.419805,52.431787));
connect(o_Map, SIGNAL(mouseEventCoordinate(const QMouseEvent*, const QPointF)), this, SLOT(slot_Click(const QMouseEvent*, const QPointF)));
 
l_Map->addWidget(o_Map);
209,7 → 209,7
int numSteps = numDegrees / 15;
zoomValue += numSteps;
if (zoomValue < 0) { zoomValue = 0;}
if (zoomValue > 17) { zoomValue = 17;}
if (zoomValue > 18) { zoomValue = 18;}
sl_Zoom->setValue(zoomValue);
}
 
432,6 → 432,7
s_WayPoint.ToleranceRadius = 5;
s_WayPoint.HoldTime = sb_Time->value();
s_WayPoint.Event_Flag = 0;
s_WayPoint.Index = 1;
s_WayPoint.reserve[0] = 0; // reserve
s_WayPoint.reserve[1] = 0; // reserve
s_WayPoint.reserve[2] = 0; // reserve
480,6 → 481,7
s_WayPoint.ToleranceRadius = 5;
s_WayPoint.HoldTime = t_WayPoints[z].Time;
s_WayPoint.Event_Flag = 0;
s_WayPoint.Index = t_Pos;
s_WayPoint.reserve[0] = 0; // reserve
s_WayPoint.reserve[1] = 0; // reserve
s_WayPoint.reserve[2] = 0; // reserve
551,6 → 553,7
le_WPTime->setText(QString("%1:").arg(ps_MK_NaviData.TargetHoldTime / 60) + (QString("%1").arg(ps_MK_NaviData.TargetHoldTime % 60)).rightJustified(2, '0'));
le_WPDist->setText(QString("%1m").arg(ps_MK_NaviData.TargetPositionDeviation.Distance / 10));
le_HomeDist->setText(QString("%1m").arg(ps_MK_NaviData.HomePositionDeviation.Distance / 10));
le_Sats->setText(QString("%1").arg(ps_MK_NaviData.SatsInUse));
 
add_Position(ps_MK_NaviData);
}