提交 2010fccb 编写于 作者: 丁劲犇's avatar 丁劲犇 😸

1. sloved a radio button auto exclusive problem in geomarker.

2. sloved a tiny problem that selection  box's coord will be mis-calculated during rotating.
上级 1682c8f4
......@@ -249,5 +249,11 @@ namespace QTVP_GEOMARKER{
}
m_pLabelItem->setPos(this->label_pos());
}
if (m_pSelectionBound)
{
QGraphicsItem * pc = dynamic_cast<QGraphicsItem *> (this);
if (pc)
m_pSelectionBound->setRect(pc->boundingRect());
}
}
}
......@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>469</width>
<height>483</height>
<width>542</width>
<height>419</height>
</rect>
</property>
<property name="windowTitle">
......@@ -38,7 +38,22 @@
<property name="title">
<string>Marks</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_11">
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>1</number>
</property>
<property name="leftMargin">
<number>1</number>
</property>
<property name="topMargin">
<number>1</number>
</property>
<property name="rightMargin">
<number>1</number>
</property>
<property name="bottomMargin">
<number>1</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
......@@ -76,6 +91,21 @@
<string>Map Operation</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_7">
<property name="spacing">
<number>1</number>
</property>
<property name="leftMargin">
<number>1</number>
</property>
<property name="topMargin">
<number>1</number>
</property>
<property name="rightMargin">
<number>1</number>
</property>
<property name="bottomMargin">
<number>1</number>
</property>
<item>
<widget class="QRadioButton" name="radioButton_display">
<property name="text">
......@@ -96,7 +126,7 @@
<item>
<widget class="QToolBox" name="toolBox_marks">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
......@@ -113,7 +143,7 @@
<x>0</x>
<y>0</y>
<width>169</width>
<height>194</height>
<height>229</height>
</rect>
</property>
<attribute name="label">
......@@ -152,66 +182,47 @@
<rect>
<x>0</x>
<y>0</y>
<width>166</width>
<height>272</height>
<width>169</width>
<height>229</height>
</rect>
</property>
<attribute name="label">
<string>Selected marks</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_12">
<property name="spacing">
<number>1</number>
</property>
<property name="leftMargin">
<number>1</number>
</property>
<property name="topMargin">
<number>1</number>
</property>
<property name="rightMargin">
<number>1</number>
</property>
<property name="bottomMargin">
<number>1</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_21">
<item>
<widget class="QPushButton" name="pushButton_sel_clear">
<property name="text">
<string>Clear Sel</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
<widget class="QPushButton" name="pushButton_sel_clear">
<property name="text">
<string>Clear Sel</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_22">
<item>
<widget class="QPushButton" name="pushButton_sel_delselected">
<property name="text">
<string>Delete Selected Items</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
<widget class="QPushButton" name="pushButton_sel_delselected">
<property name="text">
<string>Delete Selected Items</string>
</property>
</widget>
</item>
<item>
<widget class="QTableView" name="tableView_marks_sel">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
......@@ -223,78 +234,59 @@
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QRadioButton" name="radioButton_tool_point">
<property name="text">
<string>points</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButton_tool_line">
<property name="text">
<string>lines</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButton_tool_polygon">
<property name="text">
<string>polygons</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButton_tool_icons">
<property name="text">
<string>icons</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="spacing">
<number>0</number>
</property>
<item>
<widget class="QPushButton" name="pushButton_del">
<property name="text">
<string>Delete</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_update">
<property name="text">
<string>Update</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_save">
<property name="text">
<string>Save</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_load">
<property name="text">
<string>Load</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Mark Type</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="leftMargin">
<number>1</number>
</property>
<property name="topMargin">
<number>1</number>
</property>
<property name="rightMargin">
<number>1</number>
</property>
<property name="bottomMargin">
<number>1</number>
</property>
<property name="spacing">
<number>1</number>
</property>
<item row="0" column="0">
<widget class="QRadioButton" name="radioButton_tool_point">
<property name="text">
<string>points</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QRadioButton" name="radioButton_tool_line">
<property name="text">
<string>lines</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QRadioButton" name="radioButton_tool_polygon">
<property name="text">
<string>polygons</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QRadioButton" name="radioButton_tool_icons">
<property name="text">
<string>icons</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
......@@ -306,6 +298,9 @@
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>1</number>
</property>
<item>
<widget class="QLabel" name="label_3">
<property name="text">
......@@ -316,6 +311,34 @@
<item>
<widget class="QLineEdit" name="lineEdit_currentID"/>
</item>
<item>
<widget class="QPushButton" name="pushButton_update">
<property name="text">
<string>Update</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_del">
<property name="text">
<string>Delete</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_save">
<property name="text">
<string>Save</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_load">
<property name="text">
<string>Load</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
......@@ -360,6 +383,9 @@
<property name="spacing">
<number>1</number>
</property>
<property name="sizeConstraint">
<enum>QLayout::SetMaximumSize</enum>
</property>
<item>
<widget class="QLabel" name="label_4">
<property name="text">
......@@ -731,6 +757,21 @@
<string>Properties</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_5">
<property name="spacing">
<number>1</number>
</property>
<property name="leftMargin">
<number>1</number>
</property>
<property name="topMargin">
<number>1</number>
</property>
<property name="rightMargin">
<number>1</number>
</property>
<property name="bottomMargin">
<number>1</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册