Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 750 → 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);
}
/QMK-Groundstation/trunk/QMK-Maps/Dialogs/dlg_Main.ui
6,8 → 6,8
<rect>
<x>0</x>
<y>0</y>
<width>711</width>
<height>336</height>
<width>729</width>
<height>367</height>
</rect>
</property>
<property name="windowTitle">
17,13 → 17,29
<iconset resource="../QMK-Maps.qrc">
<normaloff>:/Icon/Global/Images/Icons/QMK-Maps.png</normaloff>:/Icon/Global/Images/Icons/QMK-Maps.png</iconset>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<widget class="QWidget" name="centralWidget">
<layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="1" colspan="2">
<widget class="wgt_Connection" name="wg_Connection" native="true"/>
<item row="0" column="0" colspan="2">
<widget class="wgt_Connection" name="wg_Connection" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="1" column="1">
<item row="1" column="0">
<widget class="QFrame" name="frame_3">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
184,6 → 200,38
</widget>
</item>
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Sats:</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="le_Sats">
<property name="minimumSize">
<size>
<width>30</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
199,7 → 247,7
</layout>
</widget>
</item>
<item row="1" column="2" rowspan="4">
<item row="1" column="1" rowspan="3">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="groupBox">
323,20 → 371,13
</layout>
</item>
<item row="2" column="0">
<spacer name="AAA1">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<widget class="QFrame" name="w_Map">
<property name="minimumSize">
<size>
<width>0</width>
<height>40</height>
<height>250</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="1">
<widget class="QFrame" name="w_Map">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
353,21 → 394,14
</layout>
</widget>
</item>
<item row="3" column="0" rowspan="2" colspan="2">
<spacer name="AAA2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<item row="3" column="0">
<widget class="QFrame" name="frame_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item row="4" column="1">
<widget class="QFrame" name="frame_2">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
455,17 → 489,10
<rect>
<x>0</x>
<y>0</y>
<width>711</width>
<height>21</height>
<width>729</width>
<height>19</height>
</rect>
</property>
<widget class="QMenu" name="menu_Program">
<property name="title">
<string>Programm</string>
</property>
<addaction name="ac_Quit"/>
<addaction name="ac_Connect"/>
</widget>
<widget class="QMenu" name="menu_Preferences">
<property name="enabled">
<bool>false</bool>
492,6 → 519,13
</property>
<addaction name="ac_Toolbar"/>
</widget>
<widget class="QMenu" name="menu_Program">
<property name="title">
<string>Programm</string>
</property>
<addaction name="ac_Quit"/>
<addaction name="ac_Connect"/>
</widget>
<addaction name="menu_Program"/>
<addaction name="menuAnsicht"/>
<addaction name="menu_Preferences"/>
502,7 → 536,7
<property name="minimumSize">
<size>
<width>0</width>
<height>80</height>
<height>0</height>
</size>
</property>
<property name="windowTitle">
523,6 → 557,9
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextUnderIcon</enum>
</property>
<property name="floatable">
<bool>false</bool>
</property>
<attribute name="toolBarArea">
<enum>LeftToolBarArea</enum>
</attribute>