|
@@ -36,15 +36,15 @@ namespace XdCxRhDW.App.UserControl
|
|
|
{
|
|
|
this.components = new System.ComponentModel.Container();
|
|
|
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CtrlHome));
|
|
|
- DevExpress.XtraEditors.ButtonsPanelControl.ButtonImageOptions buttonImageOptions4 = new DevExpress.XtraEditors.ButtonsPanelControl.ButtonImageOptions();
|
|
|
- DevExpress.Utils.SuperToolTip superToolTip4 = new DevExpress.Utils.SuperToolTip();
|
|
|
- DevExpress.Utils.ToolTipItem toolTipItem4 = new DevExpress.Utils.ToolTipItem();
|
|
|
- DevExpress.XtraEditors.ButtonsPanelControl.ButtonImageOptions buttonImageOptions5 = new DevExpress.XtraEditors.ButtonsPanelControl.ButtonImageOptions();
|
|
|
- DevExpress.Utils.SuperToolTip superToolTip5 = new DevExpress.Utils.SuperToolTip();
|
|
|
- DevExpress.Utils.ToolTipItem toolTipItem5 = new DevExpress.Utils.ToolTipItem();
|
|
|
- DevExpress.XtraEditors.ButtonsPanelControl.ButtonImageOptions buttonImageOptions6 = new DevExpress.XtraEditors.ButtonsPanelControl.ButtonImageOptions();
|
|
|
- DevExpress.Utils.SuperToolTip superToolTip6 = new DevExpress.Utils.SuperToolTip();
|
|
|
- DevExpress.Utils.ToolTipItem toolTipItem6 = new DevExpress.Utils.ToolTipItem();
|
|
|
+ DevExpress.XtraEditors.ButtonsPanelControl.ButtonImageOptions buttonImageOptions7 = new DevExpress.XtraEditors.ButtonsPanelControl.ButtonImageOptions();
|
|
|
+ DevExpress.Utils.SuperToolTip superToolTip7 = new DevExpress.Utils.SuperToolTip();
|
|
|
+ DevExpress.Utils.ToolTipItem toolTipItem7 = new DevExpress.Utils.ToolTipItem();
|
|
|
+ DevExpress.XtraEditors.ButtonsPanelControl.ButtonImageOptions buttonImageOptions8 = new DevExpress.XtraEditors.ButtonsPanelControl.ButtonImageOptions();
|
|
|
+ DevExpress.Utils.SuperToolTip superToolTip8 = new DevExpress.Utils.SuperToolTip();
|
|
|
+ DevExpress.Utils.ToolTipItem toolTipItem8 = new DevExpress.Utils.ToolTipItem();
|
|
|
+ DevExpress.XtraEditors.ButtonsPanelControl.ButtonImageOptions buttonImageOptions9 = new DevExpress.XtraEditors.ButtonsPanelControl.ButtonImageOptions();
|
|
|
+ DevExpress.Utils.SuperToolTip superToolTip9 = new DevExpress.Utils.SuperToolTip();
|
|
|
+ DevExpress.Utils.ToolTipItem toolTipItem9 = new DevExpress.Utils.ToolTipItem();
|
|
|
this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
|
|
|
this.txtTimeCho = new DevExpress.XtraEditors.ImageComboBoxEdit();
|
|
|
this.barManager1 = new DevExpress.XtraBars.BarManager(this.components);
|
|
@@ -54,7 +54,6 @@ namespace XdCxRhDW.App.UserControl
|
|
|
this.barDockControlRight = new DevExpress.XtraBars.BarDockControl();
|
|
|
this.btnStart = new DevExpress.XtraBars.BarButtonItem();
|
|
|
this.btnStop = new DevExpress.XtraBars.BarButtonItem();
|
|
|
- this.btnTar = new DevExpress.XtraBars.BarButtonItem();
|
|
|
this.btnDrawDto = new DevExpress.XtraBars.BarButtonItem();
|
|
|
this.btnDrawDfo = new DevExpress.XtraBars.BarButtonItem();
|
|
|
this.btnDrawCX = new DevExpress.XtraBars.BarButtonItem();
|
|
@@ -144,7 +143,7 @@ namespace XdCxRhDW.App.UserControl
|
|
|
// txtTimeCho
|
|
|
//
|
|
|
this.txtTimeCho.EditValue = 1;
|
|
|
- this.txtTimeCho.Location = new System.Drawing.Point(247, 213);
|
|
|
+ this.txtTimeCho.Location = new System.Drawing.Point(245, 212);
|
|
|
this.txtTimeCho.MenuManager = this.barManager1;
|
|
|
this.txtTimeCho.Name = "txtTimeCho";
|
|
|
this.txtTimeCho.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
|
|
@@ -156,7 +155,7 @@ namespace XdCxRhDW.App.UserControl
|
|
|
new DevExpress.XtraEditors.Controls.ImageComboBoxItem("最近1天", 24, -1),
|
|
|
new DevExpress.XtraEditors.Controls.ImageComboBoxItem("最近3天", 72, -1),
|
|
|
new DevExpress.XtraEditors.Controls.ImageComboBoxItem("自定义", 0, -1)});
|
|
|
- this.txtTimeCho.Size = new System.Drawing.Size(99, 22);
|
|
|
+ this.txtTimeCho.Size = new System.Drawing.Size(99, 20);
|
|
|
this.txtTimeCho.StyleController = this.layoutControl1;
|
|
|
this.txtTimeCho.TabIndex = 11;
|
|
|
this.txtTimeCho.SelectedIndexChanged += new System.EventHandler(this.txtTimeCho_SelectedIndexChanged);
|
|
@@ -171,7 +170,6 @@ namespace XdCxRhDW.App.UserControl
|
|
|
this.barManager1.Items.AddRange(new DevExpress.XtraBars.BarItem[] {
|
|
|
this.btnStart,
|
|
|
this.btnStop,
|
|
|
- this.btnTar,
|
|
|
this.btnDrawDto,
|
|
|
this.btnDrawDfo,
|
|
|
this.btnDrawCX,
|
|
@@ -232,14 +230,6 @@ namespace XdCxRhDW.App.UserControl
|
|
|
this.btnStop.Name = "btnStop";
|
|
|
this.btnStop.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.btn_ItemClick);
|
|
|
//
|
|
|
- // btnTar
|
|
|
- //
|
|
|
- this.btnTar.Caption = "编辑目标";
|
|
|
- this.btnTar.Id = 3;
|
|
|
- this.btnTar.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("btnTar.ImageOptions.SvgImage")));
|
|
|
- this.btnTar.Name = "btnTar";
|
|
|
- this.btnTar.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.btnTar_ItemClick);
|
|
|
- //
|
|
|
// btnDrawDto
|
|
|
//
|
|
|
this.btnDrawDto.Caption = "绘制时差线";
|
|
@@ -274,7 +264,7 @@ namespace XdCxRhDW.App.UserControl
|
|
|
//
|
|
|
// btnSearch
|
|
|
//
|
|
|
- this.btnSearch.Location = new System.Drawing.Point(772, 213);
|
|
|
+ this.btnSearch.Location = new System.Drawing.Point(770, 212);
|
|
|
this.btnSearch.Name = "btnSearch";
|
|
|
this.btnSearch.Size = new System.Drawing.Size(84, 21);
|
|
|
this.btnSearch.StyleController = this.layoutControl1;
|
|
@@ -285,44 +275,44 @@ namespace XdCxRhDW.App.UserControl
|
|
|
// txtEndTime
|
|
|
//
|
|
|
this.txtEndTime.EditValue = null;
|
|
|
- this.txtEndTime.Location = new System.Drawing.Point(617, 213);
|
|
|
+ this.txtEndTime.Location = new System.Drawing.Point(615, 212);
|
|
|
this.txtEndTime.MenuManager = this.barManager1;
|
|
|
this.txtEndTime.Name = "txtEndTime";
|
|
|
this.txtEndTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
|
|
|
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
|
|
|
this.txtEndTime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
|
|
|
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
|
|
|
- this.txtEndTime.Size = new System.Drawing.Size(149, 22);
|
|
|
+ this.txtEndTime.Size = new System.Drawing.Size(149, 20);
|
|
|
this.txtEndTime.StyleController = this.layoutControl1;
|
|
|
this.txtEndTime.TabIndex = 8;
|
|
|
//
|
|
|
// txtStartTime
|
|
|
//
|
|
|
this.txtStartTime.EditValue = null;
|
|
|
- this.txtStartTime.Location = new System.Drawing.Point(407, 213);
|
|
|
+ this.txtStartTime.Location = new System.Drawing.Point(405, 212);
|
|
|
this.txtStartTime.MenuManager = this.barManager1;
|
|
|
this.txtStartTime.Name = "txtStartTime";
|
|
|
this.txtStartTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
|
|
|
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
|
|
|
this.txtStartTime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
|
|
|
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
|
|
|
- this.txtStartTime.Size = new System.Drawing.Size(149, 22);
|
|
|
+ this.txtStartTime.Size = new System.Drawing.Size(149, 20);
|
|
|
this.txtStartTime.StyleController = this.layoutControl1;
|
|
|
this.txtStartTime.TabIndex = 7;
|
|
|
//
|
|
|
// mapControl1
|
|
|
//
|
|
|
- this.mapControl1.Location = new System.Drawing.Point(187, 2);
|
|
|
+ this.mapControl1.Location = new System.Drawing.Point(185, 2);
|
|
|
this.mapControl1.Name = "mapControl1";
|
|
|
- this.mapControl1.Size = new System.Drawing.Size(848, 170);
|
|
|
+ this.mapControl1.Size = new System.Drawing.Size(850, 170);
|
|
|
this.mapControl1.TabIndex = 6;
|
|
|
//
|
|
|
// gridHomePosRes
|
|
|
//
|
|
|
- this.gridHomePosRes.Location = new System.Drawing.Point(188, 237);
|
|
|
+ this.gridHomePosRes.Location = new System.Drawing.Point(186, 236);
|
|
|
this.gridHomePosRes.MainView = this.gridView2;
|
|
|
this.gridHomePosRes.Name = "gridHomePosRes";
|
|
|
- this.gridHomePosRes.Size = new System.Drawing.Size(846, 283);
|
|
|
+ this.gridHomePosRes.Size = new System.Drawing.Size(848, 284);
|
|
|
this.gridHomePosRes.TabIndex = 5;
|
|
|
this.gridHomePosRes.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
|
|
|
this.gridView2});
|
|
@@ -383,30 +373,30 @@ namespace XdCxRhDW.App.UserControl
|
|
|
// layoutControlItem3
|
|
|
//
|
|
|
this.layoutControlItem3.Control = this.mapControl1;
|
|
|
- this.layoutControlItem3.Location = new System.Drawing.Point(185, 0);
|
|
|
+ this.layoutControlItem3.Location = new System.Drawing.Point(183, 0);
|
|
|
this.layoutControlItem3.Name = "layoutControlItem3";
|
|
|
- this.layoutControlItem3.Size = new System.Drawing.Size(852, 174);
|
|
|
+ this.layoutControlItem3.Size = new System.Drawing.Size(854, 174);
|
|
|
this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
|
|
|
this.layoutControlItem3.TextVisible = false;
|
|
|
//
|
|
|
// layoutControlGroup1
|
|
|
//
|
|
|
- buttonImageOptions4.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("buttonImageOptions4.SvgImage")));
|
|
|
- buttonImageOptions4.SvgImageSize = new System.Drawing.Size(20, 20);
|
|
|
- toolTipItem4.Text = "新建任务";
|
|
|
- superToolTip4.Items.Add(toolTipItem4);
|
|
|
- buttonImageOptions5.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("buttonImageOptions5.SvgImage")));
|
|
|
- buttonImageOptions5.SvgImageSize = new System.Drawing.Size(20, 20);
|
|
|
- toolTipItem5.Text = "编辑任务";
|
|
|
- superToolTip5.Items.Add(toolTipItem5);
|
|
|
- buttonImageOptions6.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("buttonImageOptions6.SvgImage")));
|
|
|
- buttonImageOptions6.SvgImageSize = new System.Drawing.Size(20, 20);
|
|
|
- toolTipItem6.Text = "删除任务";
|
|
|
- superToolTip6.Items.Add(toolTipItem6);
|
|
|
+ buttonImageOptions7.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("buttonImageOptions7.SvgImage")));
|
|
|
+ buttonImageOptions7.SvgImageSize = new System.Drawing.Size(20, 20);
|
|
|
+ toolTipItem7.Text = "新建任务";
|
|
|
+ superToolTip7.Items.Add(toolTipItem7);
|
|
|
+ buttonImageOptions8.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("buttonImageOptions8.SvgImage")));
|
|
|
+ buttonImageOptions8.SvgImageSize = new System.Drawing.Size(20, 20);
|
|
|
+ toolTipItem8.Text = "编辑任务";
|
|
|
+ superToolTip8.Items.Add(toolTipItem8);
|
|
|
+ buttonImageOptions9.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("buttonImageOptions9.SvgImage")));
|
|
|
+ buttonImageOptions9.SvgImageSize = new System.Drawing.Size(20, 20);
|
|
|
+ toolTipItem9.Text = "删除任务";
|
|
|
+ superToolTip9.Items.Add(toolTipItem9);
|
|
|
this.layoutControlGroup1.CustomHeaderButtons.AddRange(new DevExpress.XtraEditors.ButtonPanel.IBaseButton[] {
|
|
|
- new DevExpress.XtraEditors.ButtonsPanelControl.GroupBoxButton("新建任务", false, buttonImageOptions4, DevExpress.XtraBars.Docking2010.ButtonStyle.PushButton, "", -1, true, superToolTip4, true, false, true, null, -1),
|
|
|
- new DevExpress.XtraEditors.ButtonsPanelControl.GroupBoxButton("编辑任务", false, buttonImageOptions5, DevExpress.XtraBars.Docking2010.ButtonStyle.PushButton, "", -1, true, superToolTip5, true, false, true, null, -1),
|
|
|
- new DevExpress.XtraEditors.ButtonsPanelControl.GroupBoxButton("删除任务", false, buttonImageOptions6, DevExpress.XtraBars.Docking2010.ButtonStyle.PushButton, "", -1, true, superToolTip6, true, false, true, null, -1)});
|
|
|
+ new DevExpress.XtraEditors.ButtonsPanelControl.GroupBoxButton("新建任务", false, buttonImageOptions7, DevExpress.XtraBars.Docking2010.ButtonStyle.PushButton, "", -1, true, superToolTip7, true, false, true, null, -1),
|
|
|
+ new DevExpress.XtraEditors.ButtonsPanelControl.GroupBoxButton("编辑任务", false, buttonImageOptions8, DevExpress.XtraBars.Docking2010.ButtonStyle.PushButton, "", -1, true, superToolTip8, true, false, true, null, -1),
|
|
|
+ new DevExpress.XtraEditors.ButtonsPanelControl.GroupBoxButton("删除任务", false, buttonImageOptions9, DevExpress.XtraBars.Docking2010.ButtonStyle.PushButton, "", -1, true, superToolTip9, true, false, true, null, -1)});
|
|
|
this.layoutControlGroup1.HeaderButtonsLocation = DevExpress.Utils.GroupElementLocation.AfterText;
|
|
|
this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
|
|
|
this.layoutControlItem1});
|
|
@@ -434,10 +424,10 @@ namespace XdCxRhDW.App.UserControl
|
|
|
this.layoutControlItemSearch,
|
|
|
this.layoutControlGroup3,
|
|
|
this.emptySpaceItem1});
|
|
|
- this.layoutControlGroup2.Location = new System.Drawing.Point(185, 186);
|
|
|
+ this.layoutControlGroup2.Location = new System.Drawing.Point(183, 184);
|
|
|
this.layoutControlGroup2.Name = "layoutControlGroup2";
|
|
|
this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
|
|
|
- this.layoutControlGroup2.Size = new System.Drawing.Size(852, 337);
|
|
|
+ this.layoutControlGroup2.Size = new System.Drawing.Size(854, 339);
|
|
|
this.layoutControlGroup2.Text = "定位结果";
|
|
|
//
|
|
|
// layoutControlItem2
|
|
@@ -446,7 +436,7 @@ namespace XdCxRhDW.App.UserControl
|
|
|
this.layoutControlItem2.Location = new System.Drawing.Point(0, 28);
|
|
|
this.layoutControlItem2.Name = "layoutControlItem2";
|
|
|
this.layoutControlItem2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
|
|
|
- this.layoutControlItem2.Size = new System.Drawing.Size(846, 283);
|
|
|
+ this.layoutControlItem2.Size = new System.Drawing.Size(848, 284);
|
|
|
this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
|
|
|
this.layoutControlItem2.TextVisible = false;
|
|
|
//
|
|
@@ -527,7 +517,7 @@ namespace XdCxRhDW.App.UserControl
|
|
|
this.emptySpaceItem1.AllowHotTrack = false;
|
|
|
this.emptySpaceItem1.Location = new System.Drawing.Point(670, 0);
|
|
|
this.emptySpaceItem1.Name = "emptySpaceItem1";
|
|
|
- this.emptySpaceItem1.Size = new System.Drawing.Size(176, 28);
|
|
|
+ this.emptySpaceItem1.Size = new System.Drawing.Size(178, 28);
|
|
|
this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
|
|
|
//
|
|
|
// splitterItem1
|
|
@@ -535,14 +525,14 @@ namespace XdCxRhDW.App.UserControl
|
|
|
this.splitterItem1.AllowHotTrack = true;
|
|
|
this.splitterItem1.Location = new System.Drawing.Point(173, 0);
|
|
|
this.splitterItem1.Name = "splitterItem1";
|
|
|
- this.splitterItem1.Size = new System.Drawing.Size(12, 523);
|
|
|
+ this.splitterItem1.Size = new System.Drawing.Size(10, 523);
|
|
|
//
|
|
|
// splitterItem2
|
|
|
//
|
|
|
this.splitterItem2.AllowHotTrack = true;
|
|
|
- this.splitterItem2.Location = new System.Drawing.Point(185, 174);
|
|
|
+ this.splitterItem2.Location = new System.Drawing.Point(183, 174);
|
|
|
this.splitterItem2.Name = "splitterItem2";
|
|
|
- this.splitterItem2.Size = new System.Drawing.Size(852, 12);
|
|
|
+ this.splitterItem2.Size = new System.Drawing.Size(854, 10);
|
|
|
//
|
|
|
// svgImageCollection1
|
|
|
//
|
|
@@ -570,7 +560,6 @@ namespace XdCxRhDW.App.UserControl
|
|
|
// popupMenu2
|
|
|
//
|
|
|
this.popupMenu2.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] {
|
|
|
- new DevExpress.XtraBars.LinkPersistInfo(this.btnTar),
|
|
|
new DevExpress.XtraBars.LinkPersistInfo(this.btnDrawDto),
|
|
|
new DevExpress.XtraBars.LinkPersistInfo(this.btnDrawDfo),
|
|
|
new DevExpress.XtraBars.LinkPersistInfo(this.btnDrawCX),
|
|
@@ -670,7 +659,6 @@ namespace XdCxRhDW.App.UserControl
|
|
|
private DevExpress.Utils.Html.HtmlTemplateCollection htmlTemplateCollection1;
|
|
|
private DevExpress.Utils.Html.HtmlTemplate htmlTemplate1;
|
|
|
private DevExpress.XtraBars.PopupMenu popupMenu2;
|
|
|
- private DevExpress.XtraBars.BarButtonItem btnTar;
|
|
|
private DevExpress.XtraBars.BarButtonItem btnDrawDto;
|
|
|
private DevExpress.XtraBars.BarButtonItem btnDrawDfo;
|
|
|
private DevExpress.XtraBars.BarButtonItem btnDrawCX;
|